Merge conformance-tests into main for v0.5.0 release

Author: paezmartinez

META.json

@@ -1,7 +1,7 @@
 {
   "name": "pgproto",
   "abstract": "Native Protobuf support for PostgreSQL",
-  "version": "0.4.0",
+  "version": "0.5.0",
 
 
   "maintainer": "paezmartinez <paezmartinez@google.com>",
@@ -10,7 +10,7 @@
     "pgproto": {
       "abstract": "Native Protobuf support for PostgreSQL",
       "file": "sql/pgproto--1.0.sql",
-      "version": "0.4.0"
+      "version": "0.5.0"
 
 
     }

src/gin.c

@@ -27,7 +27,7 @@ extract_single_key(const char **ptr, const char *end, char *key_str)
             sprintf(key_str, "%d=%lu", field_num, (long)val);
             break;
         case PB_WIRE_FIXED64:
-            *ptr += 8;
+            *ptr += PB_WIRE_FIXED64_SIZE;
             sprintf(key_str, "%d=64bit", field_num);
             break;
         case PB_WIRE_LENGTH_DELIMITED:
@@ -38,7 +38,7 @@ extract_single_key(const char **ptr, const char *end, char *key_str)
             }
             break;
         case PB_WIRE_FIXED32:
-            *ptr += 4;
+            *ptr += PB_WIRE_FIXED32_SIZE;
             sprintf(key_str, "%d=32bit", field_num);
             break;
         default:

src/io.c

@@ -25,9 +25,9 @@ protobuf_in(PG_FUNCTION_ARGS)
     ProtobufData *result;
     size_t data_len;
 
-    if (len >= 2 && str[0] == '\\' && str[1] == 'x') {
-        str += 2;
-        len -= 2;
+    if (len >= HEX_PREFIX_LEN && str[0] == '\\' && str[1] == 'x') {
+        str += HEX_PREFIX_LEN;
+        len -= HEX_PREFIX_LEN;
     }
 
     if (len % 2 != 0) {
@@ -44,7 +44,7 @@ protobuf_in(PG_FUNCTION_ARGS)
         if (hi < 0 || lo < 0) {
             elog(ERROR, "Invalid character in hex string");
         }
-        result->data[i] = (hi << 4) | lo;
+        result->data[i] = (hi << HEX_CHAR_BITS) | lo;
     }
 
     PG_RETURN_POINTER(result);
@@ -75,9 +75,9 @@ protobuf_out(PG_FUNCTION_ARGS)
     result_str[1] = 'x';
 
     for (i = 0; i < len; i++) {
-        sprintf(result_str + 2 + i * 2, "%02x", (unsigned char) data->data[i]);
+        sprintf(result_str + HEX_PREFIX_LEN + i * 2, "%02x", (unsigned char) data->data[i]);
     }
-    result_str[len * 2 + 2] = '\0';
+    result_str[len * 2 + HEX_PREFIX_LEN] = '\0';
 
     PG_RETURN_CSTRING(result_str);
 }

src/json.c

@@ -15,8 +15,8 @@ pb_to_json_inner(const char *ptr, const char *end, const char *msg_name, StringI
 
     while (ptr < end) {
         uint64 key = decode_varint(&ptr, end);
-        int field_num = (int)(key >> 3);
-        int wire_type = (int)(key & 0x07);
+        int field_num = (int)(key >> PB_FIELD_NUM_SHIFT);
+        int wire_type = (int)(key & PB_WIRE_TYPE_MASK);
 
         PbFieldLookup lookup;
         if (pgproto_lookup_field_by_number(msg_name, (uint32_t)field_num, &lookup) == PB_LOOKUP_OK) {

src/pgproto.h

@@ -65,6 +65,14 @@ typedef enum {
 #define PB_MAP_ENTRY_KEY                     1
 #define PB_MAP_ENTRY_VALUE                   2
 
+/* Fixed-size wire types sizes */
+#define PB_WIRE_FIXED64_SIZE                 8
+#define PB_WIRE_FIXED32_SIZE                 4
+
+/* Hexadecimal conversion constants */
+#define HEX_CHAR_BITS                        4
+#define HEX_PREFIX_LEN                       2
+
 /* 
  * PbType: Protobuf field types as defined in descriptor.proto.
  */