bdr: clean up include file mess

diff --git a/contrib/bdr/bdr.c b/contrib/bdr/bdr.c
index e45f554d3307e68e5c906db8125172a42248a608..e7206a192bb10689d816f40e0704501eb112950a 100644 (file)
--- a/contrib/bdr/bdr.c
+++ b/contrib/bdr/bdr.c
@@ -16,32 +16,37 @@
 
 #include "bdr.h"
 
-/* These are always necessary for a bgworker */
+#include "libpq-fe.h"
 #include "miscadmin.h"
-#include "postmaster/bgworker.h"
-#include "storage/ipc.h"
-#include "storage/latch.h"
-#include "storage/lwlock.h"
-#include "storage/proc.h"
-#include "storage/shmem.h"
-
-/* these headers are used by this particular worker's code */
 #include "pgstat.h"
-
 #include "port.h"
+
 #include "access/committs.h"
 #include "access/heapam.h"
 #include "access/xact.h"
+
+#include "catalog/catversion.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_extension.h"
-#include "catalog/pg_index.h"
-#include "catalog/catversion.h"
+
 #include "commands/extension.h"
+
 #include "lib/stringinfo.h"
+
 #include "libpq/pqformat.h"
+
 #include "mb/pg_wchar.h"
-#include "postmaster/bgwriter.h"
+
+#include "postmaster/bgworker.h"
+
 #include "replication/replication_identifier.h"
+
+#include "storage/ipc.h"
+#include "storage/latch.h"
+#include "storage/lwlock.h"
+#include "storage/proc.h"
+#include "storage/shmem.h"
+
 #include "utils/builtins.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
@@ -50,13 +55,6 @@
 #include "utils/syscache.h"
 #include "utils/timestamp.h"
 
-/* sequencer */
-#include "commands/extension.h"
-
-/* apply */
-#include "libpq-fe.h"
-
-
 #define MAXCONNINFO        1024
 
 static bool exit_worker = false;

diff --git a/contrib/bdr/bdr_apply.c b/contrib/bdr/bdr_apply.c
index b86b0f29ce52fb2b8bad76a74b2675821c77e508..1dfdd951c7c1b44ef45cc6f79313f843f4d86d8e 100644 (file)
--- a/contrib/bdr/bdr_apply.c
+++ b/contrib/bdr/bdr_apply.c
@@ -16,22 +16,15 @@
 
 #include "bdr.h"
 
-/* These are always necessary for a bgworker */
+#include "funcapi.h"
+#include "libpq-fe.h"
 #include "miscadmin.h"
-#include "postmaster/bgworker.h"
-#include "storage/ipc.h"
-#include "storage/latch.h"
-#include "storage/lwlock.h"
-#include "storage/proc.h"
-#include "storage/shmem.h"
-
 #include "pgstat.h"
 
 #include "access/committs.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
 #include "access/relscan.h"
-#include "access/sysattr.h"
 #include "access/xact.h"
 
 #include "catalog/dependency.h"
@@ -39,15 +32,9 @@
 #include "catalog/namespace.h"
 #include "catalog/pg_type.h"
 
-#include "executor/spi.h"
 #include "executor/executor.h"
 
-#include "funcapi.h"
-
 #include "libpq/pqformat.h"
-#include "libpq-fe.h"
-
-#include "miscadmin.h"
 
 #include "parser/parse_relation.h"
 #include "parser/parse_type.h"
@@ -57,6 +44,7 @@
 
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
+#include "storage/lwlock.h"
 
 #include "tcop/pquery.h"
 #include "tcop/tcopprot.h"

diff --git a/contrib/bdr/bdr_commandfilter.c b/contrib/bdr/bdr_commandfilter.c
index 2ba3eba03d55d0ac088a42a9634374ad85d69c15..808896896f2c234ec29451215d316d417b900d9b 100644 (file)
--- a/contrib/bdr/bdr_commandfilter.c
+++ b/contrib/bdr/bdr_commandfilter.c
@@ -13,13 +13,18 @@
  */
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "bdr.h"
+
+#include "fmgr.h"
+
+#include "access/heapam.h"
+
 #include "catalog/namespace.h"
+
 #include "commands/dbcommands.h"
-#include "fmgr.h"
-#include "miscadmin.h"
+
 #include "tcop/utility.h"
+
 #include "utils/guc.h"
 #include "utils/rel.h"
 

diff --git a/contrib/bdr/bdr_count.c b/contrib/bdr/bdr_count.c
index 775afadb74f2f91094a2fe632942ae5bb2221e48..55ddfdfd898a441ef8d9649b6f026a99253f4780 100644 (file)
--- a/contrib/bdr/bdr_count.c
+++ b/contrib/bdr/bdr_count.c
@@ -27,8 +27,8 @@
 
 #include "storage/fd.h"
 #include "storage/ipc.h"
-#include "storage/spin.h"
 #include "storage/lwlock.h"
+#include "storage/spin.h"
 
 #include "utils/builtins.h"
 #include "utils/syscache.h"

diff --git a/contrib/bdr/bdr_init_replica.c b/contrib/bdr/bdr_init_replica.c
index 7b7e4b6c72dc496fc15099744a7ab250082b26fb..fbcb9b118d61b04d897126845afc4fc0fb953496 100644 (file)
--- a/contrib/bdr/bdr_init_replica.c
+++ b/contrib/bdr/bdr_init_replica.c
@@ -16,39 +16,37 @@
  */
 #include "postgres.h"
 
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/errno.h>
+#include <sys/stat.h>
+
 #include "bdr.h"
 
-/* These are always necessary for a bgworker */
+#include "libpq-fe.h"
 #include "miscadmin.h"
-#include "postmaster/bgworker.h"
-#include "storage/ipc.h"
-#include "storage/latch.h"
-#include "storage/lwlock.h"
-#include "storage/proc.h"
-#include "storage/shmem.h"
 
 #include "libpq/pqformat.h"
-#include "libpq-fe.h"
 
 #include "access/heapam.h"
 #include "access/xact.h"
 
-#include "replication/walreceiver.h"
 #include "replication/replication_identifier.h"
+#include "replication/walreceiver.h"
 
+#include "postmaster/bgworker.h"
 #include "postmaster/bgwriter.h"
 
+#include "storage/ipc.h"
+#include "storage/latch.h"
+#include "storage/lwlock.h"
+#include "storage/proc.h"
+#include "storage/shmem.h"
+
 #include "utils/builtins.h"
 #include "utils/syscache.h"
 
-/* bdr_init_replica */
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/errno.h>
-#include <sys/stat.h>
-#include "postmaster/postmaster.h"
-
 char *bdr_temp_dump_directory = NULL;
 
 static void bdr_exec_init_replica(Name conn_name, char *snapshot);

diff --git a/contrib/bdr/bdr_output.c b/contrib/bdr/bdr_output.c
index d4a1cc346c9d4b74f1592473ea648ed3dc3baf48..b867d571d14c2c1a1c8433276ec01f3818472cf6 100644 (file)
--- a/contrib/bdr/bdr_output.c
+++ b/contrib/bdr/bdr_output.c
@@ -12,15 +12,15 @@
  */
 #include "postgres.h"
 
+#include "bdr.h"
+
 #include "access/sysattr.h"
 #include "access/tuptoaster.h"
 
-#include "bdr.h"
-
+#include "catalog/index.h"
 #include "catalog/pg_class.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_type.h"
-#include "catalog/index.h"
 
 #include "libpq/pqformat.h"
 
@@ -28,14 +28,13 @@
 
 #include "nodes/parsenodes.h"
 
-#include "replication/output_plugin.h"
 #include "replication/logical.h"
+#include "replication/output_plugin.h"
 
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
-#include "utils/relcache.h"
 #include "utils/syscache.h"
 #include "utils/timestamp.h"
 #include "utils/typcache.h"

diff --git a/contrib/bdr/bdr_seq.c b/contrib/bdr/bdr_seq.c
index 20fb5af9ca88851bfbaaa2272b67d2aced4e3083..7f4246ab660f36f1d527f1199056dabf00fa0c1d 100644 (file)
--- a/contrib/bdr/bdr_seq.c
+++ b/contrib/bdr/bdr_seq.c
@@ -16,21 +16,25 @@
 
 #include "bdr.h"
 
-/* sequencer */
 #include "miscadmin.h"
 #include "pgstat.h"
 
 #include "access/reloptions.h"
-#include "access/transam.h"
 #include "access/seqam.h"
+#include "access/transam.h"
 #include "access/xact.h"
-#include "catalog/pg_type.h"
+
 #include "catalog/namespace.h"
+#include "catalog/pg_type.h"
+
 #include "commands/sequence.h"
+
 #include "executor/spi.h"
+
 #include "utils/builtins.h"
-#include "utils/snapmgr.h"
 #include "utils/lsyscache.h"
+#include "utils/snapmgr.h"
+
 #include "storage/bufmgr.h"
 #include "storage/ipc.h"
 #include "storage/latch.h"