Merge 481b1099b6 into 1f445e1e0b

src/backend/distributed/executor/multi_real_time_executor.c

@@ -19,6 +19,7 @@
 #include "postgres.h"
 #include "miscadmin.h"
 
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "commands/dbcommands.h"

src/backend/distributed/executor/multi_task_tracker_executor.c

@@ -20,6 +20,7 @@
 #include "postgres.h"
 #include "miscadmin.h"
 
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "commands/dbcommands.h"

src/backend/distributed/test/connection_utils.c

@@ -13,9 +13,9 @@
  *-------------------------------------------------------------------------
  */
 
-#include "internal/c.h"
+#include "c.h"
 #include "libpq-fe.h"
-#include "internal/libpq-int.h"
+#include "libpq-int.h"
 
 #include "distributed/test_helper_functions.h"
 

src/backend/distributed/worker/worker_partition_protocol.c

@@ -17,6 +17,7 @@
 #include "postgres.h"
 #include "funcapi.h"
 
+#include <arpa/inet.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #ifdef HAVE_INTTYPES_H

src/include/distributed/master_metadata_utility.h

@@ -22,7 +22,7 @@
 
 
 /* total number of hash tokens (2^32) */
-#define HASH_TOKEN_COUNT INT64CONST(4294967296UL)
+#define HASH_TOKEN_COUNT INT64CONST(4294967296)
 
 /* In-memory representation of a typed tuple in pg_dist_shard. */
 typedef struct ShardInterval