Merge branch '32-bit-support' into win

Makefile

@@ -152,12 +152,32 @@ $(PGDIR):
 	echo "#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 38) || __GLIBC__ > 2))" >> $(PGDIR)/src/include/pg_config.h
 	echo "#define HAVE_STRCHRNUL" >> $(PGDIR)/src/include/pg_config.h
 	echo "#endif" >> $(PGDIR)/src/include/pg_config.h
+	# Optionally support 32-bit
+	echo "#if defined(_WIN32) || __SIZEOF_POINTER__ == 4" >> $(PGDIR)/src/include/pg_config.h
+	echo "#undef ALIGNOF_DOUBLE" >> $(PGDIR)/src/include/pg_config.h
+	echo "#define ALIGNOF_DOUBLE 4" >> $(PGDIR)/src/include/pg_config.h
+	echo "#undef ALIGNOF_LONG" >> $(PGDIR)/src/include/pg_config.h
+	echo "#define ALIGNOF_LONG 4" >> $(PGDIR)/src/include/pg_config.h
+	echo "#define ALIGNOF_LONG_LONG_INT 4" >> $(PGDIR)/src/include/pg_config.h
+	echo "#undef ALIGNOF_PG_INT128_TYPE" >> $(PGDIR)/src/include/pg_config.h
+	echo "#undef HAVE_LONG_INT_64" >> $(PGDIR)/src/include/pg_config.h
+	echo "#define HAVE_LONG_LONG_INT_64 1" >> $(PGDIR)/src/include/pg_config.h
+	echo "#undef INT64_MODIFIER" >> $(PGDIR)/src/include/pg_config.h
+	echo "#define INT64_MODIFIER \"ll\"" >> $(PGDIR)/src/include/pg_config.h
+	echo "#undef PG_INT128_TYPE" >> $(PGDIR)/src/include/pg_config.h
+	echo "#undef PG_INT64_TYPE" >> $(PGDIR)/src/include/pg_config.h
+	echo "#define PG_INT64_TYPE long long int" >> $(PGDIR)/src/include/pg_config.h
+	echo "#undef SIZEOF_LONG" >> $(PGDIR)/src/include/pg_config.h
+	echo "#define SIZEOF_LONG 4" >> $(PGDIR)/src/include/pg_config.h
+	echo "#undef SIZEOF_SIZE_T" >> $(PGDIR)/src/include/pg_config.h
+	echo "#define SIZEOF_SIZE_T 4" >> $(PGDIR)/src/include/pg_config.h
+	echo "#undef SIZEOF_VOID_P" >> $(PGDIR)/src/include/pg_config.h
+	echo "#define SIZEOF_VOID_P 4" >> $(PGDIR)/src/include/pg_config.h
+	echo "#endif" >> $(PGDIR)/src/include/pg_config.h
 	# Windows
 	echo "#if defined(_WIN32) || defined(_WIN64)" >> $(PGDIR)/src/include/pg_config.h
 	echo "#define WIN32 1" >> $(PGDIR)/src/include/pg_config.h
 	echo "#define __thread __declspec( thread )" >> $(PGDIR)/src/include/pg_config.h
-	echo "#undef SIZEOF_VOID_P" >> $(PGDIR)/src/include/pg_config.h
-	echo "#define SIZEOF_VOID_P 4" >> $(PGDIR)/src/include/pg_config.h
 	echo "#undef HAVE_STRINGS_H" >> $(PGDIR)/src/include/pg_config.h
 	echo "#undef HAVE_VISIBILITY_ATTRIBUTE" >> $(PGDIR)/src/include/pg_config.h
 	echo "#undef HAVE__BUILTIN_CONSTANT_P" >> $(PGDIR)/src/include/pg_config.h

examples/scan.c

@@ -39,7 +39,7 @@ int main() {
     } else {
       scan_result = pg_query__scan_result__unpack(NULL, result.pbuf.len, (void *) result.pbuf.data);
 
-      printf("  version: %d, tokens: %ld, size: %zu\n", scan_result->version, scan_result->n_tokens, result.pbuf.len);
+      printf("  version: %d, tokens: %zu, size: %zu\n", scan_result->version, scan_result->n_tokens, result.pbuf.len);
       for (j = 0; j < scan_result->n_tokens; j++) {
         scan_token = scan_result->tokens[j];
         token_kind = protobuf_c_enum_descriptor_get_value(&pg_query__token__descriptor, scan_token->token);

protobuf/pg_query.proto

@@ -1272,7 +1272,7 @@ message RTEPermissionInfo
 {
   uint32 relid = 1 [json_name="relid"];
   bool inh = 2 [json_name="inh"];
-  int64 required_perms = 3 [json_name="requiredPerms"];
+  uint64 required_perms = 3 [json_name="requiredPerms"];
   uint32 check_as_user = 4 [json_name="checkAsUser"];
   repeated uint64 selected_cols = 5 [json_name="selectedCols"];
   repeated uint64 inserted_cols = 6 [json_name="insertedCols"];

scripts/extract_source.rb

@@ -582,6 +582,12 @@ def write_out
 # Other required functions
 runner.deep_resolve('pg_printf')
 
+# Retain these functions for optional 32-bit support
+# (see BITS_PER_BITMAPWORD checks in bitmapset.c)
+runner.deep_resolve('pg_leftmost_one_pos32')
+runner.deep_resolve('pg_rightmost_one_pos32')
+runner.deep_resolve('pg_popcount32')
+
 # Required for Windows support
 runner.deep_resolve('newNodeMacroHolder')
 runner.deep_resolve('pg_leftmost_one_pos')

scripts/generate_fingerprint_outfuncs.rb

@@ -155,6 +155,16 @@ def initialize
 
   EOL
 
+  FINGERPRINT_UINT64 = <<-EOL
+  if (node->%<name>s != 0) {
+    char buffer[50];
+    sprintf(buffer, UINT64_FORMAT, node->%<name>s);
+    _fingerprintString(ctx, "%<name>s");
+    _fingerprintString(ctx, buffer);
+  }
+
+  EOL
+
   FINGERPRINT_FLOAT = <<-EOL
   if (node->%<name>s != 0) {
     char buffer[50];
@@ -258,7 +268,8 @@ def initialize
     ['RawStmt', 'stmt_location'] => :skip,
   }
   INT_TYPES = ['bits32', 'uint32', 'int', 'int32', 'uint16', 'int16', 'Oid', 'Index', 'AttrNumber', 'SubTransactionId', 'RelFileNumber']
-  LONG_INT_TYPES = ['long', 'uint64', 'AclMode']
+  LONG_INT_TYPES = ['long']
+  UINT64_TYPES = ['uint64', 'AclMode']
   INT_ARRAY_TYPES = ['Bitmapset*', 'Bitmapset', 'Relids']
   FLOAT_TYPES = ['Cost', 'double', 'Cardinality']
 
@@ -317,6 +328,8 @@ def generate_fingerprint_defs!
               fingerprint_def += format(FINGERPRINT_INT, name: name)
             when *LONG_INT_TYPES
               fingerprint_def += format(FINGERPRINT_LONG_INT, name: name)
+            when *UINT64_TYPES
+              fingerprint_def += format(FINGERPRINT_UINT64, name: name)
             when *INT_ARRAY_TYPES
               fingerprint_def += format(FINGERPRINT_INT_ARRAY, name: name)
             when *FLOAT_TYPES

scripts/generate_protobuf_and_funcs.rb

@@ -74,7 +74,7 @@ def generate_outmethods!
             @readmethods[node_type] += format("  READ_BOOL_FIELD(%s, %s, %s);\n", outname, outname_json, name)
             @protobuf_messages[node_type] += format("  bool %s = %d [json_name=\"%s\"];\n", outname, protobuf_field_count, name)
             protobuf_field_count += 1
-          elsif ['long', 'AclMode'].include?(type)
+          elsif ['long'].include?(type)
             @outmethods[node_type] += format("  WRITE_LONG_FIELD(%s, %s, %s);\n", outname, outname_json, name)
             @readmethods[node_type] += format("  READ_LONG_FIELD(%s, %s, %s);\n", outname, outname_json, name)
             @protobuf_messages[node_type] += format("  int64 %s = %d [json_name=\"%s\"];\n", outname, protobuf_field_count, name)
@@ -89,6 +89,11 @@ def generate_outmethods!
             @readmethods[node_type] += format("  READ_UINT_FIELD(%s, %s, %s);\n", outname, outname_json, name)
             @protobuf_messages[node_type] += format("  uint32 %s = %d [json_name=\"%s\"];\n", outname, protobuf_field_count, name)
             protobuf_field_count += 1
+          elsif ['uint64', 'AclMode'].include?(type)
+            @outmethods[node_type] += format("  WRITE_UINT64_FIELD(%s, %s, %s);\n", outname, outname_json, name)
+            @readmethods[node_type] += format("  READ_UINT64_FIELD(%s, %s, %s);\n", outname, outname_json, name)
+            @protobuf_messages[node_type] += format("  uint64 %s = %d [json_name=\"%s\"];\n", outname, protobuf_field_count, name)
+            protobuf_field_count += 1
           elsif type == 'char*'
             @outmethods[node_type] += format("  WRITE_STRING_FIELD(%s, %s, %s);\n", outname, outname_json, name)
             @readmethods[node_type] += format("  READ_STRING_FIELD(%s, %s, %s);\n", outname, outname_json, name)

src/include/pg_query_fingerprint_defs.c

@@ -5894,7 +5894,7 @@ _fingerprintRTEPermissionInfo(FingerprintContext *ctx, const RTEPermissionInfo *
 
   if (node->requiredPerms != 0) {
     char buffer[50];
-    sprintf(buffer, "%ld", node->requiredPerms);
+    sprintf(buffer, UINT64_FORMAT, node->requiredPerms);
     _fingerprintString(ctx, "requiredPerms");
     _fingerprintString(ctx, buffer);
   }

src/include/pg_query_outfuncs_defs.c

@@ -1240,7 +1240,7 @@ _outRTEPermissionInfo(OUT_TYPE(RTEPermissionInfo, RTEPermissionInfo) out, const
 {
   WRITE_UINT_FIELD(relid, relid, relid);
   WRITE_BOOL_FIELD(inh, inh, inh);
-  WRITE_LONG_FIELD(required_perms, requiredPerms, requiredPerms);
+  WRITE_UINT64_FIELD(required_perms, requiredPerms, requiredPerms);
   WRITE_UINT_FIELD(check_as_user, checkAsUser, checkAsUser);
   WRITE_BITMAPSET_FIELD(selected_cols, selectedCols, selectedCols);
   WRITE_BITMAPSET_FIELD(inserted_cols, insertedCols, insertedCols);

src/include/pg_query_readfuncs_defs.c

@@ -1419,7 +1419,7 @@ _readRTEPermissionInfo(OUT_TYPE(RTEPermissionInfo, RTEPermissionInfo) msg)
   RTEPermissionInfo *node = makeNode(RTEPermissionInfo);
   READ_UINT_FIELD(relid, relid, relid);
   READ_BOOL_FIELD(inh, inh, inh);
-  READ_LONG_FIELD(required_perms, requiredPerms, requiredPerms);
+  READ_UINT64_FIELD(required_perms, requiredPerms, requiredPerms);
   READ_UINT_FIELD(check_as_user, checkAsUser, checkAsUser);
   READ_BITMAPSET_FIELD(selected_cols, selectedCols, selectedCols);
   READ_BITMAPSET_FIELD(inserted_cols, insertedCols, insertedCols);

src/pg_query_outfuncs_json.c

@@ -36,6 +36,12 @@
 		appendStringInfo(out, "\"" CppAsString(outname_json) "\":%u,", node->fldname); \
 	}
 
+/* Write an unsigned integer field */
+#define WRITE_UINT64_FIELD(outname, outname_json, fldname) \
+	if (node->fldname != 0) { \
+		appendStringInfo(out, "\"" CppAsString(outname_json) "\":" UINT64_FORMAT ",", node->fldname); \
+	}
+
 /* Write a long-integer field */
 #define WRITE_LONG_FIELD(outname, outname_json, fldname) \
 	if (node->fldname != 0) { \

src/pg_query_outfuncs_protobuf.c

@@ -23,6 +23,7 @@
 
 #define WRITE_INT_FIELD(outname, outname_json, fldname) out->outname = node->fldname;
 #define WRITE_UINT_FIELD(outname, outname_json, fldname) out->outname = node->fldname;
+#define WRITE_UINT64_FIELD(outname, outname_json, fldname) out->outname = node->fldname;
 #define WRITE_LONG_FIELD(outname, outname_json, fldname) out->outname = node->fldname;
 #define WRITE_FLOAT_FIELD(outname, outname_json, fldname) out->outname = node->fldname;
 #define WRITE_BOOL_FIELD(outname, outname_json, fldname) out->outname = node->fldname;

src/pg_query_outfuncs_protobuf_cpp.cc

@@ -32,6 +32,7 @@ extern "C"
 
 #define WRITE_INT_FIELD(outname, outname_json, fldname) out->set_##outname(node->fldname);
 #define WRITE_UINT_FIELD(outname, outname_json, fldname) out->set_##outname(node->fldname);
+#define WRITE_UINT64_FIELD(outname, outname_json, fldname) out->set_##outname(node->fldname);
 #define WRITE_LONG_FIELD(outname, outname_json, fldname) out->set_##outname(node->fldname);
 #define WRITE_FLOAT_FIELD(outname, outname_json, fldname) out->set_##outname(node->fldname);
 #define WRITE_BOOL_FIELD(outname, outname_json, fldname) out->set_##outname(node->fldname);

src/pg_query_readfuncs_protobuf.c

@@ -14,6 +14,7 @@
 
 #define READ_INT_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;
 #define READ_UINT_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;
+#define READ_UINT64_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;
 #define READ_LONG_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;
 #define READ_FLOAT_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;
 #define READ_BOOL_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;

src/postgres/include/pg_config.h

@@ -841,11 +841,30 @@
 #if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 38) || __GLIBC__ > 2))
 #define HAVE_STRCHRNUL
 #endif
+#if defined(_WIN32) || __SIZEOF_POINTER__ == 4
+#undef ALIGNOF_DOUBLE
+#define ALIGNOF_DOUBLE 4
+#undef ALIGNOF_LONG
+#define ALIGNOF_LONG 4
+#define ALIGNOF_LONG_LONG_INT 4
+#undef ALIGNOF_PG_INT128_TYPE
+#undef HAVE_LONG_INT_64
+#define HAVE_LONG_LONG_INT_64 1
+#undef INT64_MODIFIER
+#define INT64_MODIFIER "ll"
+#undef PG_INT128_TYPE
+#undef PG_INT64_TYPE
+#define PG_INT64_TYPE long long int
+#undef SIZEOF_LONG
+#define SIZEOF_LONG 4
+#undef SIZEOF_SIZE_T
+#define SIZEOF_SIZE_T 4
+#undef SIZEOF_VOID_P
+#define SIZEOF_VOID_P 4
+#endif
 #if defined(_WIN32) || defined(_WIN64)
 #define WIN32 1
 #define __thread __declspec( thread )
-#undef SIZEOF_VOID_P
-#define SIZEOF_VOID_P 4
 #undef HAVE_STRINGS_H
 #undef HAVE_VISIBILITY_ATTRIBUTE
 #undef HAVE__BUILTIN_CONSTANT_P

src/postgres/src_port_pg_bitutils.c

@@ -2,6 +2,8 @@
  * Symbols referenced in this file:
  * - pg_popcount64
  * - pg_popcount64_slow
+ * - pg_popcount32
+ * - pg_popcount32_slow
  *--------------------------------------------------------------------
  */
 
@@ -209,9 +211,23 @@ __asm__ __volatile__(" popcntq %1,%0\n":"=q"(res):"rm"(word):"cc");
  * pg_popcount32_slow
  *		Return the number of 1 bits set in word
  */
+static int
+pg_popcount32_slow(uint32 word)
+{
 #ifdef HAVE__BUILTIN_POPCOUNT
+	return __builtin_popcount(word);
 #else							/* !HAVE__BUILTIN_POPCOUNT */
+	int			result = 0;
+
+	while (word != 0)
+	{
+		result += pg_number_of_ones[word & 255];
+		word >>= 8;
+	}
+
+	return result;
 #endif							/* HAVE__BUILTIN_POPCOUNT */
+}
 
 /*
  * pg_popcount64_slow
@@ -250,7 +266,11 @@ pg_popcount64_slow(uint64 word)
  * TRY_POPCNT_FAST is not defined.  The compiler should be able to inline
  * the slow versions here.
  */
-
+int
+pg_popcount32(uint32 word)
+{
+	return pg_popcount32_slow(word);
+}
 
 int
 pg_popcount64(uint64 word)