From cf7bfdb22b7c51ccf7c99c076944b48fdc666f83 Mon Sep 17 00:00:00 2001
From: Jason Petersen <jason@citusdata.com>
Date: Wed, 19 Apr 2017 20:44:54 -0600
Subject: [PATCH] Address various header changes

Certain PostgreSQL 10 changes require modifications to our includes:

  * pg_sequence's interace has been refactored into its own file
  * textToQualifiedNameList is now in utils/varlena.h
  * pg_getnameinfo_all is now in common/ip.h
  * stringToQualifiedNameList is now in utils/regproc.h
---
 src/backend/distributed/master/master_node_protocol.c       | 3 +++
 src/backend/distributed/master/worker_node_manager.c        | 4 ++++
 src/backend/distributed/planner/multi_logical_optimizer.c   | 3 +++
 src/backend/distributed/worker/worker_data_fetch_protocol.c | 4 ++++
 src/include/distributed/citus_ruleutils.h                   | 3 +++
 5 files changed, 17 insertions(+)

diff --git a/src/backend/distributed/master/master_node_protocol.c b/src/backend/distributed/master/master_node_protocol.c
index d7214cf04..b075518e3 100644
--- a/src/backend/distributed/master/master_node_protocol.c
+++ b/src/backend/distributed/master/master_node_protocol.c
@@ -60,6 +60,9 @@
 #include "utils/relcache.h"
 #include "utils/ruleutils.h"
 #include "utils/tqual.h"
+#if (PG_VERSION_NUM >= 100000)
+#include "utils/varlena.h"
+#endif
 
 
 /* Shard related configuration */
diff --git a/src/backend/distributed/master/worker_node_manager.c b/src/backend/distributed/master/worker_node_manager.c
index 0953bf7d2..64e1cc891 100644
--- a/src/backend/distributed/master/worker_node_manager.c
+++ b/src/backend/distributed/master/worker_node_manager.c
@@ -19,7 +19,11 @@
 #include "distributed/metadata_cache.h"
 #include "distributed/multi_client_executor.h"
 #include "libpq/hba.h"
+#if (PG_VERSION_NUM >= 100000)
+#include "common/ip.h"
+#else
 #include "libpq/ip.h"
+#endif
 #include "libpq/libpq-be.h"
 #include "postmaster/postmaster.h"
 #include "storage/fd.h"
diff --git a/src/backend/distributed/planner/multi_logical_optimizer.c b/src/backend/distributed/planner/multi_logical_optimizer.c
index 180fb01e9..edfbf7349 100644
--- a/src/backend/distributed/planner/multi_logical_optimizer.c
+++ b/src/backend/distributed/planner/multi_logical_optimizer.c
@@ -47,6 +47,9 @@
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
+#if (PG_VERSION_NUM >= 100000)
+#include "utils/regproc.h"
+#endif
 #include "utils/rel.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
diff --git a/src/backend/distributed/worker/worker_data_fetch_protocol.c b/src/backend/distributed/worker/worker_data_fetch_protocol.c
index 8d6852a57..cda912c64 100644
--- a/src/backend/distributed/worker/worker_data_fetch_protocol.c
+++ b/src/backend/distributed/worker/worker_data_fetch_protocol.c
@@ -42,6 +42,10 @@
 #include "tcop/utility.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#if (PG_VERSION_NUM >= 100000)
+#include "utils/regproc.h"
+#include "utils/varlena.h"
+#endif
 
 
 /* Config variable managed via guc.c */
diff --git a/src/include/distributed/citus_ruleutils.h b/src/include/distributed/citus_ruleutils.h
index e7eaf9204..d46766bbb 100644
--- a/src/include/distributed/citus_ruleutils.h
+++ b/src/include/distributed/citus_ruleutils.h
@@ -14,6 +14,9 @@
 #include "postgres.h" /* IWYU pragma: keep */
 #include "c.h"
 
+#if (PG_VERSION_NUM >= 100000)
+#include "catalog/pg_sequence.h"
+#endif
 #include "commands/sequence.h"
 #include "lib/stringinfo.h"
 #include "nodes/parsenodes.h"