Ordering of header file inclusion
Started by vignesh Cover 6 years ago38 messages
Hi,
I noticed that some of the header files inclusion is not ordered as
per the usual standard that is followed.
The attached patch contains the fix for the order in which the header
files are included.
Let me know your thoughts on the same.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Attachments:
0001-Ordering-of-header-file-inclusion.patchapplication/octet-stream; name=0001-Ordering-of-header-file-inclusion.patchDownload
From ac24f873323ffda43363621568564129a316c23f Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Wed, 2 Oct 2019 12:38:13 +0530
Subject: [PATCH] Ordering of header file inclusion.
Header files that are getting included must be in order.
---
src/backend/access/brin/brin_minmax.c | 4 ++--
src/backend/access/brin/brin_pageops.c | 2 +-
src/backend/access/brin/brin_validate.c | 2 +-
src/backend/access/gin/ginfast.c | 6 +++---
src/backend/access/gin/gininsert.c | 4 ++--
src/backend/access/gin/ginvalidate.c | 2 +-
src/backend/access/gist/gistget.c | 4 ++--
src/backend/access/gist/gistutil.c | 4 ++--
src/backend/access/hash/hash.c | 1 -
src/backend/access/hash/hash_xlog.c | 4 ++--
src/backend/access/hash/hashinsert.c | 4 ++--
src/backend/access/hash/hashpage.c | 2 +-
src/backend/access/hash/hashsearch.c | 2 +-
src/backend/access/heap/heapam_handler.c | 3 +--
src/backend/access/heap/pruneheap.c | 2 +-
src/backend/access/heap/rewriteheap.c | 3 +--
src/backend/access/nbtree/nbtxlog.c | 2 +-
src/backend/access/transam/clog.c | 2 +-
src/backend/access/transam/parallel.c | 2 +-
src/backend/access/transam/slru.c | 2 +-
src/backend/access/transam/twophase.c | 2 +-
src/backend/access/transam/xact.c | 2 +-
src/backend/access/transam/xlog.c | 8 ++++----
src/backend/access/transam/xlogarchive.c | 2 +-
src/backend/access/transam/xlogfuncs.c | 2 +-
src/backend/access/transam/xloginsert.c | 2 +-
src/backend/access/transam/xlogreader.c | 2 +-
src/backend/catalog/catalog.c | 2 +-
src/backend/catalog/index.c | 4 ++--
src/backend/catalog/objectaddress.c | 8 ++++----
src/backend/catalog/pg_enum.c | 2 +-
src/backend/catalog/pg_publication.c | 6 +++---
src/backend/catalog/pg_shdepend.c | 2 +-
src/backend/catalog/pg_subscription.c | 4 ++--
src/backend/catalog/pg_type.c | 2 +-
src/backend/catalog/storage.c | 3 +--
src/bin/pg_checksums/pg_checksums.c | 2 +-
src/bin/pg_resetwal/pg_resetwal.c | 6 +++---
src/bin/pg_waldump/compat.c | 2 +-
src/bin/psql/command.c | 8 ++++----
src/bin/psql/describe.c | 4 ++--
src/bin/psql/tab-complete.c | 2 +-
src/bin/psql/variables.c | 4 +---
43 files changed, 66 insertions(+), 72 deletions(-)
diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c
index ad0d18e..60c3f22 100644
--- a/src/backend/access/brin/brin_minmax.c
+++ b/src/backend/access/brin/brin_minmax.c
@@ -10,12 +10,12 @@
*/
#include "postgres.h"
-#include "access/genam.h"
#include "access/brin_internal.h"
#include "access/brin_tuple.h"
+#include "access/genam.h"
#include "access/stratnum.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_amop.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/datum.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c
index f907b4b..c58f4a5 100644
--- a/src/backend/access/brin/brin_pageops.c
+++ b/src/backend/access/brin/brin_pageops.c
@@ -10,8 +10,8 @@
*/
#include "postgres.h"
-#include "access/brin_pageops.h"
#include "access/brin_page.h"
+#include "access/brin_pageops.h"
#include "access/brin_revmap.h"
#include "access/brin_xlog.h"
#include "access/xloginsert.h"
diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index 0129338..2536dec 100644
--- a/src/backend/access/brin/brin_validate.c
+++ b/src/backend/access/brin/brin_validate.c
@@ -22,8 +22,8 @@
#include "catalog/pg_opfamily.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
+#include "utils/syscache.h"
/*
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index 439a91b..397f14d 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -22,13 +22,13 @@
#include "access/ginxlog.h"
#include "access/xloginsert.h"
#include "access/xlog.h"
-#include "commands/vacuum.h"
#include "catalog/pg_am.h"
+#include "commands/vacuum.h"
#include "miscadmin.h"
+#include "postmaster/autovacuum.h"
+#include "utils/acl.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "utils/acl.h"
-#include "postmaster/autovacuum.h"
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index 55eab14..b790340 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -16,14 +16,14 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/tableam.h"
+#include "access/xloginsert.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/smgr.h"
#include "storage/indexfsm.h"
#include "storage/predicate.h"
+#include "storage/smgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 63bd7f2..fdc53d8 100644
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -23,8 +23,8 @@
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
+#include "utils/syscache.h"
/*
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 22d790d..98b6892 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -17,11 +17,11 @@
#include "access/genam.h"
#include "access/gist_private.h"
#include "access/relscan.h"
+#include "lib/pairingheap.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "pgstat.h"
-#include "lib/pairingheap.h"
#include "utils/float.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
index 45804d7..bd1331e 100644
--- a/src/backend/access/gist/gistutil.c
+++ b/src/backend/access/gist/gistutil.c
@@ -22,9 +22,9 @@
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "utils/float.h"
-#include "utils/syscache.h"
-#include "utils/snapmgr.h"
#include "utils/lsyscache.h"
+#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 5cc30da..6ca39fa 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -31,7 +31,6 @@
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/rel.h"
-#include "miscadmin.h"
/* Working state for hashbuild and its callback */
diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c
index 86e7210..515d137 100644
--- a/src/backend/access/hash/hash_xlog.c
+++ b/src/backend/access/hash/hash_xlog.c
@@ -17,11 +17,11 @@
#include "access/bufmask.h"
#include "access/hash.h"
#include "access/hash_xlog.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "access/transam.h"
-#include "storage/procarray.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* replay a hash index meta page
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 89876d2..e0ca1b0 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -18,10 +18,10 @@
#include "access/hash.h"
#include "access/hash_xlog.h"
#include "miscadmin.h"
-#include "utils/rel.h"
-#include "storage/lwlock.h"
#include "storage/buf_internals.h"
+#include "storage/lwlock.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static void _hash_vacuum_one_page(Relation rel, Relation hrel,
Buffer metabuf, Buffer buf);
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 838ee68..91d8429 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -32,8 +32,8 @@
#include "access/hash_xlog.h"
#include "miscadmin.h"
#include "storage/lmgr.h"
-#include "storage/smgr.h"
#include "storage/predicate.h"
+#include "storage/smgr.h"
static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock,
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 79ae499..725e614 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -18,8 +18,8 @@
#include "access/relscan.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "utils/rel.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static bool _hash_readpage(IndexScanDesc scan, Buffer *bufP,
ScanDirection dir);
diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
index 2dd8821..327b16b 100644
--- a/src/backend/access/heap/heapam_handler.c
+++ b/src/backend/access/heap/heapam_handler.c
@@ -19,8 +19,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/heaptoast.h"
@@ -35,6 +33,7 @@
#include "catalog/storage_xlog.h"
#include "commands/progress.h"
#include "executor/executor.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/bufpage.h"
diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
index a0d2217..b3d1446 100644
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@ -16,8 +16,8 @@
#include "access/heapam.h"
#include "access/heapam_xlog.h"
-#include "access/transam.h"
#include "access/htup_details.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
#include "miscadmin.h"
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
index 0172a13..9d059e0 100644
--- a/src/backend/access/heap/rewriteheap.c
+++ b/src/backend/access/heap/rewriteheap.c
@@ -105,7 +105,6 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
#include "access/heapam.h"
#include "access/heapam_xlog.h"
@@ -118,7 +117,7 @@
#include "catalog/catalog.h"
#include "lib/ilist.h"
-
+#include "miscadmin.h"
#include "pgstat.h"
#include "replication/logical.h"
diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index dd5315c..44f6283 100644
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -20,8 +20,8 @@
#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlogutils.h"
-#include "storage/procarray.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* _bt_restore_page -- re-enter all the index tuples on a page
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index 595c860..7f7eb21 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -39,8 +39,8 @@
#include "access/xloginsert.h"
#include "access/xlogutils.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "storage/proc.h"
/*
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
index 55d129a..caac43d 100644
--- a/src/backend/access/transam/parallel.c
+++ b/src/backend/access/transam/parallel.c
@@ -19,9 +19,9 @@
#include "access/session.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_enum.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
+#include "catalog/pg_enum.h"
#include "commands/async.h"
#include "executor/execParallel.h"
#include "libpq/libpq.h"
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index e38f919..0cb3554 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -54,10 +54,10 @@
#include "access/slru.h"
#include "access/transam.h"
#include "access/xlog.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/fd.h"
#include "storage/shmem.h"
-#include "miscadmin.h"
#define SlruFileName(ctl, path, seg) \
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 546bd43..9a96197 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -85,8 +85,8 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "access/xloginsert.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
+#include "access/xlogutils.h"
#include "catalog/pg_type.h"
#include "catalog/storage.h"
#include "funcapi.h"
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 9162286..1ebcfef 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -40,6 +40,7 @@
#include "libpq/be-fsstubs.h"
#include "libpq/pqsignal.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "replication/logical.h"
#include "replication/logicallauncher.h"
@@ -65,7 +66,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
/*
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 61ba6b8..e9d010a 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -15,11 +15,11 @@
#include "postgres.h"
#include <ctype.h>
-#include <math.h>
-#include <time.h>
#include <fcntl.h>
+#include <math.h>
#include <sys/stat.h>
#include <sys/time.h>
+#include <time.h>
#include <unistd.h>
#include "access/clog.h"
@@ -42,6 +42,7 @@
#include "commands/tablespace.h"
#include "common/controldata_utils.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "port/atomics.h"
#include "postmaster/bgwriter.h"
@@ -49,8 +50,8 @@
#include "postmaster/startup.h"
#include "replication/basebackup.h"
#include "replication/logical.h"
-#include "replication/slot.h"
#include "replication/origin.h"
+#include "replication/slot.h"
#include "replication/snapbuild.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
@@ -74,7 +75,6 @@
#include "utils/relmapper.h"
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
extern uint32 bootstrap_data_checksum_version;
diff --git a/src/backend/access/transam/xlogarchive.c b/src/backend/access/transam/xlogarchive.c
index 9a21f00..c72817f 100644
--- a/src/backend/access/transam/xlogarchive.c
+++ b/src/backend/access/transam/xlogarchive.c
@@ -14,9 +14,9 @@
#include "postgres.h"
+#include <signal.h>
#include <sys/stat.h>
#include <sys/wait.h>
-#include <signal.h>
#include <unistd.h>
#include "access/xlog.h"
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index 8f17988..3fb2fb1 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -29,9 +29,9 @@
#include "replication/walreceiver.h"
#include "storage/smgr.h"
#include "utils/builtins.h"
+#include "utils/guc.h"
#include "utils/memutils.h"
#include "utils/numeric.h"
-#include "utils/guc.h"
#include "utils/pg_lsn.h"
#include "utils/timestamp.h"
#include "utils/tuplestore.h"
diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c
index 3ec67d4..aa9dca0 100644
--- a/src/backend/access/transam/xloginsert.c
+++ b/src/backend/access/transam/xloginsert.c
@@ -26,11 +26,11 @@
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/proc.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/* Buffer size required to store a compressed version of backup block image */
#define PGLZ_MAX_BLCKSZ PGLZ_MAX_OUTPUT(BLCKSZ)
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index c8b0d23..bc12c78 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -18,9 +18,9 @@
#include "postgres.h"
#include "access/transam.h"
-#include "access/xlogrecord.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
+#include "access/xlogrecord.h"
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "replication/origin.h"
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 1af31c2..59ac65b 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -31,9 +31,9 @@
#include "catalog/pg_auth_members.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_pltemplate.h"
-#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_replication_origin.h"
#include "catalog/pg_shdepend.h"
#include "catalog/pg_shdescription.h"
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 098732c..c4b6902 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -46,8 +46,8 @@
#include "catalog/pg_description.h"
#include "catalog/pg_depend.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_tablespace.h"
#include "catalog/pg_trigger.h"
#include "catalog/pg_type.h"
@@ -76,9 +76,9 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_rusage.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/snapmgr.h"
/* Potentially set by pg_upgrade_support functions */
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index ce8a4e9..55fa285 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -29,13 +29,13 @@
#include "catalog/pg_attrdef.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_cast.h"
-#include "catalog/pg_default_acl.h"
-#include "catalog/pg_enum.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_conversion.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_default_acl.h"
+#include "catalog/pg_enum.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_extension.h"
#include "catalog/pg_foreign_data_wrapper.h"
#include "catalog/pg_foreign_server.h"
@@ -46,8 +46,8 @@
#include "catalog/pg_opclass.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_operator.h"
-#include "catalog/pg_proc.h"
#include "catalog/pg_policy.h"
+#include "catalog/pg_proc.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
#include "catalog/pg_rewrite.h"
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index d0ff802..c204588 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -22,9 +22,9 @@
#include "catalog/indexing.h"
#include "catalog/pg_enum.h"
#include "catalog/pg_type.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "nodes/value.h"
+#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/fmgroids.h"
diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index fd5da7d..1ae5646 100644
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -14,8 +14,6 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
#include "access/genam.h"
#include "access/heapam.h"
@@ -30,9 +28,11 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
+#include "catalog/pg_type.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index fb7f8dd..f06c476 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -47,9 +47,9 @@
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
#include "commands/alter.h"
-#include "commands/dbcommands.h"
#include "commands/collationcmds.h"
#include "commands/conversioncmds.h"
+#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index afee283..268e7c6 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -14,7 +14,6 @@
#include "postgres.h"
-#include "miscadmin.h"
#include "access/genam.h"
#include "access/heapam.h"
@@ -23,10 +22,11 @@
#include "access/xact.h"
#include "catalog/indexing.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
+#include "catalog/pg_type.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "storage/lmgr.h"
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 2a51501..a8c1de5 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-#include "catalog/catalog.h"
#include "catalog/binary_upgrade.h"
+#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/objectaccess.h"
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index b8c9b6f..e22dec1 100644
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -19,8 +19,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/visibilitymap.h"
#include "access/xact.h"
#include "access/xlog.h"
@@ -28,6 +26,7 @@
#include "access/xlogutils.h"
#include "catalog/storage.h"
#include "catalog/storage_xlog.h"
+#include "miscadmin.h"
#include "storage/freespace.h"
#include "storage/smgr.h"
#include "utils/memutils.h"
diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
index 971ae73..09e82b8 100644
--- a/src/bin/pg_checksums/pg_checksums.c
+++ b/src/bin/pg_checksums/pg_checksums.c
@@ -15,8 +15,8 @@
#include "postgres_fe.h"
#include <dirent.h>
-#include <time.h>
#include <sys/stat.h>
+#include <time.h>
#include <unistd.h>
#include "access/xlog_internal.h"
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index f85ea2d..06c6b96 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -44,9 +44,9 @@
#include <time.h>
#include <unistd.h>
-#include "access/transam.h"
#include "access/heaptoast.h"
#include "access/multixact.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlog_internal.h"
#include "common/controldata_utils.h"
@@ -55,9 +55,9 @@
#include "common/logging.h"
#include "common/restricted_token.h"
#include "common/string.h"
-#include "storage/large_object.h"
-#include "pg_getopt.h"
#include "getopt_long.h"
+#include "pg_getopt.h"
+#include "storage/large_object.h"
static ControlFileData ControlFile; /* pg_control values */
diff --git a/src/bin/pg_waldump/compat.c b/src/bin/pg_waldump/compat.c
index 0e0dca7..7b389a2 100644
--- a/src/bin/pg_waldump/compat.c
+++ b/src/bin/pg_waldump/compat.c
@@ -20,8 +20,8 @@
#include <time.h>
-#include "utils/datetime.h"
#include "lib/stringinfo.h"
+#include "utils/datetime.h"
/* copied from timestamp.c */
pg_time_t
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index b981ae8..96d20ae 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -12,15 +12,15 @@
#include <time.h>
#include <pwd.h>
#ifndef WIN32
-#include <sys/stat.h> /* for stat() */
#include <fcntl.h> /* open() flags */
+#include <sys/stat.h> /* for stat() */
#include <unistd.h> /* for geteuid(), getpid(), stat() */
#else
-#include <win32.h>
-#include <io.h>
-#include <fcntl.h>
#include <direct.h>
+#include <fcntl.h>
+#include <io.h>
#include <sys/stat.h> /* for stat() */
+#include <win32.h>
#endif
#include "catalog/pg_class_d.h"
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index d7c0fc0..8da6a45 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -19,13 +19,13 @@
#include "catalog/pg_class_d.h"
#include "catalog/pg_default_acl_d.h"
+#include "common.h"
#include "common/logging.h"
+#include "describe.h"
#include "fe_utils/mbprint.h"
#include "fe_utils/print.h"
#include "fe_utils/string_utils.h"
-#include "common.h"
-#include "describe.h"
#include "settings.h"
#include "variables.h"
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index e00dbab..559a638 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -44,9 +44,9 @@
#include "catalog/pg_am_d.h"
#include "catalog/pg_class_d.h"
+#include "common.h"
#include "libpq-fe.h"
#include "pqexpbuffer.h"
-#include "common.h"
#include "settings.h"
#include "stringutils.h"
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index 1d2a31c..3f7b641 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -8,10 +8,8 @@
#include "postgres_fe.h"
#include "common.h"
-#include "variables.h"
-
#include "common/logging.h"
-
+#include "variables.h"
/*
* Check whether a variable's name is allowed.
--
1.8.3.1
Re: Ordering of header file inclusion
On Wed, Oct 2, 2019 at 2:57 PM vignesh C <vignesh21@gmail.com> wrote:
Hi,
I noticed that some of the header files inclusion is not ordered as
per the usual standard that is followed.
The attached patch contains the fix for the order in which the header
files are included.
Let me know your thoughts on the same.
+1. I think this will make an order of header inclusions consistent
throughout code. One thing which will be slightly tricky is we might
not be able to back-patch this as some of this belongs to a recent
version(s) and others to older versions as well. OTOH, I have not
investigated how much of this is relevant to back branches. I think
most of these will apply to 12, but I am not sure if it is worth the
effort to segregate the changes which apply to back branches. What do
you think?
Few minor comments after a quick read:
#include "lib/ilist.h"
-
+#include "miscadmin.h"I think we shouldn't remove the extra line as part of the above change.
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -8,10 +8,8 @@
#include "postgres_fe.h" #include "common.h"
-#include "variables.h"
-
#include "common/logging.h"
-
+#include "variables.h"Same as above.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
Amit Kapila <amit.kapila16@gmail.com> writes:
On Wed, Oct 2, 2019 at 2:57 PM vignesh C <vignesh21@gmail.com> wrote:
I noticed that some of the header files inclusion is not ordered as
per the usual standard that is followed.
The attached patch contains the fix for the order in which the header
files are included.
Let me know your thoughts on the same.
+1.
FWIW, I'm not on board with reordering system-header inclusions.
Some platforms have (had?) ordering dependencies for those, and where
that's true, it's seldom alphabetical. It's only our own headers
where we can safely expect that any arbitrary order will work.
I think we shouldn't remove the extra line as part of the above change.
I would take out the blank lines between our own #includes. Those are
totally arbitrary and unnecessary. The whole point of style rules like
this one is to reduce the differences between the way one person might
write something and the way that someone else might. Deciding to throw
in a blank line is surely in the realm of unnecessary differences.
regards, tom lane
Re: Ordering of header file inclusion
On Tue, Oct 8, 2019 at 8:19 PM Tom Lane <tgl@sss.pgh.pa.us> wrote:
Amit Kapila <amit.kapila16@gmail.com> writes:
On Wed, Oct 2, 2019 at 2:57 PM vignesh C <vignesh21@gmail.com> wrote:
I noticed that some of the header files inclusion is not ordered as
per the usual standard that is followed.
The attached patch contains the fix for the order in which the header
files are included.
Let me know your thoughts on the same.+1.
FWIW, I'm not on board with reordering system-header inclusions.
Some platforms have (had?) ordering dependencies for those, and where
that's true, it's seldom alphabetical. It's only our own headers
where we can safely expect that any arbitrary order will work.
Okay, that makes sense. However, I noticed that ordering for
system-header inclusions is somewhat random. For ex. nodeSubPlan.c,
datetime.c, etc. include limits.h first and then math.h whereas
knapsack.c, float.c includes them in reverse order. There could be
more such inconsistencies and the probable reason is that we don't
have any specific rule, so different people decide to do it
differently.
I think we shouldn't remove the extra line as part of the above change.
I would take out the blank lines between our own #includes.
Okay, that would be better, but doing it half-heartedly as done in
patch might make it worse. So, it is better to remove blank lines
between our own #includes in all cases.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Wed, Oct 9, 2019 at 11:37 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Tue, Oct 8, 2019 at 8:19 PM Tom Lane <tgl@sss.pgh.pa.us> wrote:
Amit Kapila <amit.kapila16@gmail.com> writes:
On Wed, Oct 2, 2019 at 2:57 PM vignesh C <vignesh21@gmail.com> wrote:
I noticed that some of the header files inclusion is not ordered as
per the usual standard that is followed.
The attached patch contains the fix for the order in which the header
files are included.
Let me know your thoughts on the same.+1.
FWIW, I'm not on board with reordering system-header inclusions.
Some platforms have (had?) ordering dependencies for those, and where
that's true, it's seldom alphabetical. It's only our own headers
where we can safely expect that any arbitrary order will work.Okay, that makes sense. However, I noticed that ordering for
system-header inclusions is somewhat random. For ex. nodeSubPlan.c,
datetime.c, etc. include limits.h first and then math.h whereas
knapsack.c, float.c includes them in reverse order. There could be
more such inconsistencies and the probable reason is that we don't
have any specific rule, so different people decide to do it
differently.I think we shouldn't remove the extra line as part of the above change.
I would take out the blank lines between our own #includes.
Okay, that would be better, but doing it half-heartedly as done in
patch might make it worse. So, it is better to remove blank lines
between our own #includes in all cases.
Attached patch contains the fix based on the comments suggested.
I have added/deleted extra lines in certain places so that the
readability is better.
I have removed the duplicate includes of certain header files in same
source file.
In some place postgres header files was getting included as
<postgres_header.h>, I have changed it to "postgres_header.h".
Let me know if any change is required.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Attachments:
Ordering-of-header-files-15thOctober.patchapplication/octet-stream; name=Ordering-of-header-files-15thOctober.patchDownload
From ff9a305b15c47fd8b87d3e53b013ca0ab8037aff Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Tue, 15 Oct 2019 22:50:21 +0530
Subject: [PATCH] Ordering of header files.
Ordering of header files that is included in source code.
---
contrib/bloom/blcost.c | 2 +-
contrib/bloom/blinsert.c | 2 +-
contrib/bloom/blscan.c | 4 ++--
contrib/bloom/blutils.c | 9 ++++---
contrib/bloom/blvalidate.c | 2 +-
contrib/btree_gin/btree_gin.c | 2 +-
contrib/btree_gist/btree_enum.c | 4 ++--
contrib/btree_gist/btree_inet.c | 2 +-
contrib/btree_gist/btree_numeric.c | 2 +-
contrib/btree_gist/btree_utils_var.c | 4 ++--
contrib/cube/cube.c | 2 +-
contrib/dblink/dblink.c | 2 +-
contrib/hstore/hstore_gist.c | 2 +-
contrib/hstore/hstore_io.c | 2 +-
contrib/hstore/hstore_op.c | 2 +-
contrib/hstore_plpython/hstore_plpython.c | 4 ++--
contrib/intarray/_int_bool.c | 4 ++--
contrib/intarray/_int_gin.c | 4 ++--
contrib/intarray/_int_gist.c | 4 ++--
contrib/intarray/_int_selfuncs.c | 4 ++--
contrib/intarray/_int_tool.c | 4 ++--
contrib/intarray/_intbig_gist.c | 4 ++--
contrib/isn/isn.c | 2 +-
contrib/jsonb_plperl/jsonb_plperl.c | 2 +-
contrib/jsonb_plpython/jsonb_plpython.c | 4 ++--
contrib/ltree/_ltree_gist.c | 4 ++--
contrib/ltree/crc32.c | 2 +-
contrib/ltree/lquery_op.c | 2 +-
contrib/ltree/ltree_io.c | 2 +-
contrib/ltree/ltree_op.c | 2 +-
contrib/ltree_plpython/ltree_plpython.c | 2 +-
contrib/oid2name/oid2name.c | 2 +-
contrib/pageinspect/brinfuncs.c | 6 ++---
contrib/pageinspect/btreefuncs.c | 2 +-
contrib/pageinspect/fsmfuncs.c | 2 +-
contrib/pageinspect/ginfuncs.c | 2 +-
contrib/pageinspect/hashfuncs.c | 4 ++--
contrib/pageinspect/heapfuncs.c | 4 ++--
contrib/pageinspect/rawpage.c | 2 +-
contrib/passwordcheck/passwordcheck.c | 2 +-
contrib/pg_standby/pg_standby.c | 4 ++--
contrib/pg_trgm/trgm_gin.c | 2 +-
contrib/pg_trgm/trgm_gist.c | 2 +-
contrib/pg_trgm/trgm_op.c | 2 +-
contrib/pg_trgm/trgm_regexp.c | 2 +-
contrib/pgcrypto/crypt-md5.c | 2 +-
contrib/pgcrypto/internal.c | 6 ++---
contrib/pgcrypto/mbuf.c | 2 +-
contrib/pgcrypto/openssl.c | 2 +-
contrib/pgcrypto/pgcrypto.c | 6 ++---
contrib/pgcrypto/pgp-armor.c | 2 +-
contrib/pgcrypto/pgp-cfb.c | 2 +-
contrib/pgcrypto/pgp-compress.c | 2 +-
contrib/pgcrypto/pgp-decrypt.c | 2 +-
contrib/pgcrypto/pgp-encrypt.c | 2 +-
contrib/pgcrypto/pgp-info.c | 2 +-
contrib/pgcrypto/pgp-mpi-internal.c | 2 +-
contrib/pgcrypto/pgp-mpi-openssl.c | 2 +-
contrib/pgcrypto/pgp-mpi.c | 2 +-
contrib/pgcrypto/pgp-pgsql.c | 12 +++++-----
contrib/pgcrypto/pgp-pubdec.c | 2 +-
contrib/pgcrypto/pgp-pubenc.c | 2 +-
contrib/pgcrypto/pgp-pubkey.c | 2 +-
contrib/pgcrypto/pgp-s2k.c | 2 +-
contrib/pgcrypto/pgp.c | 2 +-
contrib/pgcrypto/px-crypt.c | 2 +-
contrib/pgstattuple/pgstatapprox.c | 6 ++---
contrib/postgres_fdw/connection.c | 2 +-
contrib/postgres_fdw/deparse.c | 2 +-
contrib/postgres_fdw/option.c | 2 +-
contrib/postgres_fdw/postgres_fdw.c | 2 +-
contrib/postgres_fdw/shippable.c | 2 +-
contrib/sepgsql/database.c | 4 ++--
contrib/sepgsql/dml.c | 4 ++--
contrib/sepgsql/hooks.c | 2 +-
contrib/sepgsql/label.c | 4 ++--
contrib/sepgsql/proc.c | 2 +-
contrib/sepgsql/relation.c | 6 ++---
contrib/sepgsql/schema.c | 2 +-
contrib/sepgsql/uavc.c | 2 +-
contrib/spi/moddatetime.c | 2 +-
contrib/tablefunc/tablefunc.c | 2 +-
contrib/tcn/tcn.c | 2 +-
contrib/vacuumlo/vacuumlo.c | 2 +-
src/backend/access/brin/brin_minmax.c | 4 ++--
src/backend/access/brin/brin_pageops.c | 2 +-
src/backend/access/brin/brin_tuple.c | 2 +-
src/backend/access/brin/brin_validate.c | 2 +-
src/backend/access/gin/ginbtree.c | 2 +-
src/backend/access/gin/ginfast.c | 10 ++++----
src/backend/access/gin/gininsert.c | 4 ++--
src/backend/access/gin/ginvalidate.c | 2 +-
src/backend/access/gist/gist.c | 2 +-
src/backend/access/gist/gistget.c | 4 ++--
src/backend/access/gist/gistutil.c | 4 ++--
src/backend/access/hash/hash.c | 1 -
src/backend/access/hash/hash_xlog.c | 6 ++---
src/backend/access/hash/hashinsert.c | 4 ++--
src/backend/access/hash/hashpage.c | 2 +-
src/backend/access/hash/hashsearch.c | 2 +-
src/backend/access/hash/hashutil.c | 2 +-
src/backend/access/heap/heapam_handler.c | 3 +--
src/backend/access/heap/pruneheap.c | 4 ++--
src/backend/access/heap/rewriteheap.c | 6 ++---
src/backend/access/nbtree/nbtxlog.c | 2 +-
src/backend/access/spgist/spgquadtreeproc.c | 2 +-
src/backend/access/transam/clog.c | 2 +-
src/backend/access/transam/parallel.c | 2 +-
src/backend/access/transam/rmgr.c | 4 ++--
src/backend/access/transam/slru.c | 2 +-
src/backend/access/transam/twophase.c | 2 +-
src/backend/access/transam/xact.c | 2 +-
src/backend/access/transam/xlog.c | 6 ++---
src/backend/access/transam/xlogfuncs.c | 6 ++---
src/backend/access/transam/xloginsert.c | 2 +-
src/backend/access/transam/xlogreader.c | 2 +-
src/backend/catalog/aclchk.c | 4 ++--
src/backend/catalog/catalog.c | 2 +-
src/backend/catalog/index.c | 6 ++---
src/backend/catalog/objectaddress.c | 10 ++++----
src/backend/catalog/partition.c | 2 +-
src/backend/catalog/pg_enum.c | 2 +-
src/backend/catalog/pg_publication.c | 8 +++----
src/backend/catalog/pg_shdepend.c | 6 ++---
src/backend/catalog/pg_subscription.c | 6 ++---
src/backend/catalog/pg_type.c | 2 +-
src/backend/catalog/storage.c | 2 +-
src/backend/commands/alter.c | 4 ++--
src/backend/commands/cluster.c | 4 ++--
src/backend/commands/copy.c | 2 +-
src/backend/commands/createas.c | 2 +-
src/backend/commands/dbcommands.c | 2 +-
src/backend/commands/event_trigger.c | 6 ++---
src/backend/commands/functioncmds.c | 2 +-
src/backend/commands/lockcmds.c | 4 ++--
src/backend/commands/opclasscmds.c | 2 +-
src/backend/commands/policy.c | 2 +-
src/backend/commands/publicationcmds.c | 8 +++----
src/backend/commands/schemacmds.c | 2 +-
src/backend/commands/subscriptioncmds.c | 6 ++---
src/backend/commands/tablecmds.c | 1 -
src/backend/commands/tablespace.c | 2 +-
src/backend/commands/variable.c | 4 ++--
src/backend/commands/view.c | 2 +-
src/backend/executor/execAmi.c | 1 -
src/backend/executor/execExprInterp.c | 4 ++--
src/backend/executor/execGrouping.c | 2 +-
src/backend/executor/execParallel.c | 4 ++--
src/backend/executor/execProcnode.c | 2 +-
src/backend/executor/execTuples.c | 2 +-
src/backend/executor/nodeAgg.c | 2 +-
src/backend/executor/nodeBitmapHeapscan.c | 2 +-
src/backend/executor/nodeCustom.c | 2 +-
src/backend/executor/nodeHash.c | 2 +-
src/backend/executor/nodeSubplan.c | 2 +-
src/backend/executor/nodeTableFuncscan.c | 2 +-
src/backend/executor/nodeWindowAgg.c | 2 +-
src/backend/jit/jit.c | 4 ++--
src/backend/jit/llvm/llvmjit.c | 4 ++--
src/backend/jit/llvm/llvmjit_expr.c | 2 +-
src/backend/libpq/hba.c | 2 +-
src/backend/nodes/nodeFuncs.c | 2 +-
src/backend/optimizer/geqo/geqo_cx.c | 2 +-
src/backend/optimizer/geqo/geqo_erx.c | 2 +-
src/backend/optimizer/path/clausesel.c | 2 +-
src/backend/optimizer/plan/initsplan.c | 2 +-
src/backend/optimizer/plan/planagg.c | 2 +-
src/backend/optimizer/plan/planner.c | 6 ++---
src/backend/optimizer/prep/preptlist.c | 2 +-
src/backend/optimizer/util/pathnode.c | 2 +-
src/backend/optimizer/util/plancat.c | 8 +++----
src/backend/parser/parse_clause.c | 10 ++++----
src/backend/parser/parse_expr.c | 2 +-
src/backend/parser/parse_node.c | 2 +-
src/backend/parser/parse_relation.c | 2 +-
src/backend/parser/parse_target.c | 2 +-
src/backend/parser/parse_type.c | 2 +-
src/backend/parser/scansup.c | 2 +-
src/backend/partitioning/partbounds.c | 2 +-
src/backend/partitioning/partdesc.c | 4 ++--
src/backend/postmaster/bgworker.c | 2 +-
src/backend/postmaster/bgwriter.c | 2 +-
src/backend/postmaster/pgstat.c | 2 +-
src/backend/replication/basebackup.c | 2 +-
.../libpqwalreceiver/libpqwalreceiver.c | 4 ++--
src/backend/replication/logical/decode.c | 4 ++--
src/backend/replication/logical/launcher.c | 10 ++++----
src/backend/replication/logical/logical.c | 8 +++----
src/backend/replication/logical/logicalfuncs.c | 28 +++++++++++-----------
src/backend/replication/logical/message.c | 4 ++--
src/backend/replication/logical/origin.c | 16 ++++++-------
src/backend/replication/logical/snapbuild.c | 14 +++++------
src/backend/replication/logical/tablesync.c | 8 +++----
src/backend/replication/pgoutput/pgoutput.c | 2 +-
src/backend/replication/slotfuncs.c | 2 +-
src/backend/rewrite/rowsecurity.c | 2 +-
src/backend/statistics/dependencies.c | 4 ++--
src/backend/statistics/mvdistinct.c | 6 ++---
src/backend/storage/buffer/buf_init.c | 2 +-
src/backend/storage/buffer/buf_table.c | 2 +-
src/backend/storage/file/buffile.c | 4 ++--
src/backend/storage/file/copydir.c | 4 ++--
src/backend/storage/file/fd.c | 2 +-
src/backend/storage/ipc/dsm_impl.c | 4 ++--
src/backend/storage/ipc/ipci.c | 2 +-
src/backend/storage/ipc/procsignal.c | 2 +-
src/backend/storage/ipc/sinvaladt.c | 2 +-
src/backend/storage/lmgr/lwlock.c | 2 +-
src/backend/storage/lmgr/proc.c | 2 +-
src/backend/storage/lmgr/s_lock.c | 2 +-
src/backend/storage/page/checksum.c | 4 ++--
src/backend/storage/smgr/md.c | 8 +++----
src/backend/storage/sync/sync.c | 8 +++----
src/backend/tcop/postgres.c | 6 ++---
src/backend/tcop/utility.c | 6 ++---
src/backend/tsearch/wparser.c | 2 +-
src/backend/utils/adt/acl.c | 4 ++--
src/backend/utils/adt/datetime.c | 2 +-
src/backend/utils/adt/format_type.c | 2 +-
src/backend/utils/adt/int8.c | 2 +-
src/backend/utils/adt/json.c | 4 ++--
src/backend/utils/adt/jsonb.c | 4 ++--
src/backend/utils/adt/jsonpath_exec.c | 4 ++--
src/backend/utils/adt/misc.c | 6 ++---
src/backend/utils/adt/oracle_compat.c | 2 +-
src/backend/utils/adt/rangetypes_gist.c | 2 +-
src/backend/utils/adt/regproc.c | 4 ++--
src/backend/utils/adt/ri_triggers.c | 2 +-
src/backend/utils/adt/ruleutils.c | 2 +-
src/backend/utils/adt/tsquery.c | 2 +-
src/backend/utils/adt/tsquery_cleanup.c | 2 +-
src/backend/utils/adt/tsquery_gist.c | 2 +-
src/backend/utils/adt/tsquery_util.c | 2 +-
src/backend/utils/adt/tsrank.c | 2 +-
src/backend/utils/adt/txid.c | 2 +-
src/backend/utils/adt/varchar.c | 2 +-
src/backend/utils/cache/evtcache.c | 4 ++--
src/backend/utils/cache/relcache.c | 2 +-
src/backend/utils/cache/relfilenodemap.c | 2 +-
src/backend/utils/cache/syscache.c | 2 +-
.../utf8_and_cyrillic/utf8_and_cyrillic.c | 2 +-
.../utf8_and_iso8859/utf8_and_iso8859.c | 2 +-
src/backend/utils/misc/guc.c | 8 +++----
src/backend/utils/misc/pg_config.c | 6 ++---
src/backend/utils/misc/pg_controldata.c | 2 +-
src/backend/utils/misc/ps_status.c | 2 +-
src/backend/utils/misc/superuser.c | 2 +-
src/backend/utils/mmgr/slab.c | 2 +-
src/backend/utils/time/combocid.c | 2 +-
src/bin/pg_archivecleanup/pg_archivecleanup.c | 4 ++--
src/bin/pg_basebackup/pg_basebackup.c | 2 +-
src/bin/pg_basebackup/pg_receivewal.c | 4 ++--
src/bin/pg_basebackup/pg_recvlogical.c | 8 +++----
src/bin/pg_basebackup/receivelog.c | 10 ++++----
src/bin/pg_basebackup/streamutil.c | 8 +++----
src/bin/pg_basebackup/walmethods.c | 2 +-
src/bin/pg_config/pg_config.c | 2 +-
src/bin/pg_controldata/pg_controldata.c | 2 +-
src/bin/pg_dump/common.c | 8 +++----
src/bin/pg_dump/parallel.c | 2 +-
src/bin/pg_dump/pg_backup_archiver.c | 8 +++----
src/bin/pg_dump/pg_backup_custom.c | 2 +-
src/bin/pg_dump/pg_backup_db.c | 14 +++++------
src/bin/pg_dump/pg_backup_directory.c | 8 +++----
src/bin/pg_dump/pg_backup_null.c | 4 ++--
src/bin/pg_dump/pg_backup_tar.c | 14 +++++------
src/bin/pg_dump/pg_dump.c | 12 +++++-----
src/bin/pg_dump/pg_dump_sort.c | 2 +-
src/bin/pg_dump/pg_dumpall.c | 8 +++----
src/bin/pg_dump/pg_restore.c | 2 +-
src/bin/pg_resetwal/pg_resetwal.c | 6 ++---
src/bin/pg_rewind/datapagemap.c | 4 ++--
src/bin/pg_rewind/fetch.c | 2 +-
src/bin/pg_rewind/filemap.c | 4 ++--
src/bin/pg_rewind/libpq_fetch.c | 6 ++---
src/bin/pg_rewind/parsexlog.c | 4 ++--
src/bin/pg_rewind/pg_rewind.c | 8 +++----
src/bin/pg_rewind/timeline.c | 4 ++--
src/bin/pg_test_fsync/pg_test_fsync.c | 2 +-
src/bin/pg_upgrade/controldata.c | 4 ++--
src/bin/pg_upgrade/dump.c | 4 ++--
src/bin/pg_upgrade/file.c | 14 +++++------
src/bin/pg_upgrade/function.c | 4 ++--
src/bin/pg_upgrade/info.c | 4 ++--
src/bin/pg_upgrade/option.c | 4 ++--
src/bin/pg_upgrade/pg_upgrade.c | 10 ++++----
src/bin/pg_upgrade/relfilenode.c | 6 ++---
src/bin/pg_upgrade/util.c | 4 ++--
src/bin/pg_upgrade/version.c | 4 ++--
src/bin/pg_waldump/compat.c | 2 +-
src/bin/pg_waldump/pg_waldump.c | 2 +-
src/bin/pgbench/pgbench.c | 16 ++++++-------
src/bin/psql/common.c | 8 +++----
src/bin/psql/copy.c | 10 ++++----
src/bin/psql/crosstabview.c | 2 +-
src/bin/psql/describe.c | 4 ++--
src/bin/psql/help.c | 2 +-
src/bin/psql/input.c | 4 ++--
src/bin/psql/large_obj.c | 4 ++--
src/bin/psql/mainloop.c | 6 ++---
src/bin/psql/prompt.c | 2 +-
src/bin/psql/startup.c | 8 +++----
src/bin/psql/variables.c | 2 +-
src/common/f2s.c | 2 +-
src/fe_utils/print.c | 4 ++--
src/fe_utils/recovery_gen.c | 2 +-
src/fe_utils/string_utils.c | 4 ++--
src/interfaces/ecpg/compatlib/informix.c | 16 ++++++-------
src/interfaces/ecpg/ecpglib/connect.c | 4 ++--
src/interfaces/ecpg/ecpglib/data.c | 10 ++++----
src/interfaces/ecpg/ecpglib/descriptor.c | 4 ++--
src/interfaces/ecpg/ecpglib/error.c | 2 +-
src/interfaces/ecpg/ecpglib/execute.c | 14 +++++------
src/interfaces/ecpg/ecpglib/memory.c | 4 ++--
src/interfaces/ecpg/ecpglib/misc.c | 10 ++++----
src/interfaces/ecpg/ecpglib/prepare.c | 4 ++--
src/interfaces/ecpg/ecpglib/sqlda.c | 8 +++----
src/interfaces/ecpg/ecpglib/typename.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/common.c | 2 +-
src/interfaces/ecpg/pgtypeslib/datetime.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/dt_common.c | 2 +-
src/interfaces/ecpg/pgtypeslib/interval.c | 2 +-
src/interfaces/ecpg/pgtypeslib/numeric.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/timestamp.c | 4 ++--
src/interfaces/ecpg/preproc/c_keywords.c | 6 ++---
src/interfaces/ecpg/preproc/ecpg_keywords.c | 6 ++---
src/interfaces/libpq/fe-auth.c | 2 +-
src/interfaces/libpq/fe-connect.c | 8 +++----
src/interfaces/libpq/fe-exec.c | 10 ++++----
src/interfaces/libpq/fe-misc.c | 2 +-
src/interfaces/libpq/fe-protocol2.c | 8 +++----
src/interfaces/libpq/fe-protocol3.c | 12 +++++-----
src/interfaces/libpq/fe-secure-gssapi.c | 2 +-
src/interfaces/libpq/fe-secure.c | 8 +++----
src/pl/plpgsql/src/pl_comp.c | 4 ++--
src/pl/plpgsql/src/pl_exec.c | 4 ++--
src/pl/plpgsql/src/pl_funcs.c | 4 ++--
src/pl/plpgsql/src/pl_handler.c | 2 +-
src/pl/plpython/plpy_cursorobject.c | 2 +-
src/pl/plpython/plpy_exec.c | 12 +++++-----
src/pl/plpython/plpy_main.c | 12 +++++-----
src/pl/plpython/plpy_planobject.c | 4 ++--
src/pl/plpython/plpy_plpymodule.c | 6 ++---
src/pl/plpython/plpy_procedure.c | 14 +++++------
src/pl/plpython/plpy_resultobject.c | 2 +-
src/pl/plpython/plpy_spi.c | 10 ++++----
src/pl/plpython/plpy_subxactobject.c | 6 ++---
src/pl/plpython/plpy_typeio.c | 12 +++++-----
src/pl/plpython/plpy_util.c | 4 ++--
src/port/pg_crc32c_armv8.c | 4 ++--
src/port/pg_crc32c_sse42.c | 4 ++--
src/port/tar.c | 2 +-
src/test/examples/testlibpq3.c | 2 +-
src/test/isolation/isolationtester.c | 4 ++--
.../test_ginpostinglist/test_ginpostinglist.c | 2 +-
src/test/modules/test_integerset/test_integerset.c | 6 ++---
src/test/modules/test_rls_hooks/test_rls_hooks.c | 7 +++---
src/test/modules/test_shm_mq/setup.c | 2 +-
src/test/modules/worker_spi/worker_spi.c | 17 +++++++------
src/test/regress/pg_regress.c | 2 +-
src/test/regress/regress.c | 2 +-
361 files changed, 719 insertions(+), 726 deletions(-)
diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c
index f9fe57f..6224735 100644
--- a/contrib/bloom/blcost.c
+++ b/contrib/bloom/blcost.c
@@ -12,10 +12,10 @@
*/
#include "postgres.h"
+#include "bloom.h"
#include "fmgr.h"
#include "utils/selfuncs.h"
-#include "bloom.h"
/*
* Estimate cost of bloom index scan.
diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c
index 4b2186b..45215ba 100644
--- a/contrib/bloom/blinsert.c
+++ b/contrib/bloom/blinsert.c
@@ -15,6 +15,7 @@
#include "access/genam.h"
#include "access/generic_xlog.h"
#include "access/tableam.h"
+#include "bloom.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
@@ -23,7 +24,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "bloom.h"
PG_MODULE_MAGIC;
diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c
index 49e364a..4b9a2b8 100644
--- a/contrib/bloom/blscan.c
+++ b/contrib/bloom/blscan.c
@@ -13,14 +13,14 @@
#include "postgres.h"
#include "access/relscan.h"
-#include "pgstat.h"
+#include "bloom.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "bloom.h"
/*
* Begin scan of bloom index.
diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c
index dbb24cb..ba143cd 100644
--- a/contrib/bloom/blutils.c
+++ b/contrib/bloom/blutils.c
@@ -15,17 +15,16 @@
#include "access/amapi.h"
#include "access/generic_xlog.h"
+#include "access/reloptions.h"
+#include "bloom.h"
#include "catalog/index.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/indexfsm.h"
-#include "utils/memutils.h"
-#include "access/reloptions.h"
#include "storage/freespace.h"
#include "storage/indexfsm.h"
+#include "storage/lmgr.h"
+#include "utils/memutils.h"
-#include "bloom.h"
/* Signature dealing macros - note i is assumed to be of type int */
#define GETWORD(x,i) ( *( (BloomSignatureWord *)(x) + ( (i) / SIGNWORDBITS ) ) )
diff --git a/contrib/bloom/blvalidate.c b/contrib/bloom/blvalidate.c
index e9bd1b4..05eec2a 100644
--- a/contrib/bloom/blvalidate.c
+++ b/contrib/bloom/blvalidate.c
@@ -14,6 +14,7 @@
#include "access/amvalidate.h"
#include "access/htup_details.h"
+#include "bloom.h"
#include "catalog/pg_amop.h"
#include "catalog/pg_amproc.h"
#include "catalog/pg_opclass.h"
@@ -24,7 +25,6 @@
#include "utils/regproc.h"
#include "utils/syscache.h"
-#include "bloom.h"
/*
* Validator for a bloom opclass.
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c
index 2ecf7a2..0ed3d58 100644
--- a/contrib/btree_gin/btree_gin.c
+++ b/contrib/btree_gin/btree_gin.c
@@ -14,8 +14,8 @@
#include "utils/inet.h"
#include "utils/numeric.h"
#include "utils/timestamp.h"
-#include "utils/varbit.h"
#include "utils/uuid.h"
+#include "utils/varbit.h"
PG_MODULE_MAGIC;
diff --git a/contrib/btree_gist/btree_enum.c b/contrib/btree_gist/btree_enum.c
index 0ec7d8b..b563012 100644
--- a/contrib/btree_gist/btree_enum.c
+++ b/contrib/btree_gist/btree_enum.c
@@ -2,11 +2,11 @@
* contrib/btree_gist/btree_enum.c
*/
#include "postgres.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
#include "btree_gist.h"
#include "btree_utils_num.h"
+#include "fmgr.h"
+#include "utils/builtins.h"
/* enums are really Oids, so we just use the same structure */
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 34308cc..a3b4301 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -5,9 +5,9 @@
#include "btree_gist.h"
#include "btree_utils_num.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/inet.h"
-#include "catalog/pg_type.h"
typedef struct inetkey
{
diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c
index b72060c..10806f3 100644
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -3,11 +3,11 @@
*/
#include "postgres.h"
-#include "btree_gist.h"
#include <math.h>
#include <float.h>
+#include "btree_gist.h"
#include "btree_utils_var.h"
#include "utils/builtins.h"
#include "utils/numeric.h"
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 670c879..4c827f9 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -3,15 +3,15 @@
*/
#include "postgres.h"
-#include "btree_gist.h"
#include <math.h>
#include <limits.h>
#include <float.h>
+#include "btree_gist.h"
#include "btree_utils_var.h"
-#include "utils/pg_locale.h"
#include "utils/builtins.h"
+#include "utils/pg_locale.h"
#include "utils/rel.h"
/* used for key sorting */
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index b720366..9e7a06d 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -12,10 +12,10 @@
#include "access/gist.h"
#include "access/stratnum.h"
+#include "cubedata.h"
#include "utils/array.h"
#include "utils/float.h"
-#include "cubedata.h"
PG_MODULE_MAGIC;
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index e432457..2c759ad 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -34,7 +34,6 @@
#include <limits.h>
-#include "libpq-fe.h"
#include "access/htup_details.h"
#include "access/relation.h"
@@ -50,6 +49,7 @@
#include "foreign/foreign.h"
#include "funcapi.h"
#include "lib/stringinfo.h"
+#include "libpq-fe.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "parser/scansup.h"
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index 6a885f2..52974c3 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -6,9 +6,9 @@
#include "access/gist.h"
#include "access/stratnum.h"
#include "catalog/pg_type.h"
+#include "hstore.h"
#include "utils/pg_crc.h"
-#include "hstore.h"
/* bigint defines */
#define BITBYTE 8
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
index 745497c..542f4b5 100644
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -8,6 +8,7 @@
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "hstore.h"
#include "lib/stringinfo.h"
#include "libpq/pqformat.h"
#include "utils/builtins.h"
@@ -18,7 +19,6 @@
#include "utils/memutils.h"
#include "utils/typcache.h"
-#include "hstore.h"
PG_MODULE_MAGIC;
diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index a3a8a91..ba22c85 100644
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -6,11 +6,11 @@
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "hstore.h"
#include "utils/builtins.h"
#include "utils/hashutils.h"
#include "utils/memutils.h"
-#include "hstore.h"
/* old names for C functions */
HSTORE_POLLUTE(hstore_fetchval, fetchval);
diff --git a/contrib/hstore_plpython/hstore_plpython.c b/contrib/hstore_plpython/hstore_plpython.c
index 93705f0..4dee569 100644
--- a/contrib/hstore_plpython/hstore_plpython.c
+++ b/contrib/hstore_plpython/hstore_plpython.c
@@ -1,9 +1,9 @@
#include "postgres.h"
#include "fmgr.h"
-#include "plpython.h"
-#include "plpy_typeio.h"
#include "hstore/hstore.h"
+#include "plpy_typeio.h"
+#include "plpython.h"
PG_MODULE_MAGIC;
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 91e2a80..0d2f667 100644
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -3,11 +3,11 @@
*/
#include "postgres.h"
+#include "_int.h"
+
#include "miscadmin.h"
#include "utils/builtins.h"
-#include "_int.h"
-
PG_FUNCTION_INFO_V1(bqarr_in);
PG_FUNCTION_INFO_V1(bqarr_out);
PG_FUNCTION_INFO_V1(boolop);
diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c
index 7aebfec..d6241d4 100644
--- a/contrib/intarray/_int_gin.c
+++ b/contrib/intarray/_int_gin.c
@@ -3,11 +3,11 @@
*/
#include "postgres.h"
+#include "_int.h"
+
#include "access/gin.h"
#include "access/stratnum.h"
-#include "_int.h"
-
PG_FUNCTION_INFO_V1(ginint4_queryextract);
Datum
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
index e5a8011..8b44f8d 100644
--- a/contrib/intarray/_int_gist.c
+++ b/contrib/intarray/_int_gist.c
@@ -5,11 +5,11 @@
#include <limits.h>
+#include "_int.h"
+
#include "access/gist.h"
#include "access/stratnum.h"
-#include "_int.h"
-
#define GETENTRY(vec,pos) ((ArrayType *) DatumGetPointer((vec)->vector[(pos)].key))
/*
diff --git a/contrib/intarray/_int_selfuncs.c b/contrib/intarray/_int_selfuncs.c
index aebffae..6d555de 100644
--- a/contrib/intarray/_int_selfuncs.c
+++ b/contrib/intarray/_int_selfuncs.c
@@ -19,11 +19,11 @@
#include "catalog/pg_operator.h"
#include "catalog/pg_statistic.h"
#include "catalog/pg_type.h"
+#include "miscadmin.h"
#include "utils/builtins.h"
+#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
#include "utils/syscache.h"
-#include "utils/lsyscache.h"
-#include "miscadmin.h"
PG_FUNCTION_INFO_V1(_int_overlap_sel);
PG_FUNCTION_INFO_V1(_int_contains_sel);
diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c
index fde8d15..75ad04e 100644
--- a/contrib/intarray/_int_tool.c
+++ b/contrib/intarray/_int_tool.c
@@ -5,10 +5,10 @@
#include <limits.h>
-#include "catalog/pg_type.h"
-
#include "_int.h"
+#include "catalog/pg_type.h"
+
/* arguments are assumed sorted & unique-ified */
bool
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index 2a20abe..87ea86c 100644
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -3,12 +3,12 @@
*/
#include "postgres.h"
+#include "_int.h"
+
#include "access/gist.h"
#include "access/stratnum.h"
#include "port/pg_bitutils.h"
-#include "_int.h"
-
#define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer((vec)->vector[(pos)].key))
/*
** _intbig methods
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 0c2cac7..36bb582 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -15,9 +15,9 @@
#include "postgres.h"
#include "fmgr.h"
+#include "isn.h"
#include "utils/builtins.h"
-#include "isn.h"
#include "EAN13.h"
#include "ISBN.h"
#include "ISMN.h"
diff --git a/contrib/jsonb_plperl/jsonb_plperl.c b/contrib/jsonb_plperl/jsonb_plperl.c
index 04b04df..4ae1353 100644
--- a/contrib/jsonb_plperl/jsonb_plperl.c
+++ b/contrib/jsonb_plperl/jsonb_plperl.c
@@ -5,8 +5,8 @@
#include "fmgr.h"
#include "plperl.h"
#include "plperl_helpers.h"
-#include "utils/jsonb.h"
#include "utils/fmgrprotos.h"
+#include "utils/jsonb.h"
PG_MODULE_MAGIC;
diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c
index 776cf7c..ecaa4c6 100644
--- a/contrib/jsonb_plpython/jsonb_plpython.c
+++ b/contrib/jsonb_plpython/jsonb_plpython.c
@@ -1,10 +1,10 @@
#include "postgres.h"
-#include "plpython.h"
#include "plpy_elog.h"
#include "plpy_typeio.h"
-#include "utils/jsonb.h"
+#include "plpython.h"
#include "utils/fmgrprotos.h"
+#include "utils/jsonb.h"
#include "utils/numeric.h"
PG_MODULE_MAGIC;
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index c33ac4e..5719a82 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -9,10 +9,10 @@
#include "access/gist.h"
#include "access/stratnum.h"
-#include "port/pg_bitutils.h"
-
#include "crc32.h"
#include "ltree.h"
+#include "port/pg_bitutils.h"
+
PG_FUNCTION_INFO_V1(_ltree_compress);
diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c
index 447e4b2..0c3e459 100644
--- a/contrib/ltree/crc32.c
+++ b/contrib/ltree/crc32.c
@@ -16,8 +16,8 @@
#define TOLOWER(x) (x)
#endif
-#include "utils/pg_crc.h"
#include "crc32.h"
+#include "utils/pg_crc.h"
unsigned int
ltree_crc32_sz(char *buf, int size)
diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c
index 62172d5..fa47710 100644
--- a/contrib/ltree/lquery_op.c
+++ b/contrib/ltree/lquery_op.c
@@ -8,8 +8,8 @@
#include <ctype.h>
#include "catalog/pg_collation.h"
-#include "utils/formatting.h"
#include "ltree.h"
+#include "utils/formatting.h"
PG_FUNCTION_INFO_V1(ltq_regex);
PG_FUNCTION_INFO_V1(ltq_rregex);
diff --git a/contrib/ltree/ltree_io.c b/contrib/ltree/ltree_io.c
index f54f037..900a46a 100644
--- a/contrib/ltree/ltree_io.c
+++ b/contrib/ltree/ltree_io.c
@@ -7,9 +7,9 @@
#include <ctype.h>
+#include "crc32.h"
#include "ltree.h"
#include "utils/memutils.h"
-#include "crc32.h"
PG_FUNCTION_INFO_V1(ltree_in);
PG_FUNCTION_INFO_V1(ltree_out);
diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c
index df61c63..070868f 100644
--- a/contrib/ltree/ltree_op.c
+++ b/contrib/ltree/ltree_op.c
@@ -9,10 +9,10 @@
#include "access/htup_details.h"
#include "catalog/pg_statistic.h"
+#include "ltree.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
-#include "ltree.h"
PG_MODULE_MAGIC;
diff --git a/contrib/ltree_plpython/ltree_plpython.c b/contrib/ltree_plpython/ltree_plpython.c
index b254aa5..1570e77 100644
--- a/contrib/ltree_plpython/ltree_plpython.c
+++ b/contrib/ltree_plpython/ltree_plpython.c
@@ -1,8 +1,8 @@
#include "postgres.h"
#include "fmgr.h"
-#include "plpython.h"
#include "ltree/ltree.h"
+#include "plpython.h"
PG_MODULE_MAGIC;
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index fa1e795..e647a08 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -13,9 +13,9 @@
#include "common/logging.h"
#include "fe_utils/connect.h"
+#include "getopt_long.h"
#include "libpq-fe.h"
#include "pg_getopt.h"
-#include "getopt_long.h"
/* an extensible array to keep track of elements to show */
diff --git a/contrib/pageinspect/brinfuncs.c b/contrib/pageinspect/brinfuncs.c
index 04140ec..08264d0 100644
--- a/contrib/pageinspect/brinfuncs.c
+++ b/contrib/pageinspect/brinfuncs.c
@@ -9,23 +9,23 @@
*/
#include "postgres.h"
-#include "pageinspect.h"
-#include "access/htup_details.h"
#include "access/brin.h"
#include "access/brin_internal.h"
#include "access/brin_page.h"
#include "access/brin_revmap.h"
#include "access/brin_tuple.h"
+#include "access/htup_details.h"
#include "catalog/index.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "lib/stringinfo.h"
+#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
-#include "miscadmin.h"
PG_FUNCTION_INFO_V1(brin_page_type);
diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
index 8d27c9b..638928d 100644
--- a/contrib/pageinspect/btreefuncs.c
+++ b/contrib/pageinspect/btreefuncs.c
@@ -27,7 +27,6 @@
#include "postgres.h"
-#include "pageinspect.h"
#include "access/nbtree.h"
#include "access/relation.h"
@@ -35,6 +34,7 @@
#include "catalog/pg_am.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/builtins.h"
#include "utils/rel.h"
#include "utils/varlena.h"
diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c
index 4b3c596..0be1307 100644
--- a/contrib/pageinspect/fsmfuncs.c
+++ b/contrib/pageinspect/fsmfuncs.c
@@ -19,11 +19,11 @@
#include "postgres.h"
-#include "pageinspect.h"
#include "funcapi.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "storage/fsm_internals.h"
#include "utils/builtins.h"
diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c
index 229f9f9..ff0b5ed 100644
--- a/contrib/pageinspect/ginfuncs.c
+++ b/contrib/pageinspect/ginfuncs.c
@@ -9,7 +9,6 @@
*/
#include "postgres.h"
-#include "pageinspect.h"
#include "access/gin.h"
#include "access/gin_private.h"
@@ -18,6 +17,7 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/pageinspect/hashfuncs.c b/contrib/pageinspect/hashfuncs.c
index 9374c4a..eb904fd 100644
--- a/contrib/pageinspect/hashfuncs.c
+++ b/contrib/pageinspect/hashfuncs.c
@@ -10,14 +10,14 @@
#include "postgres.h"
-#include "pageinspect.h"
#include "access/hash.h"
#include "access/htup_details.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_am.h"
+#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
index 02e2ab9..8c1a5b8 100644
--- a/contrib/pageinspect/heapfuncs.c
+++ b/contrib/pageinspect/heapfuncs.c
@@ -25,14 +25,14 @@
#include "postgres.h"
-#include "pageinspect.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "funcapi.h"
#include "catalog/pg_am_d.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "port/pg_bitutils.h"
#include "utils/array.h"
#include "utils/builtins.h"
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index f08f62f..ee1b009 100644
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -15,7 +15,6 @@
#include "postgres.h"
-#include "pageinspect.h"
#include "access/htup_details.h"
#include "access/relation.h"
@@ -23,6 +22,7 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "storage/bufmgr.h"
#include "storage/checksum.h"
#include "utils/builtins.h"
diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c
index c3fb5a9..6810cab 100644
--- a/contrib/passwordcheck/passwordcheck.c
+++ b/contrib/passwordcheck/passwordcheck.c
@@ -21,8 +21,8 @@
#endif
#include "commands/user.h"
-#include "libpq/crypt.h"
#include "fmgr.h"
+#include "libpq/crypt.h"
PG_MODULE_MAGIC;
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index 031b1b5..093ba03 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -30,10 +30,10 @@
#include <signal.h>
#include <sys/time.h>
-#include "pg_getopt.h"
-
#include "access/xlog_internal.h"
+#include "pg_getopt.h"
+
const char *progname;
int WalSegSz = -1;
diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c
index 1b9809b..f5cea48 100644
--- a/contrib/pg_trgm/trgm_gin.c
+++ b/contrib/pg_trgm/trgm_gin.c
@@ -3,11 +3,11 @@
*/
#include "postgres.h"
-#include "trgm.h"
#include "access/gin.h"
#include "access/stratnum.h"
#include "fmgr.h"
+#include "trgm.h"
PG_FUNCTION_INFO_V1(gin_extract_trgm);
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
index e79db8a..ef6d117 100644
--- a/contrib/pg_trgm/trgm_gist.c
+++ b/contrib/pg_trgm/trgm_gist.c
@@ -3,11 +3,11 @@
*/
#include "postgres.h"
-#include "trgm.h"
#include "access/stratnum.h"
#include "fmgr.h"
#include "port/pg_bitutils.h"
+#include "trgm.h"
typedef struct
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
index 0d4614e..ae54773 100644
--- a/contrib/pg_trgm/trgm_op.c
+++ b/contrib/pg_trgm/trgm_op.c
@@ -5,9 +5,9 @@
#include <ctype.h>
+#include "catalog/pg_type.h"
#include "trgm.h"
-#include "catalog/pg_type.h"
#include "tsearch/ts_locale.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
diff --git a/contrib/pg_trgm/trgm_regexp.c b/contrib/pg_trgm/trgm_regexp.c
index 3ad5731..f8a6f5d 100644
--- a/contrib/pg_trgm/trgm_regexp.c
+++ b/contrib/pg_trgm/trgm_regexp.c
@@ -191,9 +191,9 @@
*/
#include "postgres.h"
-#include "trgm.h"
#include "regex/regexport.h"
+#include "trgm.h"
#include "tsearch/ts_locale.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
diff --git a/contrib/pgcrypto/crypt-md5.c b/contrib/pgcrypto/crypt-md5.c
index 6a09d76..b6466d3 100644
--- a/contrib/pgcrypto/crypt-md5.c
+++ b/contrib/pgcrypto/crypt-md5.c
@@ -8,8 +8,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
+#include "px.h"
#define MD5_SIZE 16
diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
index db58408..a12d7b4 100644
--- a/contrib/pgcrypto/internal.c
+++ b/contrib/pgcrypto/internal.c
@@ -33,11 +33,11 @@
#include <time.h>
-#include "px.h"
-#include "md5.h"
-#include "sha1.h"
#include "blf.h"
+#include "md5.h"
+#include "px.h"
#include "rijndael.h"
+#include "sha1.h"
#ifndef MD5_DIGEST_LENGTH
#define MD5_DIGEST_LENGTH 16
diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c
index 73dbfbd..0467212 100644
--- a/contrib/pgcrypto/mbuf.c
+++ b/contrib/pgcrypto/mbuf.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
+#include "px.h"
#define STEP (16*1024)
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
index 7d686f3..06ac789 100644
--- a/contrib/pgcrypto/openssl.c
+++ b/contrib/pgcrypto/openssl.c
@@ -31,12 +31,12 @@
#include "postgres.h"
-#include "px.h"
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/rand.h>
+#include "px.h"
#include "utils/memutils.h"
#include "utils/resowner.h"
diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index f69ae10..2f3f71e 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -34,12 +34,12 @@
#include <ctype.h>
#include "parser/scansup.h"
+#include "pgcrypto.h"
+#include "px-crypt.h"
+#include "px.h"
#include "utils/builtins.h"
#include "utils/uuid.h"
-#include "px.h"
-#include "px-crypt.h"
-#include "pgcrypto.h"
PG_MODULE_MAGIC;
diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c
index aa5b563..679779a 100644
--- a/contrib/pgcrypto/pgp-armor.c
+++ b/contrib/pgcrypto/pgp-armor.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* BASE64 - duplicated :(
diff --git a/contrib/pgcrypto/pgp-cfb.c b/contrib/pgcrypto/pgp-cfb.c
index 1d99915..8ae7c86 100644
--- a/contrib/pgcrypto/pgp-cfb.c
+++ b/contrib/pgcrypto/pgp-cfb.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
typedef int (*mix_data_t) (PGP_CFB *ctx, const uint8 *data, int len, uint8 *dst);
diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c
index 2adaf2c..7627081 100644
--- a/contrib/pgcrypto/pgp-compress.c
+++ b/contrib/pgcrypto/pgp-compress.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c
index 4c43eb7..3ecbf9c 100644
--- a/contrib/pgcrypto/pgp-decrypt.c
+++ b/contrib/pgcrypto/pgp-decrypt.c
@@ -31,9 +31,9 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
#define NO_CTX_SIZE 0
#define ALLOW_CTX_SIZE 1
diff --git a/contrib/pgcrypto/pgp-encrypt.c b/contrib/pgcrypto/pgp-encrypt.c
index 2938b4b..c133fb2 100644
--- a/contrib/pgcrypto/pgp-encrypt.c
+++ b/contrib/pgcrypto/pgp-encrypt.c
@@ -34,8 +34,8 @@
#include <time.h>
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
#define MDC_DIGEST_LEN 20
diff --git a/contrib/pgcrypto/pgp-info.c b/contrib/pgcrypto/pgp-info.c
index 9bfbbe6..b2300ea 100644
--- a/contrib/pgcrypto/pgp-info.c
+++ b/contrib/pgcrypto/pgp-info.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
static int
read_pubkey_keyid(PullFilter *pkt, uint8 *keyid_buf)
diff --git a/contrib/pgcrypto/pgp-mpi-internal.c b/contrib/pgcrypto/pgp-mpi-internal.c
index c73f086..47a1354 100644
--- a/contrib/pgcrypto/pgp-mpi-internal.c
+++ b/contrib/pgcrypto/pgp-mpi-internal.c
@@ -32,8 +32,8 @@
#include "imath.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static mpz_t *
mp_new()
diff --git a/contrib/pgcrypto/pgp-mpi-openssl.c b/contrib/pgcrypto/pgp-mpi-openssl.c
index afece26..75e4c8b 100644
--- a/contrib/pgcrypto/pgp-mpi-openssl.c
+++ b/contrib/pgcrypto/pgp-mpi-openssl.c
@@ -32,8 +32,8 @@
#include <openssl/bn.h>
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static BIGNUM *
mpi_to_bn(PGP_MPI *n)
diff --git a/contrib/pgcrypto/pgp-mpi.c b/contrib/pgcrypto/pgp-mpi.c
index 1da52ac..36a6d36 100644
--- a/contrib/pgcrypto/pgp-mpi.c
+++ b/contrib/pgcrypto/pgp-mpi.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
int
pgp_mpi_alloc(int bits, PGP_MPI **mpi)
diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c
index 3feadf7..470de31 100644
--- a/contrib/pgcrypto/pgp-pgsql.c
+++ b/contrib/pgcrypto/pgp-pgsql.c
@@ -31,16 +31,16 @@
#include "postgres.h"
-#include "lib/stringinfo.h"
#include "catalog/pg_type.h"
-#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
-#include "utils/array.h"
#include "funcapi.h"
-
+#include "lib/stringinfo.h"
+#include "mb/pg_wchar.h"
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
+
/*
* public functions
diff --git a/contrib/pgcrypto/pgp-pubdec.c b/contrib/pgcrypto/pgp-pubdec.c
index b925ff8..a0a5738 100644
--- a/contrib/pgcrypto/pgp-pubdec.c
+++ b/contrib/pgcrypto/pgp-pubdec.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg = 02 || PS || 00 || M
diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c
index 08599f0..9fdcf7c 100644
--- a/contrib/pgcrypto/pgp-pubenc.c
+++ b/contrib/pgcrypto/pgp-pubenc.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg: 02 || non-zero pad bytes || 00 || msg
diff --git a/contrib/pgcrypto/pgp-pubkey.c b/contrib/pgcrypto/pgp-pubkey.c
index f898d72..d447e5f 100644
--- a/contrib/pgcrypto/pgp-pubkey.c
+++ b/contrib/pgcrypto/pgp-pubkey.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
int
pgp_key_alloc(PGP_PubKey **pk_p)
diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c
index 3f2f442..ae6c395 100644
--- a/contrib/pgcrypto/pgp-s2k.c
+++ b/contrib/pgcrypto/pgp-s2k.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static int
diff --git a/contrib/pgcrypto/pgp.c b/contrib/pgcrypto/pgp.c
index dd8dae1..9b245fe 100644
--- a/contrib/pgcrypto/pgp.c
+++ b/contrib/pgcrypto/pgp.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* Defaults.
diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c
index 51be0b7..96e5bf2 100644
--- a/contrib/pgcrypto/px-crypt.c
+++ b/contrib/pgcrypto/px-crypt.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
+#include "px.h"
static char *
diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c
index 636c8d4..c17f244 100644
--- a/contrib/pgstattuple/pgstatapprox.c
+++ b/contrib/pgstattuple/pgstatapprox.c
@@ -13,12 +13,12 @@
#include "postgres.h"
#include "access/heapam.h"
+#include "access/htup_details.h"
+#include "access/multixact.h"
#include "access/relation.h"
#include "access/transam.h"
#include "access/visibilitymap.h"
#include "access/xact.h"
-#include "access/multixact.h"
-#include "access/htup_details.h"
#include "catalog/namespace.h"
#include "catalog/pg_am_d.h"
#include "commands/vacuum.h"
@@ -26,8 +26,8 @@
#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "storage/freespace.h"
-#include "storage/procarray.h"
#include "storage/lmgr.h"
+#include "storage/procarray.h"
#include "utils/builtins.h"
PG_FUNCTION_INFO_V1(pgstattuple_approx);
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index 57ed5f4..67c94b2 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -12,7 +12,6 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
#include "access/htup_details.h"
#include "access/xact.h"
@@ -20,6 +19,7 @@
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "postgres_fdw.h"
#include "storage/latch.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c
index 431c34a..31eb18a 100644
--- a/contrib/postgres_fdw/deparse.c
+++ b/contrib/postgres_fdw/deparse.c
@@ -33,7 +33,6 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
#include "access/htup_details.h"
#include "access/sysattr.h"
@@ -52,6 +51,7 @@
#include "optimizer/prep.h"
#include "optimizer/tlist.h"
#include "parser/parsetree.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
index 7ea68c3..242cf6d 100644
--- a/contrib/postgres_fdw/option.c
+++ b/contrib/postgres_fdw/option.c
@@ -12,7 +12,6 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
#include "access/reloptions.h"
#include "catalog/pg_foreign_server.h"
@@ -20,6 +19,7 @@
#include "catalog/pg_user_mapping.h"
#include "commands/defrem.h"
#include "commands/extension.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/varlena.h"
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 82d8140..79824b9 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -12,7 +12,6 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
#include "access/htup_details.h"
#include "access/sysattr.h"
@@ -35,6 +34,7 @@
#include "optimizer/restrictinfo.h"
#include "optimizer/tlist.h"
#include "parser/parsetree.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/float.h"
#include "utils/guc.h"
diff --git a/contrib/postgres_fdw/shippable.c b/contrib/postgres_fdw/shippable.c
index 2b55a40..01ba18a 100644
--- a/contrib/postgres_fdw/shippable.c
+++ b/contrib/postgres_fdw/shippable.c
@@ -23,10 +23,10 @@
#include "postgres.h"
-#include "postgres_fdw.h"
#include "access/transam.h"
#include "catalog/dependency.h"
+#include "postgres_fdw.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/syscache.h"
diff --git a/contrib/sepgsql/database.c b/contrib/sepgsql/database.c
index 8edd3df..0190d38 100644
--- a/contrib/sepgsql/database.c
+++ b/contrib/sepgsql/database.c
@@ -15,14 +15,14 @@
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/dependency.h"
-#include "catalog/pg_database.h"
#include "catalog/indexing.h"
+#include "catalog/pg_database.h"
#include "commands/dbcommands.h"
#include "commands/seclabel.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/snapmgr.h"
-#include "sepgsql.h"
/*
* sepgsql_database_post_create
diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c
index 2892346..64dd9bb 100644
--- a/contrib/sepgsql/dml.c
+++ b/contrib/sepgsql/dml.c
@@ -14,8 +14,8 @@
#include "access/sysattr.h"
#include "access/tupdesc.h"
#include "catalog/catalog.h"
-#include "catalog/heap.h"
#include "catalog/dependency.h"
+#include "catalog/heap.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_class.h"
#include "catalog/pg_inherits.h"
@@ -23,10 +23,10 @@
#include "commands/tablecmds.h"
#include "executor/executor.h"
#include "nodes/bitmapset.h"
+#include "sepgsql.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
/*
* fixup_whole_row_references
diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c
index ebfa441..4d64375 100644
--- a/contrib/sepgsql/hooks.c
+++ b/contrib/sepgsql/hooks.c
@@ -20,11 +20,11 @@
#include "executor/executor.h"
#include "fmgr.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "tcop/utility.h"
#include "utils/guc.h"
#include "utils/queryenvironment.h"
-#include "sepgsql.h"
PG_MODULE_MAGIC;
diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c
index 63a2dd5..14ee685 100644
--- a/contrib/sepgsql/label.c
+++ b/contrib/sepgsql/label.c
@@ -12,8 +12,8 @@
#include <selinux/label.h>
-#include "access/htup_details.h"
#include "access/genam.h"
+#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
#include "catalog/catalog.h"
@@ -29,6 +29,7 @@
#include "libpq/auth.h"
#include "libpq/libpq-be.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/guc.h"
@@ -36,7 +37,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "sepgsql.h"
/*
* Saved hook entries (if stacked)
diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c
index aa12dbe..7342cff 100644
--- a/contrib/sepgsql/proc.c
+++ b/contrib/sepgsql/proc.c
@@ -21,13 +21,13 @@
#include "catalog/pg_type.h"
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
/*
* sepgsql_proc_post_create
diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c
index 0615275..66eeec5 100644
--- a/contrib/sepgsql/relation.c
+++ b/contrib/sepgsql/relation.c
@@ -14,22 +14,22 @@
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
-#include "catalog/indexing.h"
#include "catalog/dependency.h"
+#include "catalog/indexing.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_class.h"
#include "catalog/pg_namespace.h"
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
-#include "utils/fmgroids.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
static void sepgsql_index_modify(Oid indexOid);
diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c
index 4c4a90f..45a2247 100644
--- a/contrib/sepgsql/schema.c
+++ b/contrib/sepgsql/schema.c
@@ -21,12 +21,12 @@
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/snapmgr.h"
-#include "sepgsql.h"
/*
* sepgsql_schema_post_create
diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c
index 60fcf99..f773453 100644
--- a/contrib/sepgsql/uavc.c
+++ b/contrib/sepgsql/uavc.c
@@ -14,12 +14,12 @@
#include "catalog/pg_proc.h"
#include "commands/seclabel.h"
+#include "sepgsql.h"
#include "storage/ipc.h"
#include "utils/guc.h"
#include "utils/hashutils.h"
#include "utils/memutils.h"
-#include "sepgsql.h"
/*
* avc_cache
diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c
index 70476f7..3eb7004 100644
--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@@ -17,8 +17,8 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com>
#include "access/htup_details.h"
#include "catalog/pg_type.h"
-#include "executor/spi.h"
#include "commands/trigger.h"
+#include "executor/spi.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index e31be80..3c5f6d3 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -40,9 +40,9 @@
#include "funcapi.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "tablefunc.h"
#include "utils/builtins.h"
-#include "tablefunc.h"
PG_MODULE_MAGIC;
diff --git a/contrib/tcn/tcn.c b/contrib/tcn/tcn.c
index 5355a64..4568768 100644
--- a/contrib/tcn/tcn.c
+++ b/contrib/tcn/tcn.c
@@ -16,9 +16,9 @@
#include "postgres.h"
#include "access/htup_details.h"
-#include "executor/spi.h"
#include "commands/async.h"
#include "commands/trigger.h"
+#include "executor/spi.h"
#include "lib/stringinfo.h"
#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index 533e2ce..63aa33c 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -25,9 +25,9 @@
#include "common/logging.h"
#include "fe_utils/connect.h"
+#include "getopt_long.h"
#include "libpq-fe.h"
#include "pg_getopt.h"
-#include "getopt_long.h"
#define BUFSIZE 1024
diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c
index ad0d18e..60c3f22 100644
--- a/src/backend/access/brin/brin_minmax.c
+++ b/src/backend/access/brin/brin_minmax.c
@@ -10,12 +10,12 @@
*/
#include "postgres.h"
-#include "access/genam.h"
#include "access/brin_internal.h"
#include "access/brin_tuple.h"
+#include "access/genam.h"
#include "access/stratnum.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_amop.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/datum.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c
index f907b4b..c58f4a5 100644
--- a/src/backend/access/brin/brin_pageops.c
+++ b/src/backend/access/brin/brin_pageops.c
@@ -10,8 +10,8 @@
*/
#include "postgres.h"
-#include "access/brin_pageops.h"
#include "access/brin_page.h"
+#include "access/brin_pageops.h"
#include "access/brin_revmap.h"
#include "access/brin_xlog.h"
#include "access/xloginsert.h"
diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c
index 2b38617..a58f311 100644
--- a/src/backend/access/brin/brin_tuple.c
+++ b/src/backend/access/brin/brin_tuple.c
@@ -31,8 +31,8 @@
*/
#include "postgres.h"
-#include "access/htup_details.h"
#include "access/brin_tuple.h"
+#include "access/htup_details.h"
#include "access/tupdesc.h"
#include "access/tupmacs.h"
#include "utils/datum.h"
diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index 0129338..2536dec 100644
--- a/src/backend/access/brin/brin_validate.c
+++ b/src/backend/access/brin/brin_validate.c
@@ -22,8 +22,8 @@
#include "catalog/pg_opfamily.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
+#include "utils/syscache.h"
/*
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 4c29261..20adfa2 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -17,8 +17,8 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
#include "access/xloginsert.h"
-#include "storage/predicate.h"
#include "miscadmin.h"
+#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index 439a91b..3d2153b 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -20,19 +20,19 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/xlog.h"
-#include "commands/vacuum.h"
+#include "access/xloginsert.h"
#include "catalog/pg_am.h"
+#include "commands/vacuum.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/acl.h"
#include "postmaster/autovacuum.h"
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
/* GUC parameter */
int gin_pending_list_limit = 0;
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index 55eab14..b790340 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -16,14 +16,14 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/tableam.h"
+#include "access/xloginsert.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/smgr.h"
#include "storage/indexfsm.h"
#include "storage/predicate.h"
+#include "storage/smgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 63bd7f2..fdc53d8 100644
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -23,8 +23,8 @@
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
+#include "utils/syscache.h"
/*
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 0cc8791..0ccc3f3 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -18,9 +18,9 @@
#include "access/gistscan.h"
#include "catalog/pg_collation.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/memutils.h"
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 22d790d..98b6892 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -17,11 +17,11 @@
#include "access/genam.h"
#include "access/gist_private.h"
#include "access/relscan.h"
+#include "lib/pairingheap.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "pgstat.h"
-#include "lib/pairingheap.h"
#include "utils/float.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
index 45804d7..bd1331e 100644
--- a/src/backend/access/gist/gistutil.c
+++ b/src/backend/access/gist/gistutil.c
@@ -22,9 +22,9 @@
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "utils/float.h"
-#include "utils/syscache.h"
-#include "utils/snapmgr.h"
#include "utils/lsyscache.h"
+#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 5cc30da..6ca39fa 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -31,7 +31,6 @@
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/rel.h"
-#include "miscadmin.h"
/* Working state for hashbuild and its callback */
diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c
index 86e7210..c1d248a 100644
--- a/src/backend/access/hash/hash_xlog.c
+++ b/src/backend/access/hash/hash_xlog.c
@@ -17,11 +17,11 @@
#include "access/bufmask.h"
#include "access/hash.h"
#include "access/hash_xlog.h"
-#include "access/xlogutils.h"
-#include "access/xlog.h"
#include "access/transam.h"
-#include "storage/procarray.h"
+#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* replay a hash index meta page
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 89876d2..e0ca1b0 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -18,10 +18,10 @@
#include "access/hash.h"
#include "access/hash_xlog.h"
#include "miscadmin.h"
-#include "utils/rel.h"
-#include "storage/lwlock.h"
#include "storage/buf_internals.h"
+#include "storage/lwlock.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static void _hash_vacuum_one_page(Relation rel, Relation hrel,
Buffer metabuf, Buffer buf);
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 838ee68..91d8429 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -32,8 +32,8 @@
#include "access/hash_xlog.h"
#include "miscadmin.h"
#include "storage/lmgr.h"
-#include "storage/smgr.h"
#include "storage/predicate.h"
+#include "storage/smgr.h"
static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock,
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 79ae499..725e614 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -18,8 +18,8 @@
#include "access/relscan.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "utils/rel.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static bool _hash_readpage(IndexScanDesc scan, Buffer *bufP,
ScanDirection dir);
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 3fb92ea..c5005f4 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -17,9 +17,9 @@
#include "access/hash.h"
#include "access/reloptions.h"
#include "access/relscan.h"
+#include "storage/buf_internals.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
-#include "storage/buf_internals.h"
#define CALC_NEW_BUCKET(old_bucket, lowmask) \
old_bucket | (lowmask + 1)
diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
index 2dd8821..0572816 100644
--- a/src/backend/access/heap/heapam_handler.c
+++ b/src/backend/access/heap/heapam_handler.c
@@ -19,7 +19,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include "access/genam.h"
#include "access/heapam.h"
@@ -35,10 +34,10 @@
#include "catalog/storage_xlog.h"
#include "commands/progress.h"
#include "executor/executor.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
#include "storage/procarray.h"
diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
index a0d2217..6d62a96 100644
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@ -16,15 +16,15 @@
#include "access/heapam.h"
#include "access/heapam_xlog.h"
-#include "access/transam.h"
#include "access/htup_details.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
-#include "utils/snapmgr.h"
#include "utils/rel.h"
+#include "utils/snapmgr.h"
/* Working data for heap_page_prune and subroutines */
typedef struct
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
index 306e74e..9ac6225 100644
--- a/src/backend/access/heap/rewriteheap.c
+++ b/src/backend/access/heap/rewriteheap.c
@@ -105,8 +105,6 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam.h"
#include "access/heapam_xlog.h"
#include "access/heaptoast.h"
@@ -119,6 +117,8 @@
#include "lib/ilist.h"
+#include "miscadmin.h"
+
#include "pgstat.h"
#include "replication/logical.h"
@@ -126,12 +126,12 @@
#include "storage/bufmgr.h"
#include "storage/fd.h"
+#include "storage/procarray.h"
#include "storage/smgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "storage/procarray.h"
/*
* State associated with a rewrite operation. This is opaque to the user
diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index dd5315c..44f6283 100644
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -20,8 +20,8 @@
#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlogutils.h"
-#include "storage/procarray.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* _bt_restore_page -- re-enter all the index tuples on a page
diff --git a/src/backend/access/spgist/spgquadtreeproc.c b/src/backend/access/spgist/spgquadtreeproc.c
index e50108e..abddd2b 100644
--- a/src/backend/access/spgist/spgquadtreeproc.c
+++ b/src/backend/access/spgist/spgquadtreeproc.c
@@ -16,8 +16,8 @@
#include "postgres.h"
#include "access/spgist.h"
-#include "access/stratnum.h"
#include "access/spgist_private.h"
+#include "access/stratnum.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/float.h"
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index 595c860..7f7eb21 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -39,8 +39,8 @@
#include "access/xloginsert.h"
#include "access/xlogutils.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "storage/proc.h"
/*
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
index 55d129a..caac43d 100644
--- a/src/backend/access/transam/parallel.c
+++ b/src/backend/access/transam/parallel.c
@@ -19,9 +19,9 @@
#include "access/session.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_enum.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
+#include "catalog/pg_enum.h"
#include "commands/async.h"
#include "executor/execParallel.h"
#include "libpq/libpq.h"
diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c
index 9368b56..58091f6 100644
--- a/src/backend/access/transam/rmgr.c
+++ b/src/backend/access/transam/rmgr.c
@@ -7,14 +7,14 @@
*/
#include "postgres.h"
+#include "access/brin_xlog.h"
#include "access/clog.h"
#include "access/commit_ts.h"
+#include "access/generic_xlog.h"
#include "access/ginxlog.h"
#include "access/gistxlog.h"
-#include "access/generic_xlog.h"
#include "access/hash_xlog.h"
#include "access/heapam_xlog.h"
-#include "access/brin_xlog.h"
#include "access/multixact.h"
#include "access/nbtxlog.h"
#include "access/spgxlog.h"
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index e38f919..0cb3554 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -54,10 +54,10 @@
#include "access/slru.h"
#include "access/transam.h"
#include "access/xlog.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/fd.h"
#include "storage/shmem.h"
-#include "miscadmin.h"
#define SlruFileName(ctl, path, seg) \
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 546bd43..9a96197 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -85,8 +85,8 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "access/xloginsert.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
+#include "access/xlogutils.h"
#include "catalog/pg_type.h"
#include "catalog/storage.h"
#include "funcapi.h"
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index fc55fa6..79e7198 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -40,6 +40,7 @@
#include "libpq/be-fsstubs.h"
#include "libpq/pqsignal.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "replication/logical.h"
#include "replication/logicallauncher.h"
@@ -65,7 +66,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
/*
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 0ff9af5..38e1c74 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -42,15 +42,16 @@
#include "commands/tablespace.h"
#include "common/controldata_utils.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "port/atomics.h"
#include "postmaster/bgwriter.h"
-#include "postmaster/walwriter.h"
#include "postmaster/startup.h"
+#include "postmaster/walwriter.h"
#include "replication/basebackup.h"
#include "replication/logical.h"
-#include "replication/slot.h"
#include "replication/origin.h"
+#include "replication/slot.h"
#include "replication/snapbuild.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
@@ -74,7 +75,6 @@
#include "utils/relmapper.h"
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
extern uint32 bootstrap_data_checksum_version;
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index 8f17988..8520600 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -27,16 +27,16 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "replication/walreceiver.h"
+#include "storage/fd.h"
+#include "storage/ipc.h"
#include "storage/smgr.h"
#include "utils/builtins.h"
+#include "utils/guc.h"
#include "utils/memutils.h"
#include "utils/numeric.h"
-#include "utils/guc.h"
#include "utils/pg_lsn.h"
#include "utils/timestamp.h"
#include "utils/tuplestore.h"
-#include "storage/fd.h"
-#include "storage/ipc.h"
/*
diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c
index 3ec67d4..aa9dca0 100644
--- a/src/backend/access/transam/xloginsert.c
+++ b/src/backend/access/transam/xloginsert.c
@@ -26,11 +26,11 @@
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/proc.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/* Buffer size required to store a compressed version of backup block image */
#define PGLZ_MAX_BLCKSZ PGLZ_MAX_OUTPUT(BLCKSZ)
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index c8b0d23..bc12c78 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -18,9 +18,9 @@
#include "postgres.h"
#include "access/transam.h"
-#include "access/xlogrecord.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
+#include "access/xlogrecord.h"
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "replication/origin.h"
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 88ce37c..e2d82f5 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -52,12 +52,12 @@
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_tablespace.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_transform.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
#include "catalog/pg_ts_template.h"
-#include "catalog/pg_transform.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 1af31c2..59ac65b 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -31,9 +31,9 @@
#include "catalog/pg_auth_members.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_pltemplate.h"
-#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_replication_origin.h"
#include "catalog/pg_shdepend.h"
#include "catalog/pg_shdescription.h"
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 098732c..d01c377 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -43,11 +43,11 @@
#include "catalog/pg_am.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
-#include "catalog/pg_description.h"
#include "catalog/pg_depend.h"
+#include "catalog/pg_description.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_tablespace.h"
#include "catalog/pg_trigger.h"
#include "catalog/pg_type.h"
@@ -76,9 +76,9 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_rusage.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/snapmgr.h"
/* Potentially set by pg_upgrade_support functions */
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index ce8a4e9..3544bd0 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -29,13 +29,13 @@
#include "catalog/pg_attrdef.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_cast.h"
-#include "catalog/pg_default_acl.h"
-#include "catalog/pg_enum.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_conversion.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_default_acl.h"
+#include "catalog/pg_enum.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_extension.h"
#include "catalog/pg_foreign_data_wrapper.h"
#include "catalog/pg_foreign_server.h"
@@ -44,10 +44,10 @@
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_opclass.h"
-#include "catalog/pg_opfamily.h"
#include "catalog/pg_operator.h"
-#include "catalog/pg_proc.h"
+#include "catalog/pg_opfamily.h"
#include "catalog/pg_policy.h"
+#include "catalog/pg_proc.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
#include "catalog/pg_rewrite.h"
diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
index 53af14e..613a15c 100644
--- a/src/backend/catalog/partition.c
+++ b/src/backend/catalog/partition.c
@@ -16,9 +16,9 @@
#include "access/genam.h"
#include "access/htup_details.h"
+#include "access/sysattr.h"
#include "access/table.h"
#include "access/tupconvert.h"
-#include "access/sysattr.h"
#include "catalog/indexing.h"
#include "catalog/partition.h"
#include "catalog/pg_inherits.h"
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index d0ff802..c204588 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -22,9 +22,9 @@
#include "catalog/indexing.h"
#include "catalog/pg_enum.h"
#include "catalog/pg_type.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "nodes/value.h"
+#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/fmgroids.h"
diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index fd5da7d..49b0269 100644
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -14,9 +14,6 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
@@ -30,9 +27,12 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
+#include "catalog/pg_type.h"
+#include "funcapi.h"
+#include "miscadmin.h"
+
#include "utils/array.h"
#include "utils/builtins.h"
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index fb7f8dd..ef72f22 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -34,8 +34,8 @@
#include "catalog/pg_largeobject.h"
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_shdepend.h"
@@ -47,9 +47,9 @@
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
#include "commands/alter.h"
-#include "commands/dbcommands.h"
#include "commands/collationcmds.h"
#include "commands/conversioncmds.h"
+#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
@@ -60,8 +60,8 @@
#include "commands/subscriptioncmds.h"
#include "commands/tablecmds.h"
#include "commands/typecmds.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
+#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/fmgroids.h"
#include "utils/syscache.h"
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index afee283..7de9d35 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -14,8 +14,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
@@ -23,9 +21,11 @@
#include "access/xact.h"
#include "catalog/indexing.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
+#include "catalog/pg_type.h"
+
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 2a51501..a8c1de5 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-#include "catalog/catalog.h"
#include "catalog/binary_upgrade.h"
+#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/objectaccess.h"
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index b8c9b6f..b13e491 100644
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -19,7 +19,6 @@
#include "postgres.h"
-#include "miscadmin.h"
#include "access/visibilitymap.h"
#include "access/xact.h"
@@ -28,6 +27,7 @@
#include "access/xlogutils.h"
#include "catalog/storage.h"
#include "catalog/storage_xlog.h"
+#include "miscadmin.h"
#include "storage/freespace.h"
#include "storage/smgr.h"
#include "utils/memutils.h"
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 70dbcb0..0d66d63 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -34,8 +34,8 @@
#include "catalog/pg_opclass.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
-#include "catalog/pg_subscription.h"
#include "catalog/pg_statistic_ext.h"
+#include "catalog/pg_subscription.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
@@ -57,8 +57,8 @@
#include "commands/trigger.h"
#include "commands/typecmds.h"
#include "commands/user.h"
-#include "parser/parse_func.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
#include "rewrite/rewriteDefine.h"
#include "tcop/utility.h"
#include "utils/builtins.h"
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index a23128d..efb581b 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -22,17 +22,17 @@
#include "access/multixact.h"
#include "access/relscan.h"
#include "access/tableam.h"
-#include "access/transam.h"
#include "access/toast_internals.h"
+#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_am.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/heap.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_am.h"
#include "catalog/toasting.h"
#include "commands/cluster.h"
#include "commands/progress.h"
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 3aeef30..4d0966f 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -39,8 +39,8 @@
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
-#include "optimizer/optimizer.h"
#include "nodes/makefuncs.h"
+#include "optimizer/optimizer.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
#include "parser/parse_expr.h"
diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c
index b7d2206..c2c91e5 100644
--- a/src/backend/commands/createas.c
+++ b/src/backend/commands/createas.c
@@ -25,8 +25,8 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 01d6621..18fcde3 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -53,8 +53,8 @@
#include "replication/slot.h"
#include "storage/copydir.h"
#include "storage/fd.h"
-#include "storage/lmgr.h"
#include "storage/ipc.h"
+#include "storage/lmgr.h"
#include "storage/md.h"
#include "storage/procarray.h"
#include "storage/smgr.h"
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index f7ee983..8657df6 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -33,11 +33,12 @@
#include "commands/extension.h"
#include "commands/trigger.h"
#include "funcapi.h"
-#include "parser/parse_func.h"
-#include "pgstat.h"
#include "lib/ilist.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
+#include "pgstat.h"
#include "tcop/deparse_utility.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/evtcache.h"
@@ -46,7 +47,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
typedef struct EventTriggerQueryState
{
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 40f1f9a..94411b5 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -34,8 +34,8 @@
#include "access/genam.h"
#include "access/htup_details.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index bae3b38..2621e36 100644
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -20,13 +20,13 @@
#include "catalog/pg_inherits.h"
#include "commands/lockcmds.h"
#include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
#include "parser/parse_clause.h"
+#include "rewrite/rewriteHandler.h"
#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "rewrite/rewriteHandler.h"
-#include "nodes/nodeFuncs.h"
static void LockTableRecurse(Oid reloid, LOCKMODE lockmode, bool nowait, Oid userid);
static AclResult LockTableAclCheck(Oid relid, LOCKMODE lockmode, Oid userid);
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index 6a1ccde..fe98b20 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -19,8 +19,8 @@
#include "access/genam.h"
#include "access/hash.h"
-#include "access/nbtree.h"
#include "access/htup_details.h"
+#include "access/nbtree.h"
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/catalog.h"
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index 1df7662..36093dc 100644
--- a/src/backend/commands/policy.c
+++ b/src/backend/commands/policy.c
@@ -16,8 +16,8 @@
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index f115d4b..4db1e55 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -14,9 +14,6 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
@@ -28,15 +25,18 @@
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/publicationcmds.h"
+#include "funcapi.h"
+#include "miscadmin.h"
+
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 6cf94a3..ba1b147 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -21,8 +21,8 @@
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_namespace.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 2e67a58..4f9951e 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -14,8 +14,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
@@ -26,9 +24,9 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
+#include "catalog/pg_type.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
@@ -36,6 +34,8 @@
#include "executor/executor.h"
+#include "miscadmin.h"
+
#include "nodes/makefuncs.h"
#include "replication/logicallauncher.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 8d25d14..52c5b00 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -20,7 +20,6 @@
#include "access/multixact.h"
#include "access/reloptions.h"
#include "access/relscan.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/tupconvert.h"
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 84efb41..3e51b9d 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -51,8 +51,8 @@
#include <sys/stat.h>
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 1119e21..a0bd8c3 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -24,14 +24,14 @@
#include "access/xlog.h"
#include "catalog/pg_authid.h"
#include "commands/variable.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
/*
* DATESTYLE
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index bea890f..eead53d 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -26,8 +26,8 @@
#include "parser/analyze.h"
#include "parser/parse_relation.h"
#include "rewrite/rewriteDefine.h"
-#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteHandler.h"
+#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteSupport.h"
#include "utils/acl.h"
#include "utils/builtins.h"
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 1f18e5d..046a3ca 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -28,7 +28,6 @@
#include "executor/nodeGather.h"
#include "executor/nodeGatherMerge.h"
#include "executor/nodeGroup.h"
-#include "executor/nodeGroup.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
#include "executor/nodeIndexonlyscan.h"
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
index 0cd6f65..89fafe0 100644
--- a/src/backend/executor/execExprInterp.c
+++ b/src/backend/executor/execExprInterp.c
@@ -62,17 +62,17 @@
#include "executor/execExpr.h"
#include "executor/nodeSubplan.h"
#include "funcapi.h"
-#include "utils/array.h"
-#include "utils/memutils.h"
#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
#include "parser/parsetree.h"
#include "pgstat.h"
+#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datum.h"
#include "utils/expandedrecord.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/timestamp.h"
#include "utils/typcache.h"
#include "utils/xml.h"
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index 6349c11..7bc5e40 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -21,8 +21,8 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "miscadmin.h"
-#include "utils/lsyscache.h"
#include "utils/hashutils.h"
+#include "utils/lsyscache.h"
#include "utils/memutils.h"
static uint32 TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple);
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 53cd2fc..b256642 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -31,14 +31,15 @@
#include "executor/nodeForeignscan.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
-#include "executor/nodeIndexscan.h"
#include "executor/nodeIndexonlyscan.h"
+#include "executor/nodeIndexscan.h"
#include "executor/nodeSeqscan.h"
#include "executor/nodeSort.h"
#include "executor/nodeSubplan.h"
#include "executor/tqueue.h"
#include "jit/jit.h"
#include "nodes/nodeFuncs.h"
+#include "pgstat.h"
#include "storage/spin.h"
#include "tcop/tcopprot.h"
#include "utils/datum.h"
@@ -46,7 +47,6 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
-#include "pgstat.h"
/*
* Magic numbers for parallel executor communication. We use constants
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index c227282..e81f41c 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -113,8 +113,8 @@
#include "executor/nodeValuesscan.h"
#include "executor/nodeWindowAgg.h"
#include "executor/nodeWorktablescan.h"
-#include "nodes/nodeFuncs.h"
#include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
static TupleTableSlot *ExecProcNodeFirst(PlanState *node);
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 87bc510..603169f 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -60,8 +60,8 @@
#include "access/heaptoast.h"
#include "access/htup_details.h"
#include "access/tupdesc_details.h"
-#include "funcapi.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
#include "nodes/nodeFuncs.h"
#include "storage/bufmgr.h"
#include "utils/builtins.h"
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 58c376a..d2fcd5f 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -231,12 +231,12 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/datum.h"
#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/datum.h"
static void select_current_set(AggState *aggstate, int setno, bool is_hash);
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index f62105f..8ca56c5 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -49,8 +49,8 @@
#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "utils/spccache.h"
#include "utils/snapmgr.h"
+#include "utils/spccache.h"
static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node);
diff --git a/src/backend/executor/nodeCustom.c b/src/backend/executor/nodeCustom.c
index 6dd0916..11cee8f 100644
--- a/src/backend/executor/nodeCustom.c
+++ b/src/backend/executor/nodeCustom.c
@@ -13,10 +13,10 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "executor/nodeCustom.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
#include "nodes/extensible.h"
#include "nodes/plannodes.h"
-#include "miscadmin.h"
#include "parser/parsetree.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 224cbb3..db00125 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -38,8 +38,8 @@
#include "pgstat.h"
#include "port/atomics.h"
#include "utils/dynahash.h"
-#include "utils/memutils.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/syscache.h"
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 1991b90..ab5adca 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -32,9 +32,9 @@
#include "access/htup_details.h"
#include "executor/executor.h"
#include "executor/nodeSubplan.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "miscadmin.h"
#include "utils/array.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
diff --git a/src/backend/executor/nodeTableFuncscan.c b/src/backend/executor/nodeTableFuncscan.c
index d264337..72a4229 100644
--- a/src/backend/executor/nodeTableFuncscan.c
+++ b/src/backend/executor/nodeTableFuncscan.c
@@ -22,11 +22,11 @@
*/
#include "postgres.h"
-#include "nodes/execnodes.h"
#include "executor/executor.h"
#include "executor/nodeTableFuncscan.h"
#include "executor/tablefunc.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index b5d3f3c..f1b9407 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -46,8 +46,8 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/expandeddatum.h"
#include "utils/datum.h"
+#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/regproc.h"
diff --git a/src/backend/jit/jit.c b/src/backend/jit/jit.c
index 43e65b1..6d48467 100644
--- a/src/backend/jit/jit.c
+++ b/src/backend/jit/jit.c
@@ -23,12 +23,12 @@
#include <unistd.h>
-#include "fmgr.h"
#include "executor/execExpr.h"
+#include "fmgr.h"
#include "jit/jit.h"
#include "miscadmin.h"
-#include "utils/resowner_private.h"
#include "utils/fmgrprotos.h"
+#include "utils/resowner_private.h"
/* GUCs */
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index 82c4afb..11ab190 100644
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -18,10 +18,10 @@
#include "miscadmin.h"
-#include "utils/memutils.h"
-#include "utils/resowner_private.h"
#include "portability/instr_time.h"
#include "storage/ipc.h"
+#include "utils/memutils.h"
+#include "utils/resowner_private.h"
#include <llvm-c/Analysis.h>
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index d093246..5b09567 100644
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -24,9 +24,9 @@
#include "catalog/objectaccess.h"
#include "catalog/pg_type.h"
#include "executor/execdebug.h"
+#include "executor/execExpr.h"
#include "executor/nodeAgg.h"
#include "executor/nodeSubplan.h"
-#include "executor/execExpr.h"
#include "funcapi.h"
#include "jit/llvmjit.h"
#include "jit/llvmjit_emit.h"
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 2221c04..7f59a29 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -39,10 +39,10 @@
#include "storage/fd.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/varlena.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/varlena.h"
#ifdef USE_LDAP
#ifdef WIN32
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index b655931..eb5ca6d 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -17,8 +17,8 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "miscadmin.h"
-#include "nodes/makefuncs.h"
#include "nodes/execnodes.h"
+#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "nodes/pathnodes.h"
#include "utils/builtins.h"
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index a546908..3b8d2fe 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -35,8 +35,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(CX)
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index fbabe2e..3b92f42 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -32,8 +32,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(ERX)
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 4bf777d..b50d586 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -21,10 +21,10 @@
#include "optimizer/optimizer.h"
#include "optimizer/pathnode.h"
#include "optimizer/plancat.h"
+#include "statistics/statistics.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
-#include "statistics/statistics.h"
/*
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 274fea0..3aa6324 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -14,8 +14,8 @@
*/
#include "postgres.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/clauses.h"
diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c
index 9381939..9d56366 100644
--- a/src/backend/optimizer/plan/planagg.c
+++ b/src/backend/optimizer/plan/planagg.c
@@ -41,8 +41,8 @@
#include "optimizer/planmain.h"
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_clause.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 17c5f08..dcf4ec6 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -31,10 +31,10 @@
#include "executor/executor.h"
#include "executor/nodeAgg.h"
#include "foreign/fdwapi.h"
-#include "miscadmin.h"
#include "jit/jit.h"
#include "lib/bipartite_match.h"
#include "lib/knapsack.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#ifdef OPTIMIZER_DEBUG
@@ -55,14 +55,14 @@
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
#include "parser/parse_agg.h"
+#include "parser/parsetree.h"
#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "storage/dsm_impl.h"
+#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/selfuncs.h"
-#include "utils/lsyscache.h"
#include "utils/syscache.h"
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 792ae39..fa99493 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -47,8 +47,8 @@
#include "optimizer/optimizer.h"
#include "optimizer/prep.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteHandler.h"
#include "utils/rel.h"
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 34acb73..d0359dd 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -16,8 +16,8 @@
#include <math.h>
-#include "miscadmin.h"
#include "foreign/fdwapi.h"
+#include "miscadmin.h"
#include "nodes/extensible.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/appendinfo.h"
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index cf17614..cdc5ba3 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -20,8 +20,8 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/nbtree.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
+#include "access/tableam.h"
#include "access/table.h"
#include "access/transam.h"
#include "access/xlog.h"
@@ -40,9 +40,9 @@
#include "optimizer/optimizer.h"
#include "optimizer/plancat.h"
#include "optimizer/prep.h"
-#include "partitioning/partdesc.h"
-#include "parser/parse_relation.h"
#include "parser/parsetree.h"
+#include "parser/parse_relation.h"
+#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "statistics/statistics.h"
#include "storage/bufmgr.h"
@@ -50,8 +50,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/* GUC parameter */
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 260ccd4..ae6bf20 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -15,7 +15,6 @@
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/nbtree.h"
@@ -29,12 +28,11 @@
#include "catalog/pg_constraint.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
-#include "parser/parser.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -44,13 +42,15 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/builtins.h"
-#include "utils/guc.h"
#include "utils/catcache.h"
+#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
+#include "utils/syscache.h"
/* Convenience macro for the most common makeNamespaceItem() case */
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 76f3dd7..9194953 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -22,6 +22,7 @@
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
+#include "parser/parse_agg.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -31,7 +32,6 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
-#include "parser/parse_agg.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 1baf7ef..cbab79a 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -20,10 +20,10 @@
#include "mb/pg_wchar.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_relation.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/int8.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 4dd8150..7fa0f8e 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -26,10 +26,10 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_enr.h"
#include "parser/parse_relation.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 2901025..78b84e5 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -20,13 +20,13 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_func.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 7932a96..5b03b32 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -19,8 +19,8 @@
#include "catalog/pg_type.h"
#include "lib/stringinfo.h"
#include "nodes/makefuncs.h"
-#include "parser/parser.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index 53e3ae2..0a4d9f0 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -17,8 +17,8 @@
#include <ctype.h>
-#include "parser/scansup.h"
#include "mb/pg_wchar.h"
+#include "parser/scansup.h"
/* ----------------
diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c
index 318d8ec..2004e00 100644
--- a/src/backend/partitioning/partbounds.c
+++ b/src/backend/partitioning/partbounds.c
@@ -36,8 +36,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/snapmgr.h"
#include "utils/ruleutils.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
/*
diff --git a/src/backend/partitioning/partdesc.c b/src/backend/partitioning/partdesc.c
index b207b76..6ede084 100644
--- a/src/backend/partitioning/partdesc.c
+++ b/src/backend/partitioning/partdesc.c
@@ -25,13 +25,13 @@
#include "storage/bufmgr.h"
#include "storage/sinval.h"
#include "utils/builtins.h"
-#include "utils/inval.h"
#include "utils/fmgroids.h"
#include "utils/hsearch.h"
+#include "utils/inval.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-#include "utils/rel.h"
#include "utils/partcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
typedef struct PartitionDirectoryData
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index b66b517..5f8a007 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -14,8 +14,8 @@
#include <unistd.h>
-#include "libpq/pqsignal.h"
#include "access/parallel.h"
+#include "libpq/pqsignal.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "port/atomics.h"
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index 8ec16a3..a6a9bf9 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -38,8 +38,8 @@
#include <sys/time.h>
#include <unistd.h>
-#include "access/xlog.h"
#include "access/xlog_internal.h"
+#include "access/xlog.h"
#include "libpq/pqsignal.h"
#include "miscadmin.h"
#include "pgstat.h"
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 011076c..03db517 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -32,7 +32,6 @@
#include <sys/select.h>
#endif
-#include "pgstat.h"
#include "access/heapam.h"
#include "access/htup_details.h"
@@ -48,6 +47,7 @@
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/autovacuum.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index d0f210d..d11f106 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -24,8 +24,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
#include "nodes/pg_list.h"
-#include "pgtar.h"
#include "pgstat.h"
+#include "pgtar.h"
#include "port.h"
#include "postmaster/syslogger.h"
#include "replication/basebackup.h"
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 6eba08a..545d2fc 100644
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -19,14 +19,14 @@
#include <unistd.h>
#include <sys/time.h>
-#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "access/xlog.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "libpq-fe.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "pqexpbuffer.h"
#include "replication/walreceiver.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
index c53e7e2..c118a14 100644
--- a/src/backend/replication/logical/decode.c
+++ b/src/backend/replication/logical/decode.c
@@ -31,17 +31,17 @@
#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog_internal.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
+#include "access/xlogutils.h"
#include "catalog/pg_control.h"
#include "replication/decode.h"
#include "replication/logical.h"
#include "replication/message.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
#include "storage/standby.h"
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index 186057b..c34e043 100644
--- a/src/backend/replication/logical/launcher.c
+++ b/src/backend/replication/logical/launcher.c
@@ -17,10 +17,6 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/heapam.h"
#include "access/htup.h"
#include "access/htup_details.h"
@@ -30,8 +26,12 @@
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
+#include "funcapi.h"
#include "libpq/pqsignal.h"
+#include "miscadmin.h"
+#include "pgstat.h"
+
#include "postmaster/bgworker.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
@@ -52,8 +52,8 @@
#include "utils/memutils.h"
#include "utils/pg_lsn.h"
#include "utils/ps_status.h"
-#include "utils/timeout.h"
#include "utils/snapmgr.h"
+#include "utils/timeout.h"
/* max sleep time between cycles (3min) */
#define DEFAULT_NAPTIME_PER_CYCLE 180000L
diff --git a/src/backend/replication/logical/logical.c b/src/backend/replication/logical/logical.c
index da265f5..e268f21 100644
--- a/src/backend/replication/logical/logical.c
+++ b/src/backend/replication/logical/logical.c
@@ -28,16 +28,16 @@
#include "postgres.h"
-#include "fmgr.h"
-#include "miscadmin.h"
-
#include "access/xact.h"
#include "access/xlog_internal.h"
+#include "fmgr.h"
+#include "miscadmin.h"
+
#include "replication/decode.h"
#include "replication/logical.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
#include "storage/proc.h"
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c
index d1cf80d..db3f025 100644
--- a/src/backend/replication/logical/logicalfuncs.c
+++ b/src/backend/replication/logical/logicalfuncs.c
@@ -17,29 +17,20 @@
#include <unistd.h>
-#include "fmgr.h"
-#include "funcapi.h"
-#include "miscadmin.h"
+#include "access/xact.h"
#include "access/xlog_internal.h"
#include "access/xlogutils.h"
-#include "access/xact.h"
-
#include "catalog/pg_type.h"
-#include "nodes/makefuncs.h"
+#include "fmgr.h"
+#include "funcapi.h"
#include "mb/pg_wchar.h"
+#include "miscadmin.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
-#include "utils/inval.h"
-#include "utils/memutils.h"
-#include "utils/pg_lsn.h"
-#include "utils/regproc.h"
-#include "utils/resowner.h"
-#include "utils/lsyscache.h"
+#include "nodes/makefuncs.h"
#include "replication/decode.h"
#include "replication/logical.h"
@@ -48,6 +39,15 @@
#include "storage/fd.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
+#include "utils/inval.h"
+#include "utils/lsyscache.h"
+#include "utils/memutils.h"
+#include "utils/pg_lsn.h"
+#include "utils/regproc.h"
+#include "utils/resowner.h"
+
/* private date for writing out data */
typedef struct DecodingOutputState
{
diff --git a/src/backend/replication/logical/message.c b/src/backend/replication/logical/message.c
index 0681cb4..433caa9 100644
--- a/src/backend/replication/logical/message.c
+++ b/src/backend/replication/logical/message.c
@@ -31,16 +31,16 @@
#include "postgres.h"
-#include "miscadmin.h"
#include "access/xact.h"
#include "catalog/indexing.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-#include "replication/message.h"
#include "replication/logical.h"
+#include "replication/message.h"
#include "utils/memutils.h"
diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c
index 07ae613..c356f9e 100644
--- a/src/backend/replication/logical/origin.c
+++ b/src/backend/replication/logical/origin.c
@@ -70,9 +70,6 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
@@ -80,23 +77,26 @@
#include "catalog/catalog.h"
#include "catalog/indexing.h"
+
+#include "funcapi.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-#include "replication/origin.h"
-#include "replication/logical.h"
#include "pgstat.h"
+#include "replication/logical.h"
+#include "replication/origin.h"
+#include "storage/condition_variable.h"
+#include "storage/copydir.h"
#include "storage/fd.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
-#include "storage/condition_variable.h"
-#include "storage/copydir.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/pg_lsn.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
* Replay progress of a single remote node.
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index 0bd1d0f..886b4aa 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -120,23 +120,18 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam_xlog.h"
#include "access/transam.h"
#include "access/xact.h"
+#include "miscadmin.h"
+
#include "pgstat.h"
#include "replication/logical.h"
#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-#include "utils/builtins.h"
-#include "utils/memutils.h"
-#include "utils/snapshot.h"
-#include "utils/snapmgr.h"
-
#include "storage/block.h" /* debugging output */
#include "storage/fd.h"
#include "storage/lmgr.h"
@@ -144,6 +139,11 @@
#include "storage/procarray.h"
#include "storage/standby.h"
+#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/snapmgr.h"
+#include "utils/snapshot.h"
+
/*
* This struct contains the current state of the snapshot building
* machinery. Besides a forward declaration in the header, it is not exposed
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
index 7881079..4f8eb86 100644
--- a/src/backend/replication/logical/tablesync.c
+++ b/src/backend/replication/logical/tablesync.c
@@ -85,9 +85,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/table.h"
#include "access/xact.h"
@@ -96,19 +93,22 @@
#include "commands/copy.h"
+#include "miscadmin.h"
#include "parser/parse_relation.h"
+#include "pgstat.h"
+
#include "replication/logicallauncher.h"
#include "replication/logicalrelation.h"
#include "replication/walreceiver.h"
#include "replication/worker_internal.h"
-#include "utils/snapmgr.h"
#include "storage/ipc.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/snapmgr.h"
static bool table_states_valid = false;
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index 9c08757..3fa0770 100644
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -21,8 +21,8 @@
#include "replication/origin.h"
#include "replication/pgoutput.h"
-#include "utils/inval.h"
#include "utils/int8.h"
+#include "utils/inval.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/varlena.h"
diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c
index 42da631..46e6dd4 100644
--- a/src/backend/replication/slotfuncs.c
+++ b/src/backend/replication/slotfuncs.c
@@ -17,9 +17,9 @@
#include "funcapi.h"
#include "miscadmin.h"
#include "replication/decode.h"
-#include "replication/slot.h"
#include "replication/logical.h"
#include "replication/logicalfuncs.h"
+#include "replication/slot.h"
#include "utils/builtins.h"
#include "utils/inval.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c
index 1c44714..df7bde3 100644
--- a/src/backend/rewrite/rowsecurity.c
+++ b/src/backend/rewrite/rowsecurity.c
@@ -51,12 +51,12 @@
#include "rewrite/rewriteHandler.h"
#include "rewrite/rewriteManip.h"
#include "rewrite/rowsecurity.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/rls.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
static void get_policies_for_relation(Relation relation,
CmdType cmd, Oid user_id,
diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 585cad2..9493b2d 100644
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -20,10 +20,10 @@
#include "catalog/pg_statistic_ext_data.h"
#include "lib/stringinfo.h"
#include "nodes/nodeFuncs.h"
-#include "optimizer/clauses.h"
-#include "optimizer/optimizer.h"
#include "nodes/nodes.h"
#include "nodes/pathnodes.h"
+#include "optimizer/clauses.h"
+#include "optimizer/optimizer.h"
#include "statistics/extended_stats_internal.h"
#include "statistics/statistics.h"
#include "utils/bytea.h"
diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c
index f3383c0..f9ebd8a 100644
--- a/src/backend/statistics/mvdistinct.c
+++ b/src/backend/statistics/mvdistinct.c
@@ -28,13 +28,13 @@
#include "access/htup_details.h"
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_statistic_ext_data.h"
+#include "lib/stringinfo.h"
+#include "statistics/extended_stats_internal.h"
+#include "statistics/statistics.h"
#include "utils/fmgrprotos.h"
#include "utils/lsyscache.h"
-#include "lib/stringinfo.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "statistics/extended_stats_internal.h"
-#include "statistics/statistics.h"
static double ndistinct_for_combination(double totalrows, int numrows,
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index ccd2c31..d4ebf83 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -14,8 +14,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
+#include "storage/bufmgr.h"
BufferDescPadded *BufferDescriptors;
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index e546585..cd1317d 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -21,8 +21,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
+#include "storage/bufmgr.h"
/* entry for buffer lookup hashtable */
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index b40e6f3..440ff77 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -45,9 +45,9 @@
#include "executor/instrument.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "storage/fd.h"
-#include "storage/buffile.h"
#include "storage/buf_internals.h"
+#include "storage/buffile.h"
+#include "storage/fd.h"
#include "utils/resowner.h"
/*
diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c
index ca1c9cd..c94ce5b 100644
--- a/src/backend/storage/file/copydir.c
+++ b/src/backend/storage/file/copydir.c
@@ -22,10 +22,10 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "storage/copydir.h"
-#include "storage/fd.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "storage/copydir.h"
+#include "storage/fd.h"
/*
* copydir: copy a directory
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 94be62f..8db7243 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -79,11 +79,11 @@
#include <sys/resource.h> /* for getrlimit */
#endif
-#include "miscadmin.h"
#include "access/xact.h"
#include "access/xlog.h"
#include "catalog/pg_tablespace.h"
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "portability/mem.h"
#include "storage/fd.h"
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
index 2879b84..73bad59 100644
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -47,7 +47,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include <fcntl.h>
#include <unistd.h>
@@ -62,14 +61,15 @@
#include <sys/shm.h>
#endif
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "portability/mem.h"
+#include "postmaster/postmaster.h"
#include "storage/dsm_impl.h"
#include "storage/fd.h"
#include "utils/guc.h"
#include "utils/memutils.h"
-#include "postmaster/postmaster.h"
#ifdef USE_DSM_POSIX
static bool dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 8853706..4829953 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -29,10 +29,10 @@
#include "postmaster/bgwriter.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
+#include "replication/origin.h"
#include "replication/slot.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
-#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/dsm.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 7605b2c..e0645b8 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -21,8 +21,8 @@
#include "commands/async.h"
#include "miscadmin.h"
#include "replication/walsender.h"
-#include "storage/latch.h"
#include "storage/ipc.h"
+#include "storage/latch.h"
#include "storage/proc.h"
#include "storage/shmem.h"
#include "storage/sinval.h"
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index db080c8..4cded16 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -17,6 +17,7 @@
#include <signal.h>
#include <unistd.h>
+#include "access/transam.h"
#include "miscadmin.h"
#include "storage/backendid.h"
#include "storage/ipc.h"
@@ -25,7 +26,6 @@
#include "storage/shmem.h"
#include "storage/sinvaladt.h"
#include "storage/spin.h"
-#include "access/transam.h"
/*
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index fb0bf44..18e3843 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -77,8 +77,8 @@
#include "postgres.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/postmaster.h"
#include "replication/slot.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 498373f..8b4149f 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -45,7 +45,6 @@
#include "replication/syncrep.h"
#include "replication/walsender.h"
#include "storage/condition_variable.h"
-#include "storage/standby.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
#include "storage/pmsignal.h"
@@ -53,6 +52,7 @@
#include "storage/procarray.h"
#include "storage/procsignal.h"
#include "storage/spin.h"
+#include "storage/standby.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
index 2e6c55b..875b69b 100644
--- a/src/backend/storage/lmgr/s_lock.c
+++ b/src/backend/storage/lmgr/s_lock.c
@@ -50,8 +50,8 @@
#include <time.h>
#include <unistd.h>
-#include "storage/s_lock.h"
#include "port/atomics.h"
+#include "storage/s_lock.h"
#define MIN_SPINS_PER_DELAY 10
diff --git a/src/backend/storage/page/checksum.c b/src/backend/storage/page/checksum.c
index 1eb7ef6..83ae594 100644
--- a/src/backend/storage/page/checksum.c
+++ b/src/backend/storage/page/checksum.c
@@ -13,11 +13,11 @@
*/
#include "postgres.h"
-#include "storage/checksum.h"
-
/*
* The actual code is in storage/checksum_impl.h. This is done so that
* external programs can incorporate the checksum code by #include'ing
* that file from the exported Postgres headers. (Compare our CRC code.)
*/
#include "storage/checksum_impl.h"
+
+#include "storage/checksum.h"
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 07f3c93..8a9eaf6 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -25,21 +25,21 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "postmaster/bgwriter.h"
-#include "storage/fd.h"
#include "storage/bufmgr.h"
+#include "storage/fd.h"
#include "storage/md.h"
#include "storage/relfilenode.h"
#include "storage/smgr.h"
#include "storage/sync.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/*
* The magnetic disk storage manager keeps track of open file
diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
index f329c3f..3485e6f 100644
--- a/src/backend/storage/sync/sync.c
+++ b/src/backend/storage/sync/sync.c
@@ -18,19 +18,19 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "pgstat.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pgstat.h"
#include "portability/instr_time.h"
#include "postmaster/bgwriter.h"
#include "storage/bufmgr.h"
#include "storage/ipc.h"
#include "storage/md.h"
#include "utils/hsearch.h"
-#include "utils/memutils.h"
#include "utils/inval.h"
+#include "utils/memutils.h"
static MemoryContext pendingOpsCxt; /* context for the pending ops state */
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index e8d8e6f..6fd1bba 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -47,14 +47,15 @@
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
#include "libpq/pqsignal.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "nodes/print.h"
#include "optimizer/optimizer.h"
-#include "pgstat.h"
-#include "pg_trace.h"
#include "parser/analyze.h"
#include "parser/parser.h"
+#include "pgstat.h"
#include "pg_getopt.h"
+#include "pg_trace.h"
#include "postmaster/autovacuum.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
@@ -77,7 +78,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "mb/pg_wchar.h"
/* ----------------
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index c6faa66..fe4bf3f 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -28,8 +28,8 @@
#include "commands/alter.h"
#include "commands/async.h"
#include "commands/cluster.h"
-#include "commands/comment.h"
#include "commands/collationcmds.h"
+#include "commands/comment.h"
#include "commands/conversioncmds.h"
#include "commands/copy.h"
#include "commands/createas.h"
@@ -39,8 +39,8 @@
#include "commands/event_trigger.h"
#include "commands/explain.h"
#include "commands/extension.h"
-#include "commands/matview.h"
#include "commands/lockcmds.h"
+#include "commands/matview.h"
#include "commands/policy.h"
#include "commands/portalcmds.h"
#include "commands/prepare.h"
@@ -68,8 +68,8 @@
#include "utils/acl.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
+#include "utils/syscache.h"
/* Hook for plugins to get control in ProcessUtility() */
diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c
index a3372a8..b4f4ba8 100644
--- a/src/backend/tsearch/wparser.c
+++ b/src/backend/tsearch/wparser.c
@@ -13,10 +13,10 @@
*/
#include "postgres.h"
-#include "funcapi.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "funcapi.h"
#include "tsearch/ts_cache.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index d7e6100..141c34b 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -19,10 +19,10 @@
#include "access/htup_details.h"
#include "catalog/catalog.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/proclang.h"
#include "commands/tablespace.h"
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index e38bd93..a82be5c 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -26,8 +26,8 @@
#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
#include "utils/builtins.h"
-#include "utils/date.h"
#include "utils/datetime.h"
+#include "utils/date.h"
#include "utils/memutils.h"
#include "utils/tzparser.h"
diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c
index 6ae2a31..b6befd6 100644
--- a/src/backend/utils/adt/format_type.c
+++ b/src/backend/utils/adt/format_type.c
@@ -20,11 +20,11 @@
#include "access/htup_details.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/numeric.h"
#include "utils/syscache.h"
-#include "mb/pg_wchar.h"
static char *printTypmod(const char *typname, int32 typmod, Oid typmodout);
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 0ff9394..a67297c 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -23,8 +23,8 @@
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "optimizer/optimizer.h"
-#include "utils/int8.h"
#include "utils/builtins.h"
+#include "utils/int8.h"
#define MAXINT8LEN 25
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index d4ba3bd..e2e16eb 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -27,11 +27,11 @@
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
-#include "utils/typcache.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
+#include "utils/typcache.h"
/*
* The context of the parser is maintained by the recursive descent
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 74b4bbe..9927d08 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -12,20 +12,20 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/transam.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
#include "utils/jsonb.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index a35f718..953536c 100644
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -66,14 +66,14 @@
#include "miscadmin.h"
#include "regex/regex.h"
#include "utils/builtins.h"
+#include "utils/date.h"
#include "utils/datetime.h"
#include "utils/datum.h"
-#include "utils/formatting.h"
#include "utils/float.h"
+#include "utils/formatting.h"
#include "utils/guc.h"
#include "utils/json.h"
#include "utils/jsonpath.h"
-#include "utils/date.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index d330a88..5d69015 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -29,15 +29,15 @@
#include "common/keywords.h"
#include "funcapi.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "parser/scansup.h"
+#include "pgstat.h"
#include "postmaster/syslogger.h"
#include "rewrite/rewriteHandler.h"
#include "storage/fd.h"
-#include "utils/lsyscache.h"
-#include "utils/ruleutils.h"
#include "tcop/tcopprot.h"
#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/ruleutils.h"
#include "utils/timestamp.h"
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index 0fdfee5..f4a8a17 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -16,9 +16,9 @@
#include "postgres.h"
#include "common/int.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/formatting.h"
-#include "mb/pg_wchar.h"
static text *dotrim(const char *string, int stringlen,
diff --git a/src/backend/utils/adt/rangetypes_gist.c b/src/backend/utils/adt/rangetypes_gist.c
index 6f93ce6..6051d9b 100644
--- a/src/backend/utils/adt/rangetypes_gist.c
+++ b/src/backend/utils/adt/rangetypes_gist.c
@@ -16,9 +16,9 @@
#include "access/gist.h"
#include "access/stratnum.h"
+#include "utils/datum.h"
#include "utils/float.h"
#include "utils/fmgrprotos.h"
-#include "utils/datum.h"
#include "utils/rangetypes.h"
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 17a7f6c..4b1decf 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -33,11 +33,11 @@
#include "miscadmin.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
-#include "utils/acl.h"
#include "utils/regproc.h"
+#include "utils/syscache.h"
#include "utils/varlena.h"
static char *format_operator_internal(Oid operator_oid, bool force_qualify);
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index fb477d4..6f4b681 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -36,9 +36,9 @@
#include "executor/executor.h"
#include "executor/spi.h"
#include "lib/ilist.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "parser/parse_relation.h"
-#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "utils/acl.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 3e64390..d3c5be2 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -50,9 +50,9 @@
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
-#include "parser/parse_node.h"
#include "parser/parse_agg.h"
#include "parser/parse_func.h"
+#include "parser/parse_node.h"
#include "parser/parse_oper.h"
#include "parser/parser.h"
#include "parser/parsetree.h"
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index ab2b49f..4f574b3 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -16,8 +16,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_locale.h"
+#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
index af07563..217de77 100644
--- a/src/backend/utils/adt/tsquery_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -15,8 +15,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
typedef struct NODE
{
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
index 91200ee..282fb2d 100644
--- a/src/backend/utils/adt/tsquery_gist.c
+++ b/src/backend/utils/adt/tsquery_gist.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "access/stratnum.h"
#include "access/gist.h"
+#include "access/stratnum.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
index de46a00..7cb19db 100644
--- a/src/backend/utils/adt/tsquery_util.c
+++ b/src/backend/utils/adt/tsquery_util.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
/*
* Build QTNode tree for a tsquery given in QueryItem array format.
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
index e28859d..b3a0d53 100644
--- a/src/backend/utils/adt/tsrank.c
+++ b/src/backend/utils/adt/tsrank.c
@@ -16,10 +16,10 @@
#include <limits.h>
#include <math.h>
+#include "miscadmin.h"
#include "tsearch/ts_utils.h"
#include "utils/array.h"
#include "utils/builtins.h"
-#include "miscadmin.h"
static const float weights[] = {0.1f, 0.2f, 0.4f, 1.0f};
diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c
index 90b2c9b..a2ae12b 100644
--- a/src/backend/utils/adt/txid.c
+++ b/src/backend/utils/adt/txid.c
@@ -26,8 +26,8 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "funcapi.h"
-#include "miscadmin.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "postmaster/postmaster.h"
#include "storage/lwlock.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index e63a4e5..570c0d8 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -18,6 +18,7 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "libpq/pqformat.h"
+#include "mb/pg_wchar.h"
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "utils/array.h"
@@ -26,7 +27,6 @@
#include "utils/lsyscache.h"
#include "utils/pg_locale.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
/* common code for bpchartypmodin and varchartypmodin */
diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c
index 419bde5..1b0f738 100644
--- a/src/backend/utils/cache/evtcache.c
+++ b/src/backend/utils/cache/evtcache.c
@@ -16,17 +16,17 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/indexing.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_type.h"
#include "commands/trigger.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/evtcache.h"
+#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/memutils.h"
-#include "utils/hsearch.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 585dcee..4a576ee 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -47,8 +47,8 @@
#include "catalog/pg_am.h"
#include "catalog/pg_amproc.h"
#include "catalog/pg_attrdef.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_database.h"
#include "catalog/pg_namespace.h"
diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c
index c506dc9..d244eaf 100644
--- a/src/backend/utils/cache/relfilenodemap.c
+++ b/src/backend/utils/cache/relfilenodemap.c
@@ -22,9 +22,9 @@
#include "miscadmin.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
-#include "utils/fmgroids.h"
#include "utils/rel.h"
#include "utils/relfilenodemap.h"
#include "utils/relmapper.h"
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 16297a5..dbb0251 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -74,8 +74,8 @@
#include "catalog/pg_ts_template.h"
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
-#include "utils/rel.h"
#include "utils/catcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
index 10222d5..3c4689a 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
@@ -15,8 +15,8 @@
#include "fmgr.h"
#include "mb/pg_wchar.h"
#include "../../Unicode/utf8_to_koi8r.map"
-#include "../../Unicode/koi8r_to_utf8.map"
#include "../../Unicode/utf8_to_koi8u.map"
+#include "../../Unicode/koi8r_to_utf8.map"
#include "../../Unicode/koi8u_to_utf8.map"
PG_MODULE_MAGIC;
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
index e33ca42..82d4983 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
@@ -18,6 +18,7 @@
#include "../../Unicode/iso8859_13_to_utf8.map"
#include "../../Unicode/iso8859_14_to_utf8.map"
#include "../../Unicode/iso8859_15_to_utf8.map"
+#include "../../Unicode/iso8859_16_to_utf8.map"
#include "../../Unicode/iso8859_2_to_utf8.map"
#include "../../Unicode/iso8859_3_to_utf8.map"
#include "../../Unicode/iso8859_4_to_utf8.map"
@@ -39,7 +40,6 @@
#include "../../Unicode/utf8_to_iso8859_7.map"
#include "../../Unicode/utf8_to_iso8859_8.map"
#include "../../Unicode/utf8_to_iso8859_9.map"
-#include "../../Unicode/iso8859_16_to_utf8.map"
PG_MODULE_MAGIC;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 2178e1c..59661ea 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -38,10 +38,10 @@
#include "catalog/pg_authid.h"
#include "commands/async.h"
#include "commands/prepare.h"
+#include "commands/trigger.h"
#include "commands/user.h"
#include "commands/vacuum.h"
#include "commands/variable.h"
-#include "commands/trigger.h"
#include "common/string.h"
#include "funcapi.h"
#include "jit/jit.h"
@@ -72,18 +72,18 @@
#include "replication/walsender.h"
#include "storage/bufmgr.h"
#include "storage/dsm_impl.h"
-#include "storage/standby.h"
#include "storage/fd.h"
#include "storage/large_object.h"
#include "storage/pg_shmem.h"
-#include "storage/proc.h"
#include "storage/predicate.h"
+#include "storage/proc.h"
+#include "storage/standby.h"
#include "tcop/tcopprot.h"
#include "tsearch/ts_cache.h"
#include "utils/builtins.h"
#include "utils/bytea.h"
-#include "utils/guc_tables.h"
#include "utils/float.h"
+#include "utils/guc_tables.h"
#include "utils/memutils.h"
#include "utils/pg_locale.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index 2d17839..8cab0e1 100644
--- a/src/backend/utils/misc/pg_config.c
+++ b/src/backend/utils/misc/pg_config.c
@@ -14,12 +14,12 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
#include "catalog/pg_type.h"
#include "common/config_info.h"
-#include "utils/builtins.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "port.h"
+#include "utils/builtins.h"
Datum
pg_config(PG_FUNCTION_ARGS)
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index b429218..3d0916f 100644
--- a/src/backend/utils/misc/pg_controldata.c
+++ b/src/backend/utils/misc/pg_controldata.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/transam.h"
-#include "access/xlog_internal.h"
#include "access/xlog.h"
+#include "access/xlog_internal.h"
#include "catalog/pg_control.h"
#include "catalog/pg_type.h"
#include "common/controldata_utils.h"
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index 67ba95c..6c851dd 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -28,8 +28,8 @@
#include "libpq/libpq.h"
#include "miscadmin.h"
-#include "utils/ps_status.h"
#include "utils/guc.h"
+#include "utils/ps_status.h"
extern char **environ;
bool update_process_title = true;
diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 5636081..fee8fba 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -22,9 +22,9 @@
#include "access/htup_details.h"
#include "catalog/pg_authid.h"
+#include "miscadmin.h"
#include "utils/inval.h"
#include "utils/syscache.h"
-#include "miscadmin.h"
/*
diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c
index 50deb35..c2dc13a 100644
--- a/src/backend/utils/mmgr/slab.c
+++ b/src/backend/utils/mmgr/slab.c
@@ -52,9 +52,9 @@
#include "postgres.h"
+#include "lib/ilist.h"
#include "utils/memdebug.h"
#include "utils/memutils.h"
-#include "lib/ilist.h"
/*
diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c
index deb9af5..671a2ab 100644
--- a/src/backend/utils/time/combocid.c
+++ b/src/backend/utils/time/combocid.c
@@ -41,9 +41,9 @@
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/xact.h"
+#include "miscadmin.h"
#include "storage/shmem.h"
#include "utils/combocid.h"
#include "utils/hsearch.h"
diff --git a/src/bin/pg_archivecleanup/pg_archivecleanup.c b/src/bin/pg_archivecleanup/pg_archivecleanup.c
index bb4257f..e9e6eaa 100644
--- a/src/bin/pg_archivecleanup/pg_archivecleanup.c
+++ b/src/bin/pg_archivecleanup/pg_archivecleanup.c
@@ -15,11 +15,11 @@
#include <signal.h>
#include <sys/time.h>
-#include "pg_getopt.h"
+#include "access/xlog_internal.h"
#include "common/logging.h"
-#include "access/xlog_internal.h"
+#include "pg_getopt.h"
const char *progname;
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 55ef139..a9d162a 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -35,9 +35,9 @@
#include "fe_utils/string_utils.h"
#include "getopt_long.h"
#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "pgtar.h"
#include "pgtime.h"
+#include "pqexpbuffer.h"
#include "receivelog.h"
#include "replication/basebackup.h"
#include "streamutil.h"
diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
index f39c133..19333e8 100644
--- a/src/bin/pg_basebackup/pg_receivewal.c
+++ b/src/bin/pg_basebackup/pg_receivewal.c
@@ -19,11 +19,11 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/xlog_internal.h"
#include "common/file_perm.h"
#include "common/logging.h"
-#include "libpq-fe.h"
-#include "access/xlog_internal.h"
#include "getopt_long.h"
+#include "libpq-fe.h"
#include "receivelog.h"
#include "streamutil.h"
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index af29dd7..baf80dd 100644
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -19,18 +19,18 @@
#include <sys/select.h>
#endif
-/* local includes */
-#include "streamutil.h"
-
#include "access/xlog_internal.h"
-#include "common/file_perm.h"
#include "common/fe_memutils.h"
+#include "common/file_perm.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "libpq/pqsignal.h"
#include "pqexpbuffer.h"
+/* local includes */
+#include "streamutil.h"
+
/* Time to sleep between reconnection attempts */
#define RECONNECT_SLEEP_TIME 5
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
index d73f614..3981399 100644
--- a/src/bin/pg_basebackup/receivelog.c
+++ b/src/bin/pg_basebackup/receivelog.c
@@ -20,14 +20,14 @@
#include <sys/select.h>
#endif
-/* local includes */
-#include "receivelog.h"
-#include "streamutil.h"
-
-#include "libpq-fe.h"
#include "access/xlog_internal.h"
#include "common/file_utils.h"
#include "common/logging.h"
+#include "libpq-fe.h"
+
+/* local includes */
+#include "receivelog.h"
+#include "streamutil.h"
/* fd and filename for currently open WAL file */
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
index 8d8ac11..2d735e1 100644
--- a/src/bin/pg_basebackup/streamutil.c
+++ b/src/bin/pg_basebackup/streamutil.c
@@ -17,10 +17,6 @@
#include <sys/time.h>
#include <unistd.h>
-/* local includes */
-#include "receivelog.h"
-#include "streamutil.h"
-
#include "access/xlog_internal.h"
#include "common/fe_memutils.h"
#include "common/file_perm.h"
@@ -30,6 +26,10 @@
#include "port/pg_bswap.h"
#include "pqexpbuffer.h"
+/* local includes */
+#include "receivelog.h"
+#include "streamutil.h"
+
#define ERRCODE_DUPLICATE_OBJECT "42710"
uint32 WalSegSz;
diff --git a/src/bin/pg_basebackup/walmethods.c b/src/bin/pg_basebackup/walmethods.c
index 8ec12e6..da96a79 100644
--- a/src/bin/pg_basebackup/walmethods.c
+++ b/src/bin/pg_basebackup/walmethods.c
@@ -21,10 +21,10 @@
#include <zlib.h>
#endif
-#include "pgtar.h"
#include "common/file_perm.h"
#include "common/file_utils.h"
+#include "pgtar.h"
#include "receivelog.h"
#include "streamutil.h"
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 5279e7f..a1da918 100644
--- a/src/bin/pg_config/pg_config.c
+++ b/src/bin/pg_config/pg_config.c
@@ -24,8 +24,8 @@
#include "postgres_fe.h"
-#include "port.h"
#include "common/config_info.h"
+#include "port.h"
static const char *progname;
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index ff17804..3c4b931 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -26,8 +26,8 @@
#include "catalog/pg_control.h"
#include "common/controldata_utils.h"
#include "common/logging.h"
-#include "pg_getopt.h"
#include "getopt_long.h"
+#include "pg_getopt.h"
static void
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 02a865f..e1e17a8 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -15,15 +15,15 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_utils.h"
-#include "pg_dump.h"
-
#include <ctype.h>
#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_utils.h"
+#include "pg_dump.h"
+
/*
* Variables for mapping DumpId to DumpableObject
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index 03479f1..027cdb6 100644
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -61,10 +61,10 @@
#include <sys/select.h>
#endif
+#include "fe_utils/string_utils.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-#include "fe_utils/string_utils.h"
#include "port/pg_bswap.h"
/* Mnemonic macros for indexing the fd array returned by pipe(2) */
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 6c739ce..cc46039 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -30,14 +30,14 @@
#include <io.h>
#endif
-#include "parallel.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_db.h"
-#include "pg_backup_utils.h"
#include "dumputils.h"
#include "fe_utils/string_utils.h"
#include "libpq/libpq-fs.h"
+#include "parallel.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_db.h"
+#include "pg_backup_utils.h"
#define TEXT_DUMP_HEADER "--\n-- PostgreSQL database dump\n--\n\n"
#define TEXT_DUMPALL_HEADER "--\n-- PostgreSQL database cluster dump\n--\n\n"
diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index 497b81b..8374b35 100644
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -25,10 +25,10 @@
*/
#include "postgres_fe.h"
+#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-#include "common/file_utils.h"
/*--------
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index ee822c5..ad7be32 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -11,21 +11,21 @@
*/
#include "postgres_fe.h"
+#include <unistd.h>
+#include <ctype.h>
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
+
+#include "dumputils.h"
#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"
-#include "dumputils.h"
#include "parallel.h"
#include "pg_backup_archiver.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
-#include <unistd.h>
-#include <ctype.h>
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-
static void _check_database_version(ArchiveHandle *AH);
static PGconn *_connectDB(ArchiveHandle *AH, const char *newdbname, const char *newUser);
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index e1afecf..aa00bca 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -34,13 +34,13 @@
*/
#include "postgres_fe.h"
+#include <dirent.h>
+#include <sys/stat.h>
+
+#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-#include "common/file_utils.h"
-
-#include <dirent.h>
-#include <sys/stat.h>
typedef struct
{
diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c
index 32c911a..3d31422 100644
--- a/src/bin/pg_dump/pg_backup_null.c
+++ b/src/bin/pg_dump/pg_backup_null.c
@@ -23,11 +23,11 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_utils.h"
#include "fe_utils/string_utils.h"
#include "libpq/libpq-fs.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_utils.h"
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
static void _WriteBlobData(ArchiveHandle *AH, const void *data, size_t dLen);
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index dead8fc..fd74835 100644
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -29,18 +29,18 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_tar.h"
-#include "pg_backup_utils.h"
-#include "pgtar.h"
-#include "common/file_utils.h"
-#include "fe_utils/string_utils.h"
-
#include <sys/stat.h>
#include <ctype.h>
#include <limits.h>
#include <unistd.h>
+#include "common/file_utils.h"
+#include "fe_utils/string_utils.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_tar.h"
+#include "pg_backup_utils.h"
+#include "pgtar.h"
+
static void _ArchiveEntry(ArchiveHandle *AH, TocEntry *te);
static void _StartData(ArchiveHandle *AH, TocEntry *te);
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index f01fea5..7baf5ae 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -38,7 +38,6 @@
#include <termios.h>
#endif
-#include "getopt_long.h"
#include "access/attnum.h"
#include "access/sysattr.h"
@@ -54,16 +53,17 @@
#include "catalog/pg_proc_d.h"
#include "catalog/pg_trigger_d.h"
#include "catalog/pg_type_d.h"
-#include "libpq/libpq-fs.h"
-#include "storage/block.h"
-
#include "dumputils.h"
+#include "fe_utils/connect.h"
+#include "fe_utils/string_utils.h"
+#include "getopt_long.h"
+#include "libpq/libpq-fs.h"
#include "parallel.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"
-#include "fe_utils/connect.h"
-#include "fe_utils/string_utils.h"
+#include "storage/block.h"
+
typedef struct
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 31fc06a..3f1c51e 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -15,11 +15,11 @@
*/
#include "postgres_fe.h"
+#include "catalog/pg_class_d.h"
#include "pg_backup_archiver.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"
-#include "catalog/pg_class_d.h"
/*
* Sort priority for database object types.
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 0981efc..9f46f65 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -18,14 +18,14 @@
#include <time.h>
#include <unistd.h>
-#include "getopt_long.h"
-
-#include "dumputils.h"
-#include "pg_backup.h"
#include "common/file_utils.h"
#include "common/logging.h"
+#include "dumputils.h"
#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"
+#include "getopt_long.h"
+
+#include "pg_backup.h"
/* version string we expect back from pg_dump */
#define PGDUMP_VERSIONSTR "pg_dump (PostgreSQL) " PG_VERSION "\n"
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 40a6b37..4564e21 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -45,9 +45,9 @@
#include <termios.h>
#endif
+#include "dumputils.h"
#include "getopt_long.h"
-#include "dumputils.h"
#include "parallel.h"
#include "pg_backup_utils.h"
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index f85ea2d..06c6b96 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -44,9 +44,9 @@
#include <time.h>
#include <unistd.h>
-#include "access/transam.h"
#include "access/heaptoast.h"
#include "access/multixact.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlog_internal.h"
#include "common/controldata_utils.h"
@@ -55,9 +55,9 @@
#include "common/logging.h"
#include "common/restricted_token.h"
#include "common/string.h"
-#include "storage/large_object.h"
-#include "pg_getopt.h"
#include "getopt_long.h"
+#include "pg_getopt.h"
+#include "storage/large_object.h"
static ControlFileData ControlFile; /* pg_control values */
diff --git a/src/bin/pg_rewind/datapagemap.c b/src/bin/pg_rewind/datapagemap.c
index 93165f6..d88cbac 100644
--- a/src/bin/pg_rewind/datapagemap.c
+++ b/src/bin/pg_rewind/datapagemap.c
@@ -12,10 +12,10 @@
#include "postgres_fe.h"
-#include "datapagemap.h"
-
#include "common/logging.h"
+#include "datapagemap.h"
+
struct datapagemap_iterator
{
datapagemap_t *map;
diff --git a/src/bin/pg_rewind/fetch.c b/src/bin/pg_rewind/fetch.c
index 03a5fd6..294c72c 100644
--- a/src/bin/pg_rewind/fetch.c
+++ b/src/bin/pg_rewind/fetch.c
@@ -19,10 +19,10 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "pg_rewind.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
+#include "pg_rewind.h"
void
fetchSourceFileList(void)
diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c
index 601f7e9..5f49fec 100644
--- a/src/bin/pg_rewind/filemap.c
+++ b/src/bin/pg_rewind/filemap.c
@@ -13,12 +13,12 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "catalog/pg_tablespace_d.h"
+#include "common/string.h"
#include "datapagemap.h"
#include "filemap.h"
#include "pg_rewind.h"
-#include "common/string.h"
-#include "catalog/pg_tablespace_d.h"
#include "storage/fd.h"
filemap_t *filemap = NULL;
diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c
index f4ebf7d..74a56ba 100644
--- a/src/bin/pg_rewind/libpq_fetch.c
+++ b/src/bin/pg_rewind/libpq_fetch.c
@@ -14,14 +14,14 @@
#include <fcntl.h>
#include <unistd.h>
-#include "pg_rewind.h"
+#include "catalog/pg_type_d.h"
#include "datapagemap.h"
+#include "fe_utils/connect.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
-#include "catalog/pg_type_d.h"
-#include "fe_utils/connect.h"
+#include "pg_rewind.h"
#include "port/pg_bswap.h"
PGconn *conn = NULL;
diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c
index 264a8f4..9813681 100644
--- a/src/bin/pg_rewind/parsexlog.c
+++ b/src/bin/pg_rewind/parsexlog.c
@@ -13,8 +13,6 @@
#include <unistd.h>
-#include "pg_rewind.h"
-#include "filemap.h"
#include "access/rmgr.h"
#include "access/xlog_internal.h"
@@ -22,6 +20,8 @@
#include "catalog/pg_control.h"
#include "catalog/storage_xlog.h"
#include "commands/dbcommands_xlog.h"
+#include "filemap.h"
+#include "pg_rewind.h"
/*
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 875a43b..695f873 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -14,10 +14,6 @@
#include <time.h>
#include <unistd.h>
-#include "pg_rewind.h"
-#include "fetch.h"
-#include "file_ops.h"
-#include "filemap.h"
#include "access/timeline.h"
#include "access/xlog_internal.h"
@@ -28,7 +24,11 @@
#include "common/file_utils.h"
#include "common/restricted_token.h"
#include "fe_utils/recovery_gen.h"
+#include "fetch.h"
+#include "file_ops.h"
+#include "filemap.h"
#include "getopt_long.h"
+#include "pg_rewind.h"
#include "storage/bufpage.h"
static void usage(const char *progname);
diff --git a/src/bin/pg_rewind/timeline.c b/src/bin/pg_rewind/timeline.c
index 987452c..dc72b64 100644
--- a/src/bin/pg_rewind/timeline.c
+++ b/src/bin/pg_rewind/timeline.c
@@ -9,11 +9,11 @@
*/
#include "postgres_fe.h"
-#include "pg_rewind.h"
-
#include "access/timeline.h"
#include "access/xlog_internal.h"
+#include "pg_rewind.h"
+
/*
* This is copy-pasted from the backend readTimeLineHistory, modified to
* return a malloc'd array and to work without backend functions.
diff --git a/src/bin/pg_test_fsync/pg_test_fsync.c b/src/bin/pg_test_fsync/pg_test_fsync.c
index 225557e..66ad819 100644
--- a/src/bin/pg_test_fsync/pg_test_fsync.c
+++ b/src/bin/pg_test_fsync/pg_test_fsync.c
@@ -12,9 +12,9 @@
#include <unistd.h>
#include <signal.h>
-#include "getopt_long.h"
#include "access/xlogdefs.h"
#include "common/logging.h"
+#include "getopt_long.h"
/*
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 3823641..93f3c34 100644
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -9,10 +9,10 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include <ctype.h>
+#include "pg_upgrade.h"
+
/*
* get_control_data()
*
diff --git a/src/bin/pg_upgrade/dump.c b/src/bin/pg_upgrade/dump.c
index c1429fe..cc9a0e5 100644
--- a/src/bin/pg_upgrade/dump.c
+++ b/src/bin/pg_upgrade/dump.c
@@ -9,10 +9,10 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "fe_utils/string_utils.h"
+#include "pg_upgrade.h"
+
void
generate_old_dump(void)
diff --git a/src/bin/pg_upgrade/file.c b/src/bin/pg_upgrade/file.c
index c7fed24..2db5dbf 100644
--- a/src/bin/pg_upgrade/file.c
+++ b/src/bin/pg_upgrade/file.c
@@ -9,13 +9,6 @@
#include "postgres_fe.h"
-#include "access/visibilitymap.h"
-#include "common/file_perm.h"
-#include "pg_upgrade.h"
-#include "storage/bufpage.h"
-#include "storage/checksum.h"
-#include "storage/checksum_impl.h"
-
#include <sys/stat.h>
#include <fcntl.h>
#ifdef HAVE_COPYFILE_H
@@ -26,6 +19,13 @@
#include <linux/fs.h>
#endif
+#include "access/visibilitymap.h"
+#include "common/file_perm.h"
+#include "pg_upgrade.h"
+#include "storage/bufpage.h"
+#include "storage/checksum.h"
+#include "storage/checksum_impl.h"
+
#ifdef WIN32
static int win32_pghardlink(const char *src, const char *dst);
diff --git a/src/bin/pg_upgrade/function.c b/src/bin/pg_upgrade/function.c
index 3cbaab6..9487b27 100644
--- a/src/bin/pg_upgrade/function.c
+++ b/src/bin/pg_upgrade/function.c
@@ -9,11 +9,11 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "access/transam.h"
#include "catalog/pg_language_d.h"
+#include "pg_upgrade.h"
+
/*
* qsort comparator for pointers to library names
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 5c7b433..482c153 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -9,11 +9,11 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "access/transam.h"
#include "catalog/pg_class_d.h"
+#include "pg_upgrade.h"
+
static void create_rel_filename_map(const char *old_data, const char *new_data,
const DbInfo *old_db, const DbInfo *new_db,
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index da9e1da..b0dc5fc 100644
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -14,11 +14,11 @@
#include <io.h>
#endif
-#include "getopt_long.h"
#include "common/string.h"
+#include "getopt_long.h"
+#include "pg_upgrade.h"
#include "utils/pidfile.h"
-#include "pg_upgrade.h"
static void usage(void);
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index 5b82e0c..5154a71 100644
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -37,16 +37,16 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
#include "catalog/pg_class_d.h"
#include "common/file_perm.h"
#include "common/logging.h"
#include "common/restricted_token.h"
#include "fe_utils/string_utils.h"
-
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
+#include "pg_upgrade.h"
static void prepare_new_cluster(void);
static void prepare_new_globals(void);
diff --git a/src/bin/pg_upgrade/relfilenode.c b/src/bin/pg_upgrade/relfilenode.c
index 0c78073..35d1f2f 100644
--- a/src/bin/pg_upgrade/relfilenode.c
+++ b/src/bin/pg_upgrade/relfilenode.c
@@ -9,11 +9,11 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include <sys/stat.h>
-#include "catalog/pg_class_d.h"
+
#include "access/transam.h"
+#include "catalog/pg_class_d.h"
+#include "pg_upgrade.h"
static void transfer_single_new_db(FileNameMap *maps, int size, char *old_tablespace);
diff --git a/src/bin/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c
index d867995..2ceb927 100644
--- a/src/bin/pg_upgrade/util.c
+++ b/src/bin/pg_upgrade/util.c
@@ -9,11 +9,11 @@
#include "postgres_fe.h"
+#include <signal.h>
+
#include "common/username.h"
#include "pg_upgrade.h"
-#include <signal.h>
-
LogOpts log_opts;
diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index 42f1ce7..2362e47 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -9,11 +9,11 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"
+#include "pg_upgrade.h"
+
/*
diff --git a/src/bin/pg_waldump/compat.c b/src/bin/pg_waldump/compat.c
index 0e0dca7..7b389a2 100644
--- a/src/bin/pg_waldump/compat.c
+++ b/src/bin/pg_waldump/compat.c
@@ -20,8 +20,8 @@
#include <time.h>
-#include "utils/datetime.h"
#include "lib/stringinfo.h"
+#include "utils/datetime.h"
/* copied from timestamp.c */
pg_time_t
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index b79208c..c5440e5 100644
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -16,9 +16,9 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-#include "access/xlog_internal.h"
#include "access/transam.h"
#include "common/fe_memutils.h"
#include "common/logging.h"
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index e72ad00..ed22106 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -32,13 +32,6 @@
#endif
#include "postgres_fe.h"
-#include "common/int.h"
-#include "common/logging.h"
-#include "fe_utils/conditional.h"
-#include "getopt_long.h"
-#include "libpq-fe.h"
-#include "portability/instr_time.h"
-
#include <ctype.h>
#include <float.h>
#include <limits.h>
@@ -63,11 +56,18 @@
#endif
#endif
+#include "common/int.h"
+#include "common/logging.h"
+#include "fe_utils/conditional.h"
+#include "getopt_long.h"
+#include "libpq-fe.h"
+#include "pgbench.h"
+#include "portability/instr_time.h"
+
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
-#include "pgbench.h"
#define ERRCODE_UNDEFINED_TABLE "42P01"
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 4b26793..3038bbc 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -18,15 +18,15 @@
#include <win32.h>
#endif
+#include "command.h"
+#include "common.h"
#include "common/logging.h"
+#include "copy.h"
+#include "crosstabview.h"
#include "fe_utils/mbprint.h"
#include "fe_utils/string_utils.h"
#include "portability/instr_time.h"
-#include "command.h"
-#include "common.h"
-#include "copy.h"
-#include "crosstabview.h"
#include "settings.h"
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index f9e53d6..3a8da57 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -6,7 +6,6 @@
* src/bin/psql/copy.c
*/
#include "postgres_fe.h"
-#include "copy.h"
#include <signal.h>
#include <sys/stat.h>
@@ -16,15 +15,16 @@
#include <io.h> /* I think */
#endif
-#include "libpq-fe.h"
-#include "pqexpbuffer.h"
-#include "settings.h"
#include "common.h"
+#include "common/logging.h"
+#include "copy.h"
+#include "libpq-fe.h"
+#include "pqexpbuffer.h"
#include "prompt.h"
+#include "settings.h"
#include "stringutils.h"
-#include "common/logging.h"
/*
* parse_slash_copy
diff --git a/src/bin/psql/crosstabview.c b/src/bin/psql/crosstabview.c
index 83789cb..df5e7b1 100644
--- a/src/bin/psql/crosstabview.c
+++ b/src/bin/psql/crosstabview.c
@@ -8,12 +8,12 @@
#include "postgres_fe.h"
#include "common.h"
+#include "common/logging.h"
#include "crosstabview.h"
#include "pqexpbuffer.h"
#include "psqlscanslash.h"
#include "settings.h"
-#include "common/logging.h"
/*
* Value/position from the resultset that goes into the horizontal or vertical
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index d7c0fc0..8da6a45 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -19,13 +19,13 @@
#include "catalog/pg_class_d.h"
#include "catalog/pg_default_acl_d.h"
+#include "common.h"
#include "common/logging.h"
+#include "describe.h"
#include "fe_utils/mbprint.h"
#include "fe_utils/print.h"
#include "fe_utils/string_utils.h"
-#include "common.h"
-#include "describe.h"
#include "settings.h"
#include "variables.h"
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 59ea8cc..cc3d0c7 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -21,10 +21,10 @@
#include <termios.h>
#endif
+#include "common.h"
#include "common/logging.h"
#include "common/username.h"
-#include "common.h"
#include "help.h"
#include "input.h"
#include "settings.h"
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 5a18ac9..16f7e53 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -13,12 +13,12 @@
#include <fcntl.h>
#include <limits.h>
+#include "common.h"
+#include "common/logging.h"
#include "input.h"
#include "settings.h"
#include "tab-complete.h"
-#include "common.h"
-#include "common/logging.h"
#ifndef WIN32
#define PSQLHISTORY ".psql_history"
diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c
index 2713f15..dd51b76 100644
--- a/src/bin/psql/large_obj.c
+++ b/src/bin/psql/large_obj.c
@@ -6,12 +6,12 @@
* src/bin/psql/large_obj.c
*/
#include "postgres_fe.h"
-#include "large_obj.h"
-#include "settings.h"
#include "common.h"
#include "common/logging.h"
+#include "large_obj.h"
+#include "settings.h"
static void print_lo_result(const char *fmt,...) pg_attribute_printf(1, 2);
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index e386d98..9834ae3 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -6,16 +6,16 @@
* src/bin/psql/mainloop.c
*/
#include "postgres_fe.h"
-#include "mainloop.h"
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "input.h"
+#include "mainloop.h"
+#include "mb/pg_wchar.h"
#include "prompt.h"
#include "settings.h"
-#include "common/logging.h"
-#include "mb/pg_wchar.h"
/* callback functions for our flex lexer */
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index 0fcb8c7..bac2ed4 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -18,11 +18,11 @@
#endif
#include "common.h"
+#include "common/string.h"
#include "input.h"
#include "prompt.h"
#include "settings.h"
-#include "common/string.h"
/*--------------------------
* get_prompt
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index e4c0a7e..6a896a41 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -14,14 +14,14 @@
#include <win32.h>
#endif /* WIN32 */
-#include "getopt_long.h"
-
-#include "common/logging.h"
-#include "fe_utils/print.h"
#include "command.h"
#include "common.h"
+#include "common/logging.h"
+
#include "describe.h"
+#include "fe_utils/print.h"
+#include "getopt_long.h"
#include "help.h"
#include "input.h"
#include "mainloop.h"
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index 1d2a31c..1f4c448 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -8,9 +8,9 @@
#include "postgres_fe.h"
#include "common.h"
+#include "common/logging.h"
#include "variables.h"
-#include "common/logging.h"
/*
diff --git a/src/common/f2s.c b/src/common/f2s.c
index e332557..e827ee3 100644
--- a/src/common/f2s.c
+++ b/src/common/f2s.c
@@ -40,8 +40,8 @@
#include "common/shortest_dec.h"
-#include "ryu_common.h"
#include "digit_table.h"
+#include "ryu_common.h"
#define FLOAT_MANTISSA_BITS 23
#define FLOAT_EXPONENT_BITS 8
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index e41f42e..16516c5 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -30,10 +30,10 @@
#include <termios.h>
#endif
-#include "fe_utils/print.h"
-
#include "catalog/pg_type_d.h"
+
#include "fe_utils/mbprint.h"
+#include "fe_utils/print.h"
/*
diff --git a/src/fe_utils/recovery_gen.c b/src/fe_utils/recovery_gen.c
index 6641f95..f81756b 100644
--- a/src/fe_utils/recovery_gen.c
+++ b/src/fe_utils/recovery_gen.c
@@ -10,8 +10,8 @@
#include "postgres_fe.h"
#include "common/logging.h"
-#include "fe_utils/string_utils.h"
#include "fe_utils/recovery_gen.h"
+#include "fe_utils/string_utils.h"
static char *escape_quotes(const char *src);
diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c
index 8c3a603..3f29a36 100644
--- a/src/fe_utils/string_utils.c
+++ b/src/fe_utils/string_utils.c
@@ -17,10 +17,10 @@
#include <ctype.h>
-#include "fe_utils/string_utils.h"
-
#include "common/keywords.h"
+#include "fe_utils/string_utils.h"
+
static PQExpBuffer defaultGetLocalPQExpBuffer(void);
diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
index 6ef1fad..ceb3115 100644
--- a/src/interfaces/ecpg/compatlib/informix.c
+++ b/src/interfaces/ecpg/compatlib/informix.c
@@ -7,14 +7,14 @@
#include <ctype.h>
#include <limits.h>
-#include <ecpgtype.h>
-#include <ecpg_informix.h>
-#include <pgtypes_error.h>
-#include <pgtypes_date.h>
-#include <pgtypes_numeric.h>
-#include <sqltypes.h>
-#include <sqlca.h>
-#include <ecpgerrno.h>
+#include "ecpgerrno.h"
+#include "ecpgtype.h"
+#include "ecpg_informix.h"
+#include "pgtypes_date.h"
+#include "pgtypes_error.h"
+#include "pgtypes_numeric.h"
+#include "sqlca.h"
+#include "sqltypes.h"
/* this is also defined in ecpglib/misc.c, by defining it twice we don't have to export the symbol */
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
index b4f6089..311b9a2 100644
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -3,11 +3,11 @@
#define POSTGRES_ECPG_INTERNAL
#include "postgres_fe.h"
+#include "ecpgerrno.h"
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
#include "ecpglib.h"
-#include "ecpgerrno.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#ifdef ENABLE_THREAD_SAFETY
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 81f94cc..7d2a78a 100644
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -5,15 +5,15 @@
#include <math.h>
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
+#include "sqlca.h"
/* returns true if character c is a delimiter for the given array type */
static bool
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index ef500a9..eb0154e 100644
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -9,10 +9,10 @@
#include "catalog/pg_type_d.h"
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#include "sqlda.h"
#include "sql3types.h"
diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c
index 9c56991..a4e3c0d 100644
--- a/src/interfaces/ecpg/ecpglib/error.c
+++ b/src/interfaces/ecpg/ecpglib/error.c
@@ -4,9 +4,9 @@
#include "postgres_fe.h"
#include "ecpgerrno.h"
-#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
void
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 7c9cb76..931d51c 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -20,18 +20,18 @@
#include "catalog/pg_type_d.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
#include "ecpglib_extern.h"
+#include "ecpglib.h"
+#include "ecpgtype.h"
+#include "pgtypes_date.h"
+#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
#include "sqlca.h"
-#include "sqlda-native.h"
#include "sqlda-compat.h"
+#include "sqlda-native.h"
#include "sql3types.h"
-#include "pgtypes_numeric.h"
-#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
-#include "pgtypes_interval.h"
/*
* This function returns a newly malloced string that has ' and \
diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c
index 52ca1c5..bd81251 100644
--- a/src/interfaces/ecpg/ecpglib/memory.c
+++ b/src/interfaces/ecpg/ecpglib/memory.c
@@ -4,10 +4,10 @@
#include "postgres_fe.h"
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
void
ecpg_free(void *ptr)
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index 2eec54a..697f736 100644
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -6,16 +6,16 @@
#include <limits.h>
#include <unistd.h>
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "pgtypes_numeric.h"
+#include "ecpglib.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
#include "pg_config_paths.h"
+#include "sqlca.h"
#ifdef HAVE_LONG_LONG_INT
#ifndef LONG_LONG_MIN
diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c
index 6e7adb9..b9653c0 100644
--- a/src/interfaces/ecpg/ecpglib/prepare.c
+++ b/src/interfaces/ecpg/ecpglib/prepare.c
@@ -5,10 +5,10 @@
#include <ctype.h>
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#define STMTID_SIZE 32
diff --git a/src/interfaces/ecpg/ecpglib/sqlda.c b/src/interfaces/ecpg/ecpglib/sqlda.c
index 3fb0d82..b10e085 100644
--- a/src/interfaces/ecpg/ecpglib/sqlda.c
+++ b/src/interfaces/ecpg/ecpglib/sqlda.c
@@ -11,15 +11,15 @@
#include "catalog/pg_type_d.h"
-#include "ecpg-pthread-win32.h"
#include "decimal.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
+#include "ecpg-pthread-win32.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
-#include "sqlda-native.h"
#include "sqlda-compat.h"
+#include "sqlda-native.h"
/*
* Compute the next variable's offset with
diff --git a/src/interfaces/ecpg/ecpglib/typename.c b/src/interfaces/ecpg/ecpglib/typename.c
index 9251450..eec2576 100644
--- a/src/interfaces/ecpg/ecpglib/typename.c
+++ b/src/interfaces/ecpg/ecpglib/typename.c
@@ -5,11 +5,11 @@
#include "catalog/pg_type_d.h"
-#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqltypes.h"
+#include "ecpgtype.h"
#include "sql3types.h"
+#include "sqltypes.h"
/*
* This function is used to generate the correct type names.
diff --git a/src/interfaces/ecpg/pgtypeslib/common.c b/src/interfaces/ecpg/pgtypeslib/common.c
index abcf7f5..8972229 100644
--- a/src/interfaces/ecpg/pgtypeslib/common.c
+++ b/src/interfaces/ecpg/pgtypeslib/common.c
@@ -2,8 +2,8 @@
#include "postgres_fe.h"
-#include "pgtypeslib_extern.h"
#include "pgtypes.h"
+#include "pgtypeslib_extern.h"
/* Return value is zero-filled. */
char *
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index 9ee460b..71dc1a5 100644
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -6,10 +6,10 @@
#include <ctype.h>
#include <limits.h>
-#include "pgtypeslib_extern.h"
#include "dt.h"
-#include "pgtypes_error.h"
#include "pgtypes_date.h"
+#include "pgtypes_error.h"
+#include "pgtypeslib_extern.h"
date *
PGTYPESdate_new(void)
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index 29c1117..c22f657 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -7,9 +7,9 @@
#include <math.h>
#include "common/string.h"
-#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_timestamp.h"
+#include "pgtypeslib_extern.h"
const int day_tab[2][13] = {
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0},
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index 3ff8a10..bd2ac63 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -11,10 +11,10 @@
#include "common/string.h"
-#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_error.h"
#include "pgtypes_interval.h"
+#include "pgtypeslib_extern.h"
/* copy&pasted from .../src/backend/utils/adt/datetime.c
* and changesd struct pg_tm to struct tm
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index 22088ba..9d3da4c 100644
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -5,8 +5,9 @@
#include <float.h>
#include <limits.h>
-#include "pgtypeslib_extern.h"
#include "pgtypes_error.h"
+#include "pgtypes_numeric.h"
+#include "pgtypeslib_extern.h"
#define Max(x, y) ((x) > (y) ? (x) : (y))
#define Min(x, y) ((x) < (y) ? (x) : (y))
@@ -20,7 +21,6 @@
free(buf); \
} while (0)
-#include "pgtypes_numeric.h"
#if 0
/* ----------
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 2be151f..712c701 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -11,10 +11,10 @@
#error -ffast-math is known to break this code
#endif
-#include "pgtypeslib_extern.h"
#include "dt.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_date.h"
+#include "pgtypes_timestamp.h"
+#include "pgtypeslib_extern.h"
static int64
diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c
index 80aa7d5..8158566 100644
--- a/src/interfaces/ecpg/preproc/c_keywords.c
+++ b/src/interfaces/ecpg/preproc/c_keywords.c
@@ -9,12 +9,12 @@
*/
#include "postgres_fe.h"
-#include "preproc_extern.h"
-#include "preproc.h"
-
/* ScanKeywordList lookup data for C keywords */
#include "c_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"
+
/* Token codes for C keywords */
#define PG_KEYWORD(kwname, value) value,
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index 4839c37..65b4b9d 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -13,12 +13,12 @@
#include <ctype.h>
-#include "preproc_extern.h"
-#include "preproc.h"
-
/* ScanKeywordList lookup data for ECPG keywords */
#include "ecpg_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"
+
/* Token codes for ECPG keywords */
#define PG_KEYWORD(kwname, value) value,
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index a690f3b..625793d 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -40,8 +40,8 @@
#include "common/md5.h"
#include "common/scram-common.h"
-#include "libpq-fe.h"
#include "fe-auth.h"
+#include "libpq-fe.h"
#ifdef ENABLE_GSS
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index f91f0f2..ed23a4a 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -21,10 +21,6 @@
#include <time.h>
#include <unistd.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-#include "fe-auth.h"
-#include "pg_config_paths.h"
#ifdef WIN32
#include "win32.h"
@@ -74,7 +70,11 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
#include "common/link-canary.h"
#include "common/scram-common.h"
#include "common/string.h"
+#include "fe-auth.h"
+#include "libpq-fe.h"
+#include "libpq-int.h"
#include "mb/pg_wchar.h"
+#include "pg_config_paths.h"
#include "port/pg_bswap.h"
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index b3c59a0..e21f383 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -18,17 +18,17 @@
#include <fcntl.h>
#include <limits.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-
-#include "mb/pg_wchar.h"
-
#ifdef WIN32
#include "win32.h"
#else
#include <unistd.h>
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+
+#include "mb/pg_wchar.h"
+
/* keep this in same order as ExecStatusType in libpq-fe.h */
char *const pgresStatus[] = {
"PGRES_EMPTY_QUERY",
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 18fec4a..b4bafd7 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -50,8 +50,8 @@
#include "libpq-fe.h"
#include "libpq-int.h"
#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
#include "pg_config_paths.h"
+#include "port/pg_bswap.h"
static int pqPutMsgBytes(const void *buf, size_t len, PGconn *conn);
diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c
index 0e36974..e76bbb7 100644
--- a/src/interfaces/libpq/fe-protocol2.c
+++ b/src/interfaces/libpq/fe-protocol2.c
@@ -17,10 +17,6 @@
#include <ctype.h>
#include <fcntl.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-#include "port/pg_bswap.h"
-
#ifdef WIN32
#include "win32.h"
@@ -31,6 +27,10 @@
#endif
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "port/pg_bswap.h"
+
static int getRowDescriptions(PGconn *conn);
static int getAnotherTuple(PGconn *conn, bool binary);
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
index b04f7ec..539ec39 100644
--- a/src/interfaces/libpq/fe-protocol3.c
+++ b/src/interfaces/libpq/fe-protocol3.c
@@ -17,12 +17,6 @@
#include <ctype.h>
#include <fcntl.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-
-#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
-
#ifdef WIN32
#include "win32.h"
#else
@@ -32,6 +26,12 @@
#endif
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+
+#include "mb/pg_wchar.h"
+#include "port/pg_bswap.h"
+
/*
* This macro lists the backend message types that could be "long" (more
diff --git a/src/interfaces/libpq/fe-secure-gssapi.c b/src/interfaces/libpq/fe-secure-gssapi.c
index 095750d..a1c1d12 100644
--- a/src/interfaces/libpq/fe-secure-gssapi.c
+++ b/src/interfaces/libpq/fe-secure-gssapi.c
@@ -13,9 +13,9 @@
#include "postgres_fe.h"
+#include "fe-gssapi-common.h"
#include "libpq-fe.h"
#include "libpq-int.h"
-#include "fe-gssapi-common.h"
#include "port/pg_bswap.h"
/*
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index b8191b4..e55b375 100644
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -28,10 +28,6 @@
#include <fcntl.h>
#include <ctype.h>
-#include "libpq-fe.h"
-#include "fe-auth.h"
-#include "libpq-int.h"
-
#ifdef WIN32
#include "win32.h"
#else
@@ -55,6 +51,10 @@
#endif
#endif
+#include "fe-auth.h"
+#include "libpq-fe.h"
+#include "libpq-int.h"
+
/*
* Macros to handle disabling and then restoring the state of SIGPIPE handling.
* On Windows, these are all no-ops since there's no SIGPIPEs.
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 0c24ba6..d270b68f 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -24,6 +24,8 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "parser/parse_type.h"
+
+#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
@@ -33,8 +35,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "plpgsql.h"
-
/* ----------
* Our own local and global variables
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 345065e..ea68162 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -34,6 +34,8 @@
#include "parser/parse_coerce.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
+
+#include "plpgsql.h"
#include "storage/proc.h"
#include "tcop/tcopprot.h"
#include "tcop/utility.h"
@@ -48,8 +50,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "plpgsql.h"
-
typedef struct
{
diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
index 053f83d..360a902 100644
--- a/src/pl/plpgsql/src/pl_funcs.c
+++ b/src/pl/plpgsql/src/pl_funcs.c
@@ -15,10 +15,10 @@
#include "postgres.h"
-#include "utils/memutils.h"
-
#include "plpgsql.h"
+#include "utils/memutils.h"
+
/* ----------
* Local variables for namespace handling
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index ce03f1e..8532043 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -20,13 +20,13 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/varlena.h"
-#include "plpgsql.h"
static bool plpgsql_extra_checks_check_hook(char **newvalue, void **extra, GucSource source);
diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c
index e4d543a..4c97a9d 100644
--- a/src/pl/plpython/plpy_cursorobject.c
+++ b/src/pl/plpython/plpy_cursorobject.c
@@ -11,7 +11,6 @@
#include "access/xact.h"
#include "catalog/pg_type.h"
#include "mb/pg_wchar.h"
-#include "utils/memutils.h"
#include "plpython.h"
@@ -23,6 +22,7 @@
#include "plpy_procedure.h"
#include "plpy_resultobject.h"
#include "plpy_spi.h"
+#include "utils/memutils.h"
static PyObject *PLy_cursor_query(const char *query);
diff --git a/src/pl/plpython/plpy_exec.c b/src/pl/plpython/plpy_exec.c
index 920322e..88bc7e5 100644
--- a/src/pl/plpython/plpy_exec.c
+++ b/src/pl/plpython/plpy_exec.c
@@ -12,19 +12,19 @@
#include "commands/trigger.h"
#include "executor/spi.h"
#include "funcapi.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
-#include "utils/rel.h"
-#include "utils/typcache.h"
#include "plpython.h"
-#include "plpy_exec.h"
-
#include "plpy_elog.h"
+
+#include "plpy_exec.h"
#include "plpy_main.h"
#include "plpy_procedure.h"
#include "plpy_subxactobject.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/rel.h"
+#include "utils/typcache.h"
/* saved state for a set-returning function */
diff --git a/src/pl/plpython/plpy_main.c b/src/pl/plpython/plpy_main.c
index 6edfcf2..4f1b899 100644
--- a/src/pl/plpython/plpy_main.c
+++ b/src/pl/plpython/plpy_main.c
@@ -12,20 +12,20 @@
#include "commands/trigger.h"
#include "executor/spi.h"
#include "miscadmin.h"
-#include "utils/guc.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/syscache.h"
#include "plpython.h"
-#include "plpy_main.h"
-
#include "plpy_elog.h"
#include "plpy_exec.h"
+
+#include "plpy_main.h"
#include "plpy_plpymodule.h"
#include "plpy_procedure.h"
#include "plpy_subxactobject.h"
+#include "utils/guc.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
+#include "utils/syscache.h"
/*
diff --git a/src/pl/plpython/plpy_planobject.c b/src/pl/plpython/plpy_planobject.c
index 96ea24c..fd86eb6 100644
--- a/src/pl/plpython/plpy_planobject.c
+++ b/src/pl/plpython/plpy_planobject.c
@@ -8,10 +8,10 @@
#include "plpython.h"
-#include "plpy_planobject.h"
-
#include "plpy_cursorobject.h"
#include "plpy_elog.h"
+
+#include "plpy_planobject.h"
#include "plpy_spi.h"
#include "utils/memutils.h"
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
index c80b350..2a4a533 100644
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -8,20 +8,20 @@
#include "access/xact.h"
#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
-#include "utils/snapmgr.h"
#include "plpython.h"
-#include "plpy_plpymodule.h"
#include "plpy_cursorobject.h"
#include "plpy_elog.h"
#include "plpy_main.h"
#include "plpy_planobject.h"
+#include "plpy_plpymodule.h"
#include "plpy_resultobject.h"
#include "plpy_spi.h"
#include "plpy_subxactobject.h"
+#include "utils/builtins.h"
+#include "utils/snapmgr.h"
HTAB *PLy_spi_exceptions = NULL;
diff --git a/src/pl/plpython/plpy_procedure.c b/src/pl/plpython/plpy_procedure.c
index 6e08c03..1a02f3f 100644
--- a/src/pl/plpython/plpy_procedure.c
+++ b/src/pl/plpython/plpy_procedure.c
@@ -8,9 +8,15 @@
#include "access/htup_details.h"
#include "access/transam.h"
-#include "funcapi.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
+#include "plpython.h"
+
+#include "plpy_elog.h"
+#include "plpy_main.h"
+#include "plpy_procedure.h"
+
#include "utils/builtins.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
@@ -18,12 +24,6 @@
#include "utils/memutils.h"
#include "utils/syscache.h"
-#include "plpython.h"
-
-#include "plpy_procedure.h"
-
-#include "plpy_elog.h"
-#include "plpy_main.h"
static HTAB *PLy_procedure_cache = NULL;
diff --git a/src/pl/plpython/plpy_resultobject.c b/src/pl/plpython/plpy_resultobject.c
index 20cf3ed..374f88a 100644
--- a/src/pl/plpython/plpy_resultobject.c
+++ b/src/pl/plpython/plpy_resultobject.c
@@ -8,8 +8,8 @@
#include "plpython.h"
-#include "plpy_resultobject.h"
#include "plpy_elog.h"
+#include "plpy_resultobject.h"
static void PLy_result_dealloc(PyObject *arg);
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
index 2fe435d..53b9f7c 100644
--- a/src/pl/plpython/plpy_spi.c
+++ b/src/pl/plpython/plpy_spi.c
@@ -14,19 +14,19 @@
#include "executor/spi.h"
#include "mb/pg_wchar.h"
#include "parser/parse_type.h"
-#include "utils/memutils.h"
-#include "utils/syscache.h"
-
#include "plpython.h"
-#include "plpy_spi.h"
-
#include "plpy_elog.h"
+
#include "plpy_main.h"
#include "plpy_planobject.h"
#include "plpy_plpymodule.h"
#include "plpy_procedure.h"
#include "plpy_resultobject.h"
+#include "plpy_spi.h"
+#include "utils/memutils.h"
+#include "utils/syscache.h"
+
static PyObject *PLy_spi_execute_query(char *query, long limit);
diff --git a/src/pl/plpython/plpy_subxactobject.c b/src/pl/plpython/plpy_subxactobject.c
index 5dfb8a4..4609cbe 100644
--- a/src/pl/plpython/plpy_subxactobject.c
+++ b/src/pl/plpython/plpy_subxactobject.c
@@ -7,13 +7,13 @@
#include "postgres.h"
#include "access/xact.h"
-#include "utils/memutils.h"
-
#include "plpython.h"
+#include "plpy_elog.h"
+
#include "plpy_subxactobject.h"
+#include "utils/memutils.h"
-#include "plpy_elog.h"
List *explicit_subtransactions = NIL;
diff --git a/src/pl/plpython/plpy_typeio.c b/src/pl/plpython/plpy_typeio.c
index 371e534..160afcc 100644
--- a/src/pl/plpython/plpy_typeio.c
+++ b/src/pl/plpython/plpy_typeio.c
@@ -11,18 +11,18 @@
#include "funcapi.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
+#include "plpython.h"
+
+#include "plpy_elog.h"
+#include "plpy_main.h"
+
+#include "plpy_typeio.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-#include "plpython.h"
-
-#include "plpy_typeio.h"
-
-#include "plpy_elog.h"
-#include "plpy_main.h"
/* conversion from Datums to Python objects */
diff --git a/src/pl/plpython/plpy_util.c b/src/pl/plpython/plpy_util.c
index 2128acb..4ce3a94 100644
--- a/src/pl/plpython/plpy_util.c
+++ b/src/pl/plpython/plpy_util.c
@@ -7,13 +7,13 @@
#include "postgres.h"
#include "mb/pg_wchar.h"
-#include "utils/memutils.h"
#include "plpython.h"
+#include "plpy_elog.h"
#include "plpy_util.h"
-#include "plpy_elog.h"
+#include "utils/memutils.h"
/*
diff --git a/src/port/pg_crc32c_armv8.c b/src/port/pg_crc32c_armv8.c
index ebe449e..de725d3 100644
--- a/src/port/pg_crc32c_armv8.c
+++ b/src/port/pg_crc32c_armv8.c
@@ -14,10 +14,10 @@
*/
#include "c.h"
-#include "port/pg_crc32c.h"
-
#include <arm_acle.h>
+#include "port/pg_crc32c.h"
+
pg_crc32c
pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t len)
{
diff --git a/src/port/pg_crc32c_sse42.c b/src/port/pg_crc32c_sse42.c
index ef56cff..a81718b 100644
--- a/src/port/pg_crc32c_sse42.c
+++ b/src/port/pg_crc32c_sse42.c
@@ -14,10 +14,10 @@
*/
#include "c.h"
-#include "port/pg_crc32c.h"
-
#include <nmmintrin.h>
+#include "port/pg_crc32c.h"
+
pg_crc32c
pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len)
{
diff --git a/src/port/tar.c b/src/port/tar.c
index f1da959..2242f83 100644
--- a/src/port/tar.c
+++ b/src/port/tar.c
@@ -1,6 +1,6 @@
#include "c.h"
-#include "pgtar.h"
#include <sys/stat.h>
+#include "pgtar.h"
/*
* Print a numeric field in a tar header. The field starts at *s and is of
diff --git a/src/test/examples/testlibpq3.c b/src/test/examples/testlibpq3.c
index dda45af..7129c42 100644
--- a/src/test/examples/testlibpq3.c
+++ b/src/test/examples/testlibpq3.c
@@ -37,12 +37,12 @@
#include <stdint.h>
#include <string.h>
#include <sys/types.h>
-#include "libpq-fe.h"
/* for ntohl/htonl */
#include <netinet/in.h>
#include <arpa/inet.h>
+#include "libpq-fe.h"
static void
exit_nicely(PGconn *conn)
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
index 556b46d..f413340 100644
--- a/src/test/isolation/isolationtester.c
+++ b/src/test/isolation/isolationtester.c
@@ -13,11 +13,11 @@
#endif
#include "datatype/timestamp.h"
+#include "isolationtester.h"
#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "pg_getopt.h"
+#include "pqexpbuffer.h"
-#include "isolationtester.h"
#define PREP_WAITING "isolationtester_waiting"
diff --git a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
index bab073b..7e9d7de 100644
--- a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
+++ b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
@@ -12,10 +12,10 @@
*/
#include "postgres.h"
-#include "fmgr.h"
#include "access/ginblock.h"
#include "access/gin_private.h"
#include "access/htup_details.h"
+#include "fmgr.h"
PG_MODULE_MAGIC;
diff --git a/src/test/modules/test_integerset/test_integerset.c b/src/test/modules/test_integerset/test_integerset.c
index e3925a1..82d8563 100644
--- a/src/test/modules/test_integerset/test_integerset.c
+++ b/src/test/modules/test_integerset/test_integerset.c
@@ -14,12 +14,12 @@
#include "fmgr.h"
#include "lib/integerset.h"
+#include "miscadmin.h"
#include "nodes/bitmapset.h"
-#include "utils/memutils.h"
-#include "utils/timestamp.h"
#include "storage/block.h"
#include "storage/itemptr.h"
-#include "miscadmin.h"
+#include "utils/memutils.h"
+#include "utils/timestamp.h"
/*
* If you enable this, the "pattern" tests will print information about
diff --git a/src/test/modules/test_rls_hooks/test_rls_hooks.c b/src/test/modules/test_rls_hooks/test_rls_hooks.c
index 10379bc..1581f5c 100644
--- a/src/test/modules/test_rls_hooks/test_rls_hooks.c
+++ b/src/test/modules/test_rls_hooks/test_rls_hooks.c
@@ -13,19 +13,18 @@
#include "postgres.h"
-#include "fmgr.h"
-#include "miscadmin.h"
-#include "test_rls_hooks.h"
#include "catalog/pg_type.h"
-#include "nodes/makefuncs.h"
+#include "fmgr.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "parser/parse_clause.h"
#include "parser/parse_collate.h"
#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "rewrite/rowsecurity.h"
+#include "test_rls_hooks.h"
#include "utils/acl.h"
#include "utils/rel.h"
#include "utils/relcache.h"
diff --git a/src/test/modules/test_shm_mq/setup.c b/src/test/modules/test_shm_mq/setup.c
index a318168..c55eebe 100644
--- a/src/test/modules/test_shm_mq/setup.c
+++ b/src/test/modules/test_shm_mq/setup.c
@@ -20,9 +20,9 @@
#include "postmaster/bgworker.h"
#include "storage/procsignal.h"
#include "storage/shm_toc.h"
+#include "test_shm_mq.h"
#include "utils/memutils.h"
-#include "test_shm_mq.h"
typedef struct
{
diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c
index bc9ef64..a9267e1 100644
--- a/src/test/modules/worker_spi/worker_spi.c
+++ b/src/test/modules/worker_spi/worker_spi.c
@@ -22,24 +22,23 @@
*/
#include "postgres.h"
-/* These are always necessary for a bgworker */
-#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 "access/xact.h"
#include "executor/spi.h"
#include "fmgr.h"
#include "lib/stringinfo.h"
+#include "miscadmin.h"
#include "pgstat.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 "tcop/utility.h"
#include "utils/builtins.h"
#include "utils/snapmgr.h"
-#include "tcop/utility.h"
PG_MODULE_MAGIC;
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 3a39472..2fc7e89 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -29,7 +29,6 @@
#include <sys/resource.h>
#endif
-#include "pg_regress.h"
#include "common/logging.h"
#include "common/restricted_token.h"
@@ -37,6 +36,7 @@
#include "getopt_long.h"
#include "libpq/pqcomm.h" /* needed for UNIXSOCK_PATH() */
#include "pg_config_paths.h"
+#include "pg_regress.h"
#include "portability/instr_time.h"
/* for resultmap we need a list of pairs of strings */
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index cb8ef53..fb515a8 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -36,9 +36,9 @@
#include "port/atomics.h"
#include "utils/builtins.h"
#include "utils/geo_decls.h"
+#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/typcache.h"
-#include "utils/memutils.h"
#define EXPECT_TRUE(expr) \
--
1.8.3.1
Re: Ordering of header file inclusion
On Tue, Oct 15, 2019 at 10:57 PM vignesh C <vignesh21@gmail.com> wrote:
On Wed, Oct 9, 2019 at 11:37 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Tue, Oct 8, 2019 at 8:19 PM Tom Lane <tgl@sss.pgh.pa.us> wrote:
Amit Kapila <amit.kapila16@gmail.com> writes:
On Wed, Oct 2, 2019 at 2:57 PM vignesh C <vignesh21@gmail.com> wrote:
I noticed that some of the header files inclusion is not ordered as
per the usual standard that is followed.
The attached patch contains the fix for the order in which the header
files are included.
Let me know your thoughts on the same.+1.
FWIW, I'm not on board with reordering system-header inclusions.
Some platforms have (had?) ordering dependencies for those, and where
that's true, it's seldom alphabetical. It's only our own headers
where we can safely expect that any arbitrary order will work.Okay, that makes sense. However, I noticed that ordering for
system-header inclusions is somewhat random. For ex. nodeSubPlan.c,
datetime.c, etc. include limits.h first and then math.h whereas
knapsack.c, float.c includes them in reverse order. There could be
more such inconsistencies and the probable reason is that we don't
have any specific rule, so different people decide to do it
differently.I think we shouldn't remove the extra line as part of the above change.
I would take out the blank lines between our own #includes.
Okay, that would be better, but doing it half-heartedly as done in
patch might make it worse. So, it is better to remove blank lines
between our own #includes in all cases.Attached patch contains the fix based on the comments suggested.
Thanks for working on this. I will look into this in the coming few
days or during next CF. Can you please register it for the next CF
(https://commitfest.postgresql.org/25/)?
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Wed, Oct 16, 2019 at 8:10 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
Thanks for working on this. I will look into this in the coming few
days or during next CF. Can you please register it for the next CF
(https://commitfest.postgresql.org/25/)?
Thanks, I have added it to the commitfest.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Tue, Oct 15, 2019 at 10:57 PM vignesh C <vignesh21@gmail.com> wrote:
Attached patch contains the fix based on the comments suggested.
I have added/deleted extra lines in certain places so that the
readability is better.
Hmm, I am not sure if that is better in all cases. It seems to be
making the code look inconsistent at few places. See comments below:
1.
diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c
index 4b2186b..45215ba 100644
--- a/contrib/bloom/blinsert.c
+++ b/contrib/bloom/blinsert.c
@@ -15,6 +15,7 @@
#include "access/genam.h"
#include "access/generic_xlog.h"
#include "access/tableam.h"
+#include "bloom.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
@@ -23,7 +24,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"-#include "bloom.h"
PG_MODULE_MAGIC;
diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c
index 49e364a..4b9a2b8 100644
--- a/contrib/bloom/blscan.c
+++ b/contrib/bloom/blscan.c
@@ -13,14 +13,14 @@
#include "postgres.h" #include "access/relscan.h"
-#include "pgstat.h"
+#include "bloom.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "bloom.h"
/*
* Begin scan of bloom index.
The above changes lead to one extra line between the last header
include and from where the actual code starts.
2.
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 91e2a80..0d2f667 100644
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -3,11 +3,11 @@
*/
#include "postgres.h"+#include "_int.h"
+
#include "miscadmin.h"
#include "utils/builtins.h"-#include "_int.h"
-
PG_FUNCTION_INFO_V1(bqarr_in);
PG_FUNCTION_INFO_V1(bqarr_out);
PG_FUNCTION_INFO_V1(boolop);
diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c
index 7aebfec..d6241d4 100644
--- a/contrib/intarray/_int_gin.c
+++ b/contrib/intarray/_int_gin.c
@@ -3,11 +3,11 @@
*/
#include "postgres.h"+#include "_int.h"
+
#include "access/gin.h"
#include "access/stratnum.h"Why extra line after inclusion of _int.h?
3.
diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c
index fde8d15..75ad04e 100644
--- a/contrib/intarray/_int_tool.c
+++ b/contrib/intarray/_int_tool.c
@@ -5,10 +5,10 @@#include <limits.h>
-#include "catalog/pg_type.h"
-
#include "_int.h"
+#include "catalog/pg_type.h"
+
Why extra lines after both includes?
4.
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index 2a20abe..87ea86c 100644
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -3,12 +3,12 @@
*/
#include "postgres.h"+#include "_int.h"
+
#include "access/gist.h"
#include "access/stratnum.h"
#include "port/pg_bitutils.h"
-#include "_int.h"
-
#define GETENTRY(vec,pos) ((GISTTYPE *)
DatumGetPointer((vec)->vector[(pos)].key))
/*
** _intbig methods
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 0c2cac7..36bb582 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -15,9 +15,9 @@
#include "postgres.h" #include "fmgr.h"
+#include "isn.h"
#include "utils/builtins.h"
-#include "isn.h"
Again extra spaces. I am not why you have extra spaces in a few cases.
I haven't reviewed it completely, but generally, the changes seem to
be fine. Please see if you can be consistent in extra space between
includes. Kindly check the same throughout the patch.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c
index f9fe57f..6224735 100644
--- a/contrib/bloom/blcost.c
+++ b/contrib/bloom/blcost.c
@@ -12,10 +12,10 @@
*/
#include "postgres.h"+#include "bloom.h"
#include "fmgr.h"
#include "utils/selfuncs.h"
-#include "bloom.h"
/*
* Estimate cost of bloom index scan.
This class of change I don't like.
The existing arrangement keeps "other" header files separate from the
header file of the module itself. It seems useful to keep that separate.
--
Peter Eisentraut http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
Re: Ordering of header file inclusion
Hi,
On 2019-10-19 21:50:03 +0200, Peter Eisentraut wrote:
diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c index f9fe57f..6224735 100644 --- a/contrib/bloom/blcost.c +++ b/contrib/bloom/blcost.c @@ -12,10 +12,10 @@ */ #include "postgres.h"+#include "bloom.h"
#include "fmgr.h"
#include "utils/selfuncs.h"-#include "bloom.h"
/*
* Estimate cost of bloom index scan.This class of change I don't like.
The existing arrangement keeps "other" header files separate from the
header file of the module itself. It seems useful to keep that separate.
If we were to do so, we ought to put bloom.h first and clearly seperated
out, not last, as the former makes the bug of the the header not being
standalone more obvious.
I'm -1 on having a policy of putting the headers separate though, I feel
that's too much work, and there's too many cases where it's not that
clear which header that should be.
Greetings,
Andres Freund
Re: Ordering of header file inclusion
Andres Freund <andres@anarazel.de> writes:
On 2019-10-19 21:50:03 +0200, Peter Eisentraut wrote:
This class of change I don't like.
The existing arrangement keeps "other" header files separate from the
header file of the module itself. It seems useful to keep that separate.
If we were to do so, we ought to put bloom.h first and clearly seperated
out, not last, as the former makes the bug of the the header not being
standalone more obvious.
We have headerscheck and cpluspluscheck to catch that problem, so I don't
think that it needs to be a reason not to rationalize header inclusion
order.
I don't have a very strong opinion on whether modules outside the core
backend should separate their own headers from core-system headers.
I think there's some argument for that, but it's not something we've
done consistently. And, as you say, there's no convention as to
where we'd include local headers if we do separate them.
regards, tom lane
Re: Ordering of header file inclusion
On Thu, Oct 17, 2019 at 4:44 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Tue, Oct 15, 2019 at 10:57 PM vignesh C <vignesh21@gmail.com> wrote:
Attached patch contains the fix based on the comments suggested.
I have added/deleted extra lines in certain places so that the
readability is better.Hmm, I am not sure if that is better in all cases. It seems to be
making the code look inconsistent at few places. See comments below:1. diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c index 4b2186b..45215ba 100644 --- a/contrib/bloom/blinsert.c +++ b/contrib/bloom/blinsert.c @@ -15,6 +15,7 @@ #include "access/genam.h" #include "access/generic_xlog.h" #include "access/tableam.h" +#include "bloom.h" #include "catalog/index.h" #include "miscadmin.h" #include "storage/bufmgr.h" @@ -23,7 +24,6 @@ #include "utils/memutils.h" #include "utils/rel.h"-#include "bloom.h"
PG_MODULE_MAGIC;
diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c index 49e364a..4b9a2b8 100644 --- a/contrib/bloom/blscan.c +++ b/contrib/bloom/blscan.c @@ -13,14 +13,14 @@ #include "postgres.h"#include "access/relscan.h"
-#include "pgstat.h"
+#include "bloom.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"-#include "bloom.h"
/*
* Begin scan of bloom index.The above changes lead to one extra line between the last header
include and from where the actual code starts.2. diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c index 91e2a80..0d2f667 100644 --- a/contrib/intarray/_int_bool.c +++ b/contrib/intarray/_int_bool.c @@ -3,11 +3,11 @@ */ #include "postgres.h"+#include "_int.h" + #include "miscadmin.h" #include "utils/builtins.h"-#include "_int.h" - PG_FUNCTION_INFO_V1(bqarr_in); PG_FUNCTION_INFO_V1(bqarr_out); PG_FUNCTION_INFO_V1(boolop); diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c index 7aebfec..d6241d4 100644 --- a/contrib/intarray/_int_gin.c +++ b/contrib/intarray/_int_gin.c @@ -3,11 +3,11 @@ */ #include "postgres.h"+#include "_int.h" + #include "access/gin.h" #include "access/stratnum.h"Why extra line after inclusion of _int.h?
3. diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c index fde8d15..75ad04e 100644 --- a/contrib/intarray/_int_tool.c +++ b/contrib/intarray/_int_tool.c @@ -5,10 +5,10 @@#include <limits.h>
-#include "catalog/pg_type.h"
-
#include "_int.h"+#include "catalog/pg_type.h"
+Why extra lines after both includes?
4. diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c index 2a20abe..87ea86c 100644 --- a/contrib/intarray/_intbig_gist.c +++ b/contrib/intarray/_intbig_gist.c @@ -3,12 +3,12 @@ */ #include "postgres.h"+#include "_int.h"
+
#include "access/gist.h"
#include "access/stratnum.h"
#include "port/pg_bitutils.h"-#include "_int.h" - #define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer((vec)->vector[(pos)].key)) /* ** _intbig methods diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c index 0c2cac7..36bb582 100644 --- a/contrib/isn/isn.c +++ b/contrib/isn/isn.c @@ -15,9 +15,9 @@ #include "postgres.h"#include "fmgr.h"
+#include "isn.h"
#include "utils/builtins.h"-#include "isn.h"
Again extra spaces. I am not why you have extra spaces in a few cases.
I haven't reviewed it completely, but generally, the changes seem to
be fine. Please see if you can be consistent in extra space between
includes. Kindly check the same throughout the patch.
Thanks for reviewing the patch.
I have made an updated patch with comments you have suggested.
I have split the patch into 3 patches so that the review can be simpler.
This patch also includes the changes suggested by Peter & Andres.
I had just seen seen Tom Lane's suggestions regarding submodule header
file, this patch contains fix based on Andres suggestions. Let me know
if that need to be changed, I can update it.
Should we make this changes only in master branch or should we make in
back branches also. If we decide for back branches, I will check if
this patch can apply in back branches and if this patch cannot be
directly applied I can make separate patch for the back branch and
send.
Please let me know your suggestions for any changes.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Attachments:
0001-Ordering-of-header-files-in-contrib-dir.patchapplication/octet-stream; name=0001-Ordering-of-header-files-in-contrib-dir.patchDownload
From 70285e3a973cec292cdab1804fe6b4dec5a5d8b4 Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Sun, 20 Oct 2019 16:07:13 +0530
Subject: [PATCH 1/3] Ordering of header files in contrib dir.
Ordering of header files that is included in source code in contrib dir.
---
contrib/bloom/blcost.c | 3 +--
contrib/bloom/blinsert.c | 3 +--
contrib/bloom/blscan.c | 5 ++---
contrib/bloom/blutils.c | 10 ++++------
contrib/bloom/blvalidate.c | 3 +--
contrib/btree_gin/btree_gin.c | 2 +-
contrib/btree_gist/btree_enum.c | 6 +++---
contrib/btree_gist/btree_inet.c | 4 ++--
contrib/btree_gist/btree_numeric.c | 1 -
contrib/btree_gist/btree_utils_var.c | 3 +--
contrib/cube/cube.c | 3 +--
contrib/dblink/dblink.c | 3 +--
contrib/hstore/hstore_gist.c | 3 +--
contrib/hstore/hstore_io.c | 2 +-
contrib/hstore/hstore_op.c | 3 +--
contrib/hstore_plpython/hstore_plpython.c | 4 ++--
contrib/intarray/_int_bool.c | 3 +--
contrib/intarray/_int_gin.c | 3 +--
contrib/intarray/_int_gist.c | 3 +--
contrib/intarray/_int_selfuncs.c | 4 ++--
contrib/intarray/_int_tool.c | 4 +---
contrib/intarray/_intbig_gist.c | 3 +--
contrib/isn/isn.c | 2 +-
contrib/jsonb_plperl/jsonb_plperl.c | 2 +-
contrib/jsonb_plpython/jsonb_plpython.c | 4 ++--
contrib/ltree/_ltree_gist.c | 4 +---
contrib/ltree/crc32.c | 2 +-
contrib/ltree/lquery_op.c | 2 +-
contrib/ltree/ltree_io.c | 4 ++--
contrib/ltree/ltree_op.c | 2 +-
contrib/ltree_plpython/ltree_plpython.c | 2 +-
contrib/oid2name/oid2name.c | 4 +---
contrib/pageinspect/brinfuncs.c | 6 ++----
contrib/pageinspect/btreefuncs.c | 2 --
contrib/pageinspect/fsmfuncs.c | 1 -
contrib/pageinspect/ginfuncs.c | 1 -
contrib/pageinspect/hashfuncs.c | 3 +--
contrib/pageinspect/heapfuncs.c | 3 +--
contrib/pageinspect/rawpage.c | 1 -
contrib/passwordcheck/passwordcheck.c | 2 +-
contrib/pg_standby/pg_standby.c | 3 +--
contrib/pg_trgm/trgm_gin.c | 2 --
contrib/pg_trgm/trgm_gist.c | 2 --
contrib/pg_trgm/trgm_op.c | 3 +--
contrib/pg_trgm/trgm_regexp.c | 2 --
contrib/pgcrypto/crypt-md5.c | 2 +-
contrib/pgcrypto/internal.c | 6 +++---
contrib/pgcrypto/mbuf.c | 2 +-
contrib/pgcrypto/openssl.c | 3 +--
contrib/pgcrypto/pgcrypto.c | 7 +++----
contrib/pgcrypto/pgp-armor.c | 2 +-
contrib/pgcrypto/pgp-cfb.c | 2 +-
contrib/pgcrypto/pgp-compress.c | 3 +--
contrib/pgcrypto/pgp-decrypt.c | 2 +-
contrib/pgcrypto/pgp-encrypt.c | 3 +--
contrib/pgcrypto/pgp-info.c | 2 +-
contrib/pgcrypto/pgp-mpi-internal.c | 3 +--
contrib/pgcrypto/pgp-mpi-openssl.c | 2 +-
contrib/pgcrypto/pgp-mpi.c | 2 +-
contrib/pgcrypto/pgp-pgsql.c | 11 +++++------
contrib/pgcrypto/pgp-pubdec.c | 2 +-
contrib/pgcrypto/pgp-pubenc.c | 2 +-
contrib/pgcrypto/pgp-pubkey.c | 2 +-
contrib/pgcrypto/pgp-s2k.c | 3 +--
contrib/pgcrypto/pgp.c | 2 +-
contrib/pgcrypto/px-crypt.c | 3 +--
contrib/pgstattuple/pgstatapprox.c | 6 +++---
contrib/postgres_fdw/connection.c | 2 --
contrib/postgres_fdw/deparse.c | 2 --
contrib/postgres_fdw/option.c | 2 --
contrib/postgres_fdw/postgres_fdw.c | 1 -
contrib/postgres_fdw/shippable.c | 2 --
contrib/sepgsql/database.c | 4 ++--
contrib/sepgsql/dml.c | 5 ++---
contrib/sepgsql/hooks.c | 3 +--
contrib/sepgsql/label.c | 5 ++---
contrib/sepgsql/proc.c | 3 +--
contrib/sepgsql/relation.c | 7 +++----
contrib/sepgsql/schema.c | 3 +--
contrib/sepgsql/uavc.c | 3 +--
contrib/spi/moddatetime.c | 2 +-
contrib/tablefunc/tablefunc.c | 3 +--
contrib/tcn/tcn.c | 2 +-
contrib/vacuumlo/vacuumlo.c | 3 +--
84 files changed, 98 insertions(+), 163 deletions(-)
diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c
index f9fe57f..eff0c56 100644
--- a/contrib/bloom/blcost.c
+++ b/contrib/bloom/blcost.c
@@ -11,12 +11,11 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "bloom.h"
#include "fmgr.h"
#include "utils/selfuncs.h"
-#include "bloom.h"
-
/*
* Estimate cost of bloom index scan.
*/
diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c
index 4b2186b..bcbcd09 100644
--- a/contrib/bloom/blinsert.c
+++ b/contrib/bloom/blinsert.c
@@ -11,6 +11,7 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "bloom.h"
#include "access/genam.h"
#include "access/generic_xlog.h"
@@ -23,8 +24,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "bloom.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c
index 49e364a..aab3a76 100644
--- a/contrib/bloom/blscan.c
+++ b/contrib/bloom/blscan.c
@@ -11,17 +11,16 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "bloom.h"
#include "access/relscan.h"
-#include "pgstat.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "bloom.h"
-
/*
* Begin scan of bloom index.
*/
diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c
index dbb24cb..d600e17 100644
--- a/contrib/bloom/blutils.c
+++ b/contrib/bloom/blutils.c
@@ -12,20 +12,18 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "bloom.h"
#include "access/amapi.h"
#include "access/generic_xlog.h"
+#include "access/reloptions.h"
#include "catalog/index.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/indexfsm.h"
-#include "utils/memutils.h"
-#include "access/reloptions.h"
#include "storage/freespace.h"
#include "storage/indexfsm.h"
-
-#include "bloom.h"
+#include "storage/lmgr.h"
+#include "utils/memutils.h"
/* Signature dealing macros - note i is assumed to be of type int */
#define GETWORD(x,i) ( *( (BloomSignatureWord *)(x) + ( (i) / SIGNWORDBITS ) ) )
diff --git a/contrib/bloom/blvalidate.c b/contrib/bloom/blvalidate.c
index e9bd1b4..d6919c2 100644
--- a/contrib/bloom/blvalidate.c
+++ b/contrib/bloom/blvalidate.c
@@ -11,6 +11,7 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "bloom.h"
#include "access/amvalidate.h"
#include "access/htup_details.h"
@@ -24,8 +25,6 @@
#include "utils/regproc.h"
#include "utils/syscache.h"
-#include "bloom.h"
-
/*
* Validator for a bloom opclass.
*/
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c
index 2ecf7a2..0ed3d58 100644
--- a/contrib/btree_gin/btree_gin.c
+++ b/contrib/btree_gin/btree_gin.c
@@ -14,8 +14,8 @@
#include "utils/inet.h"
#include "utils/numeric.h"
#include "utils/timestamp.h"
-#include "utils/varbit.h"
#include "utils/uuid.h"
+#include "utils/varbit.h"
PG_MODULE_MAGIC;
diff --git a/contrib/btree_gist/btree_enum.c b/contrib/btree_gist/btree_enum.c
index 0ec7d8b..dc1734a 100644
--- a/contrib/btree_gist/btree_enum.c
+++ b/contrib/btree_gist/btree_enum.c
@@ -2,11 +2,11 @@
* contrib/btree_gist/btree_enum.c
*/
#include "postgres.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
-
#include "btree_gist.h"
+
#include "btree_utils_num.h"
+#include "fmgr.h"
+#include "utils/builtins.h"
/* enums are really Oids, so we just use the same structure */
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 34308cc..11e2589 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -2,12 +2,12 @@
* contrib/btree_gist/btree_inet.c
*/
#include "postgres.h"
-
#include "btree_gist.h"
+
#include "btree_utils_num.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/inet.h"
-#include "catalog/pg_type.h"
typedef struct inetkey
{
diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c
index b72060c..664a2d5 100644
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -2,7 +2,6 @@
* contrib/btree_gist/btree_numeric.c
*/
#include "postgres.h"
-
#include "btree_gist.h"
#include <math.h>
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 670c879..ead737a 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -2,7 +2,6 @@
* contrib/btree_gist/btree_utils_var.c
*/
#include "postgres.h"
-
#include "btree_gist.h"
#include <math.h>
@@ -10,8 +9,8 @@
#include <float.h>
#include "btree_utils_var.h"
-#include "utils/pg_locale.h"
#include "utils/builtins.h"
+#include "utils/pg_locale.h"
#include "utils/rel.h"
/* used for key sorting */
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index b720366..29670a6 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -7,6 +7,7 @@
******************************************************************************/
#include "postgres.h"
+#include "cubedata.h"
#include <math.h>
@@ -15,8 +16,6 @@
#include "utils/array.h"
#include "utils/float.h"
-#include "cubedata.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index e432457..54b7bf9 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -34,8 +34,6 @@
#include <limits.h>
-#include "libpq-fe.h"
-
#include "access/htup_details.h"
#include "access/relation.h"
#include "access/reloptions.h"
@@ -50,6 +48,7 @@
#include "foreign/foreign.h"
#include "funcapi.h"
#include "lib/stringinfo.h"
+#include "libpq-fe.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "parser/scansup.h"
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index 6a885f2..a2e1455 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -2,14 +2,13 @@
* contrib/hstore/hstore_gist.c
*/
#include "postgres.h"
+#include "hstore.h"
#include "access/gist.h"
#include "access/stratnum.h"
#include "catalog/pg_type.h"
#include "utils/pg_crc.h"
-#include "hstore.h"
-
/* bigint defines */
#define BITBYTE 8
#define SIGLENINT 4 /* >122 => key will toast, so very slow!!! */
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
index 745497c..5013225 100644
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -2,6 +2,7 @@
* contrib/hstore/hstore_io.c
*/
#include "postgres.h"
+#include "hstore.h"
#include <ctype.h>
@@ -18,7 +19,6 @@
#include "utils/memutils.h"
#include "utils/typcache.h"
-#include "hstore.h"
PG_MODULE_MAGIC;
diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index a3a8a91..dd5d476 100644
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -2,6 +2,7 @@
* contrib/hstore/hstore_op.c
*/
#include "postgres.h"
+#include "hstore.h"
#include "access/htup_details.h"
#include "catalog/pg_type.h"
@@ -10,8 +11,6 @@
#include "utils/hashutils.h"
#include "utils/memutils.h"
-#include "hstore.h"
-
/* old names for C functions */
HSTORE_POLLUTE(hstore_fetchval, fetchval);
HSTORE_POLLUTE(hstore_exists, exists);
diff --git a/contrib/hstore_plpython/hstore_plpython.c b/contrib/hstore_plpython/hstore_plpython.c
index 93705f0..4dee569 100644
--- a/contrib/hstore_plpython/hstore_plpython.c
+++ b/contrib/hstore_plpython/hstore_plpython.c
@@ -1,9 +1,9 @@
#include "postgres.h"
#include "fmgr.h"
-#include "plpython.h"
-#include "plpy_typeio.h"
#include "hstore/hstore.h"
+#include "plpy_typeio.h"
+#include "plpython.h"
PG_MODULE_MAGIC;
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 91e2a80..a609504 100644
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -2,12 +2,11 @@
* contrib/intarray/_int_bool.c
*/
#include "postgres.h"
+#include "_int.h"
#include "miscadmin.h"
#include "utils/builtins.h"
-#include "_int.h"
-
PG_FUNCTION_INFO_V1(bqarr_in);
PG_FUNCTION_INFO_V1(bqarr_out);
PG_FUNCTION_INFO_V1(boolop);
diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c
index 7aebfec..4f3c9b7 100644
--- a/contrib/intarray/_int_gin.c
+++ b/contrib/intarray/_int_gin.c
@@ -2,12 +2,11 @@
* contrib/intarray/_int_gin.c
*/
#include "postgres.h"
+#include "_int.h"
#include "access/gin.h"
#include "access/stratnum.h"
-#include "_int.h"
-
PG_FUNCTION_INFO_V1(ginint4_queryextract);
Datum
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
index e5a8011..e6cf4d2 100644
--- a/contrib/intarray/_int_gist.c
+++ b/contrib/intarray/_int_gist.c
@@ -2,14 +2,13 @@
* contrib/intarray/_int_gist.c
*/
#include "postgres.h"
+#include "_int.h"
#include <limits.h>
#include "access/gist.h"
#include "access/stratnum.h"
-#include "_int.h"
-
#define GETENTRY(vec,pos) ((ArrayType *) DatumGetPointer((vec)->vector[(pos)].key))
/*
diff --git a/contrib/intarray/_int_selfuncs.c b/contrib/intarray/_int_selfuncs.c
index aebffae..6d555de 100644
--- a/contrib/intarray/_int_selfuncs.c
+++ b/contrib/intarray/_int_selfuncs.c
@@ -19,11 +19,11 @@
#include "catalog/pg_operator.h"
#include "catalog/pg_statistic.h"
#include "catalog/pg_type.h"
+#include "miscadmin.h"
#include "utils/builtins.h"
+#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
#include "utils/syscache.h"
-#include "utils/lsyscache.h"
-#include "miscadmin.h"
PG_FUNCTION_INFO_V1(_int_overlap_sel);
PG_FUNCTION_INFO_V1(_int_contains_sel);
diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c
index fde8d15..ae1f03b 100644
--- a/contrib/intarray/_int_tool.c
+++ b/contrib/intarray/_int_tool.c
@@ -2,14 +2,12 @@
* contrib/intarray/_int_tool.c
*/
#include "postgres.h"
+#include "_int.h"
#include <limits.h>
#include "catalog/pg_type.h"
-#include "_int.h"
-
-
/* arguments are assumed sorted & unique-ified */
bool
inner_int_contains(ArrayType *a, ArrayType *b)
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index 2a20abe..671d991 100644
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -2,13 +2,12 @@
* contrib/intarray/_intbig_gist.c
*/
#include "postgres.h"
+#include "_int.h"
#include "access/gist.h"
#include "access/stratnum.h"
#include "port/pg_bitutils.h"
-#include "_int.h"
-
#define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer((vec)->vector[(pos)].key))
/*
** _intbig methods
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 0c2cac7..98abac2 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -13,11 +13,11 @@
*/
#include "postgres.h"
+#include "isn.h"
#include "fmgr.h"
#include "utils/builtins.h"
-#include "isn.h"
#include "EAN13.h"
#include "ISBN.h"
#include "ISMN.h"
diff --git a/contrib/jsonb_plperl/jsonb_plperl.c b/contrib/jsonb_plperl/jsonb_plperl.c
index 04b04df..4ae1353 100644
--- a/contrib/jsonb_plperl/jsonb_plperl.c
+++ b/contrib/jsonb_plperl/jsonb_plperl.c
@@ -5,8 +5,8 @@
#include "fmgr.h"
#include "plperl.h"
#include "plperl_helpers.h"
-#include "utils/jsonb.h"
#include "utils/fmgrprotos.h"
+#include "utils/jsonb.h"
PG_MODULE_MAGIC;
diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c
index 776cf7c..ecaa4c6 100644
--- a/contrib/jsonb_plpython/jsonb_plpython.c
+++ b/contrib/jsonb_plpython/jsonb_plpython.c
@@ -1,10 +1,10 @@
#include "postgres.h"
-#include "plpython.h"
#include "plpy_elog.h"
#include "plpy_typeio.h"
-#include "utils/jsonb.h"
+#include "plpython.h"
#include "utils/fmgrprotos.h"
+#include "utils/jsonb.h"
#include "utils/numeric.h"
PG_MODULE_MAGIC;
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index c33ac4e..6b14ed5 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -9,11 +9,9 @@
#include "access/gist.h"
#include "access/stratnum.h"
-#include "port/pg_bitutils.h"
-
#include "crc32.h"
#include "ltree.h"
-
+#include "port/pg_bitutils.h"
PG_FUNCTION_INFO_V1(_ltree_compress);
PG_FUNCTION_INFO_V1(_ltree_same);
diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c
index 447e4b2..0c3e459 100644
--- a/contrib/ltree/crc32.c
+++ b/contrib/ltree/crc32.c
@@ -16,8 +16,8 @@
#define TOLOWER(x) (x)
#endif
-#include "utils/pg_crc.h"
#include "crc32.h"
+#include "utils/pg_crc.h"
unsigned int
ltree_crc32_sz(char *buf, int size)
diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c
index 62172d5..ea0a0f6 100644
--- a/contrib/ltree/lquery_op.c
+++ b/contrib/ltree/lquery_op.c
@@ -4,12 +4,12 @@
* contrib/ltree/lquery_op.c
*/
#include "postgres.h"
+#include "ltree.h"
#include <ctype.h>
#include "catalog/pg_collation.h"
#include "utils/formatting.h"
-#include "ltree.h"
PG_FUNCTION_INFO_V1(ltq_regex);
PG_FUNCTION_INFO_V1(ltq_rregex);
diff --git a/contrib/ltree/ltree_io.c b/contrib/ltree/ltree_io.c
index f54f037..992c22a 100644
--- a/contrib/ltree/ltree_io.c
+++ b/contrib/ltree/ltree_io.c
@@ -4,12 +4,12 @@
* contrib/ltree/ltree_io.c
*/
#include "postgres.h"
+#include "ltree.h"
#include <ctype.h>
-#include "ltree.h"
-#include "utils/memutils.h"
#include "crc32.h"
+#include "utils/memutils.h"
PG_FUNCTION_INFO_V1(ltree_in);
PG_FUNCTION_INFO_V1(ltree_out);
diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c
index df61c63..c689530 100644
--- a/contrib/ltree/ltree_op.c
+++ b/contrib/ltree/ltree_op.c
@@ -4,6 +4,7 @@
* contrib/ltree/ltree_op.c
*/
#include "postgres.h"
+#include "ltree.h"
#include <ctype.h>
@@ -12,7 +13,6 @@
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
-#include "ltree.h"
PG_MODULE_MAGIC;
diff --git a/contrib/ltree_plpython/ltree_plpython.c b/contrib/ltree_plpython/ltree_plpython.c
index b254aa5..1570e77 100644
--- a/contrib/ltree_plpython/ltree_plpython.c
+++ b/contrib/ltree_plpython/ltree_plpython.c
@@ -1,8 +1,8 @@
#include "postgres.h"
#include "fmgr.h"
-#include "plpython.h"
#include "ltree/ltree.h"
+#include "plpython.h"
PG_MODULE_MAGIC;
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index fa1e795..9a3eac2 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -10,13 +10,11 @@
#include "postgres_fe.h"
#include "catalog/pg_class_d.h"
-
#include "common/logging.h"
#include "fe_utils/connect.h"
+#include "getopt_long.h"
#include "libpq-fe.h"
#include "pg_getopt.h"
-#include "getopt_long.h"
-
/* an extensible array to keep track of elements to show */
typedef struct
diff --git a/contrib/pageinspect/brinfuncs.c b/contrib/pageinspect/brinfuncs.c
index 04140ec..47d7d22 100644
--- a/contrib/pageinspect/brinfuncs.c
+++ b/contrib/pageinspect/brinfuncs.c
@@ -8,25 +8,23 @@
* contrib/pageinspect/brinfuncs.c
*/
#include "postgres.h"
-
#include "pageinspect.h"
-#include "access/htup_details.h"
#include "access/brin.h"
#include "access/brin_internal.h"
#include "access/brin_page.h"
#include "access/brin_revmap.h"
#include "access/brin_tuple.h"
+#include "access/htup_details.h"
#include "catalog/index.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "lib/stringinfo.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
-#include "miscadmin.h"
-
PG_FUNCTION_INFO_V1(brin_page_type);
PG_FUNCTION_INFO_V1(brin_page_items);
diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
index 8d27c9b..59f590e 100644
--- a/contrib/pageinspect/btreefuncs.c
+++ b/contrib/pageinspect/btreefuncs.c
@@ -26,7 +26,6 @@
*/
#include "postgres.h"
-
#include "pageinspect.h"
#include "access/nbtree.h"
@@ -39,7 +38,6 @@
#include "utils/rel.h"
#include "utils/varlena.h"
-
PG_FUNCTION_INFO_V1(bt_metap);
PG_FUNCTION_INFO_V1(bt_page_items);
PG_FUNCTION_INFO_V1(bt_page_items_bytea);
diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c
index 4b3c596..bd15085 100644
--- a/contrib/pageinspect/fsmfuncs.c
+++ b/contrib/pageinspect/fsmfuncs.c
@@ -18,7 +18,6 @@
*/
#include "postgres.h"
-
#include "pageinspect.h"
#include "funcapi.h"
diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c
index 229f9f9..b887769 100644
--- a/contrib/pageinspect/ginfuncs.c
+++ b/contrib/pageinspect/ginfuncs.c
@@ -8,7 +8,6 @@
* contrib/pageinspect/ginfuncs.c
*/
#include "postgres.h"
-
#include "pageinspect.h"
#include "access/gin.h"
diff --git a/contrib/pageinspect/hashfuncs.c b/contrib/pageinspect/hashfuncs.c
index 9374c4a..372a3f8 100644
--- a/contrib/pageinspect/hashfuncs.c
+++ b/contrib/pageinspect/hashfuncs.c
@@ -9,13 +9,12 @@
*/
#include "postgres.h"
-
#include "pageinspect.h"
#include "access/hash.h"
#include "access/htup_details.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_am.h"
+#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
#include "utils/array.h"
diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
index 02e2ab9..e9d7e50 100644
--- a/contrib/pageinspect/heapfuncs.c
+++ b/contrib/pageinspect/heapfuncs.c
@@ -24,14 +24,13 @@
*/
#include "postgres.h"
-
#include "pageinspect.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "funcapi.h"
#include "catalog/pg_am_d.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
#include "miscadmin.h"
#include "port/pg_bitutils.h"
#include "utils/array.h"
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index f08f62f..69f655e 100644
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -14,7 +14,6 @@
*/
#include "postgres.h"
-
#include "pageinspect.h"
#include "access/htup_details.h"
diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c
index c3fb5a9..6810cab 100644
--- a/contrib/passwordcheck/passwordcheck.c
+++ b/contrib/passwordcheck/passwordcheck.c
@@ -21,8 +21,8 @@
#endif
#include "commands/user.h"
-#include "libpq/crypt.h"
#include "fmgr.h"
+#include "libpq/crypt.h"
PG_MODULE_MAGIC;
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index 9fae146..c6beea7 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -30,9 +30,8 @@
#include <signal.h>
#include <sys/time.h>
-#include "pg_getopt.h"
-
#include "access/xlog_internal.h"
+#include "pg_getopt.h"
const char *progname;
diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c
index 1b9809b..33d1476 100644
--- a/contrib/pg_trgm/trgm_gin.c
+++ b/contrib/pg_trgm/trgm_gin.c
@@ -2,14 +2,12 @@
* contrib/pg_trgm/trgm_gin.c
*/
#include "postgres.h"
-
#include "trgm.h"
#include "access/gin.h"
#include "access/stratnum.h"
#include "fmgr.h"
-
PG_FUNCTION_INFO_V1(gin_extract_trgm);
PG_FUNCTION_INFO_V1(gin_extract_value_trgm);
PG_FUNCTION_INFO_V1(gin_extract_query_trgm);
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
index e79db8a..e43ba04 100644
--- a/contrib/pg_trgm/trgm_gist.c
+++ b/contrib/pg_trgm/trgm_gist.c
@@ -2,14 +2,12 @@
* contrib/pg_trgm/trgm_gist.c
*/
#include "postgres.h"
-
#include "trgm.h"
#include "access/stratnum.h"
#include "fmgr.h"
#include "port/pg_bitutils.h"
-
typedef struct
{
/* most recent inputs to gtrgm_consistent */
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
index 0d4614e..3118e98 100644
--- a/contrib/pg_trgm/trgm_op.c
+++ b/contrib/pg_trgm/trgm_op.c
@@ -2,11 +2,10 @@
* contrib/pg_trgm/trgm_op.c
*/
#include "postgres.h"
+#include "trgm.h"
#include <ctype.h>
-#include "trgm.h"
-
#include "catalog/pg_type.h"
#include "tsearch/ts_locale.h"
#include "utils/lsyscache.h"
diff --git a/contrib/pg_trgm/trgm_regexp.c b/contrib/pg_trgm/trgm_regexp.c
index 3ad5731..ffec469 100644
--- a/contrib/pg_trgm/trgm_regexp.c
+++ b/contrib/pg_trgm/trgm_regexp.c
@@ -190,7 +190,6 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-
#include "trgm.h"
#include "regex/regexport.h"
@@ -198,7 +197,6 @@
#include "utils/hsearch.h"
#include "utils/memutils.h"
-
/*
* Uncomment (or use -DTRGM_REGEXP_DEBUG) to print debug info,
* for exploring and debugging the algorithm implementation.
diff --git a/contrib/pgcrypto/crypt-md5.c b/contrib/pgcrypto/crypt-md5.c
index 6a09d76..b6466d3 100644
--- a/contrib/pgcrypto/crypt-md5.c
+++ b/contrib/pgcrypto/crypt-md5.c
@@ -8,8 +8,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
+#include "px.h"
#define MD5_SIZE 16
diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
index db58408..a12d7b4 100644
--- a/contrib/pgcrypto/internal.c
+++ b/contrib/pgcrypto/internal.c
@@ -33,11 +33,11 @@
#include <time.h>
-#include "px.h"
-#include "md5.h"
-#include "sha1.h"
#include "blf.h"
+#include "md5.h"
+#include "px.h"
#include "rijndael.h"
+#include "sha1.h"
#ifndef MD5_DIGEST_LENGTH
#define MD5_DIGEST_LENGTH 16
diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c
index 73dbfbd..0467212 100644
--- a/contrib/pgcrypto/mbuf.c
+++ b/contrib/pgcrypto/mbuf.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
+#include "px.h"
#define STEP (16*1024)
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
index 7d686f3..3057afb 100644
--- a/contrib/pgcrypto/openssl.c
+++ b/contrib/pgcrypto/openssl.c
@@ -31,12 +31,11 @@
#include "postgres.h"
-#include "px.h"
-
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/rand.h>
+#include "px.h"
#include "utils/memutils.h"
#include "utils/resowner.h"
diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index f69ae10..2d7285f 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -30,17 +30,16 @@
*/
#include "postgres.h"
+#include "pgcrypto.h"
#include <ctype.h>
#include "parser/scansup.h"
+#include "px-crypt.h"
+#include "px.h"
#include "utils/builtins.h"
#include "utils/uuid.h"
-#include "px.h"
-#include "px-crypt.h"
-#include "pgcrypto.h"
-
PG_MODULE_MAGIC;
/* private stuff */
diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c
index aa5b563..679779a 100644
--- a/contrib/pgcrypto/pgp-armor.c
+++ b/contrib/pgcrypto/pgp-armor.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* BASE64 - duplicated :(
diff --git a/contrib/pgcrypto/pgp-cfb.c b/contrib/pgcrypto/pgp-cfb.c
index 1d99915..8ae7c86 100644
--- a/contrib/pgcrypto/pgp-cfb.c
+++ b/contrib/pgcrypto/pgp-cfb.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
typedef int (*mix_data_t) (PGP_CFB *ctx, const uint8 *data, int len, uint8 *dst);
diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c
index 2adaf2c..0505bde 100644
--- a/contrib/pgcrypto/pgp-compress.c
+++ b/contrib/pgcrypto/pgp-compress.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
/*
* Compressed pkt writer
diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c
index 4c43eb7..3ecbf9c 100644
--- a/contrib/pgcrypto/pgp-decrypt.c
+++ b/contrib/pgcrypto/pgp-decrypt.c
@@ -31,9 +31,9 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
#define NO_CTX_SIZE 0
#define ALLOW_CTX_SIZE 1
diff --git a/contrib/pgcrypto/pgp-encrypt.c b/contrib/pgcrypto/pgp-encrypt.c
index 2938b4b..4651894 100644
--- a/contrib/pgcrypto/pgp-encrypt.c
+++ b/contrib/pgcrypto/pgp-encrypt.c
@@ -34,9 +34,8 @@
#include <time.h>
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
#define MDC_DIGEST_LEN 20
#define STREAM_ID 0xE0
diff --git a/contrib/pgcrypto/pgp-info.c b/contrib/pgcrypto/pgp-info.c
index 9bfbbe6..b2300ea 100644
--- a/contrib/pgcrypto/pgp-info.c
+++ b/contrib/pgcrypto/pgp-info.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
static int
read_pubkey_keyid(PullFilter *pkt, uint8 *keyid_buf)
diff --git a/contrib/pgcrypto/pgp-mpi-internal.c b/contrib/pgcrypto/pgp-mpi-internal.c
index c73f086..2353a48 100644
--- a/contrib/pgcrypto/pgp-mpi-internal.c
+++ b/contrib/pgcrypto/pgp-mpi-internal.c
@@ -31,9 +31,8 @@
#include "postgres.h"
#include "imath.h"
-
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static mpz_t *
mp_new()
diff --git a/contrib/pgcrypto/pgp-mpi-openssl.c b/contrib/pgcrypto/pgp-mpi-openssl.c
index afece26..75e4c8b 100644
--- a/contrib/pgcrypto/pgp-mpi-openssl.c
+++ b/contrib/pgcrypto/pgp-mpi-openssl.c
@@ -32,8 +32,8 @@
#include <openssl/bn.h>
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static BIGNUM *
mpi_to_bn(PGP_MPI *n)
diff --git a/contrib/pgcrypto/pgp-mpi.c b/contrib/pgcrypto/pgp-mpi.c
index 1da52ac..36a6d36 100644
--- a/contrib/pgcrypto/pgp-mpi.c
+++ b/contrib/pgcrypto/pgp-mpi.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
int
pgp_mpi_alloc(int bits, PGP_MPI **mpi)
diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c
index 3feadf7..8be895d 100644
--- a/contrib/pgcrypto/pgp-pgsql.c
+++ b/contrib/pgcrypto/pgp-pgsql.c
@@ -31,16 +31,15 @@
#include "postgres.h"
-#include "lib/stringinfo.h"
#include "catalog/pg_type.h"
-#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
-#include "utils/array.h"
#include "funcapi.h"
-
+#include "lib/stringinfo.h"
+#include "mb/pg_wchar.h"
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
/*
* public functions
diff --git a/contrib/pgcrypto/pgp-pubdec.c b/contrib/pgcrypto/pgp-pubdec.c
index b925ff8..a0a5738 100644
--- a/contrib/pgcrypto/pgp-pubdec.c
+++ b/contrib/pgcrypto/pgp-pubdec.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg = 02 || PS || 00 || M
diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c
index 08599f0..9fdcf7c 100644
--- a/contrib/pgcrypto/pgp-pubenc.c
+++ b/contrib/pgcrypto/pgp-pubenc.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg: 02 || non-zero pad bytes || 00 || msg
diff --git a/contrib/pgcrypto/pgp-pubkey.c b/contrib/pgcrypto/pgp-pubkey.c
index f898d72..d447e5f 100644
--- a/contrib/pgcrypto/pgp-pubkey.c
+++ b/contrib/pgcrypto/pgp-pubkey.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
int
pgp_key_alloc(PGP_PubKey **pk_p)
diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c
index 3f2f442..81ca1f0 100644
--- a/contrib/pgcrypto/pgp-s2k.c
+++ b/contrib/pgcrypto/pgp-s2k.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
static int
calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key,
diff --git a/contrib/pgcrypto/pgp.c b/contrib/pgcrypto/pgp.c
index dd8dae1..9b245fe 100644
--- a/contrib/pgcrypto/pgp.c
+++ b/contrib/pgcrypto/pgp.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* Defaults.
diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c
index 51be0b7..0913ff2 100644
--- a/contrib/pgcrypto/px-crypt.c
+++ b/contrib/pgcrypto/px-crypt.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
-
+#include "px.h"
static char *
run_crypt_des(const char *psw, const char *salt,
diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c
index 636c8d4..c17f244 100644
--- a/contrib/pgstattuple/pgstatapprox.c
+++ b/contrib/pgstattuple/pgstatapprox.c
@@ -13,12 +13,12 @@
#include "postgres.h"
#include "access/heapam.h"
+#include "access/htup_details.h"
+#include "access/multixact.h"
#include "access/relation.h"
#include "access/transam.h"
#include "access/visibilitymap.h"
#include "access/xact.h"
-#include "access/multixact.h"
-#include "access/htup_details.h"
#include "catalog/namespace.h"
#include "catalog/pg_am_d.h"
#include "commands/vacuum.h"
@@ -26,8 +26,8 @@
#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "storage/freespace.h"
-#include "storage/procarray.h"
#include "storage/lmgr.h"
+#include "storage/procarray.h"
#include "utils/builtins.h"
PG_FUNCTION_INFO_V1(pgstattuple_approx);
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index 57ed5f4..d1940be 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -11,7 +11,6 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-
#include "postgres_fdw.h"
#include "access/htup_details.h"
@@ -26,7 +25,6 @@
#include "utils/memutils.h"
#include "utils/syscache.h"
-
/*
* Connection cache hash table entry
*
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c
index 431c34a..ffed292 100644
--- a/contrib/postgres_fdw/deparse.c
+++ b/contrib/postgres_fdw/deparse.c
@@ -32,7 +32,6 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-
#include "postgres_fdw.h"
#include "access/htup_details.h"
@@ -58,7 +57,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"
-
/*
* Global context for foreign_expr_walker's search of an expression tree.
*/
diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
index 7ea68c3..948da8e 100644
--- a/contrib/postgres_fdw/option.c
+++ b/contrib/postgres_fdw/option.c
@@ -11,7 +11,6 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-
#include "postgres_fdw.h"
#include "access/reloptions.h"
@@ -23,7 +22,6 @@
#include "utils/builtins.h"
#include "utils/varlena.h"
-
/*
* Describes the valid options for objects that this wrapper uses.
*/
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 82d8140..d7ff503 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -11,7 +11,6 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-
#include "postgres_fdw.h"
#include "access/htup_details.h"
diff --git a/contrib/postgres_fdw/shippable.c b/contrib/postgres_fdw/shippable.c
index 2b55a40..8474326 100644
--- a/contrib/postgres_fdw/shippable.c
+++ b/contrib/postgres_fdw/shippable.c
@@ -22,7 +22,6 @@
*/
#include "postgres.h"
-
#include "postgres_fdw.h"
#include "access/transam.h"
@@ -31,7 +30,6 @@
#include "utils/inval.h"
#include "utils/syscache.h"
-
/* Hash table for caching the results of shippability lookups */
static HTAB *ShippableCacheHash = NULL;
diff --git a/contrib/sepgsql/database.c b/contrib/sepgsql/database.c
index 8edd3df..af7edf5 100644
--- a/contrib/sepgsql/database.c
+++ b/contrib/sepgsql/database.c
@@ -9,20 +9,20 @@
* -------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "sepgsql.h"
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/dependency.h"
-#include "catalog/pg_database.h"
#include "catalog/indexing.h"
+#include "catalog/pg_database.h"
#include "commands/dbcommands.h"
#include "commands/seclabel.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/snapmgr.h"
-#include "sepgsql.h"
/*
* sepgsql_database_post_create
diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c
index 2892346..a40e0df 100644
--- a/contrib/sepgsql/dml.c
+++ b/contrib/sepgsql/dml.c
@@ -9,13 +9,14 @@
* -------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "sepgsql.h"
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/tupdesc.h"
#include "catalog/catalog.h"
-#include "catalog/heap.h"
#include "catalog/dependency.h"
+#include "catalog/heap.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_class.h"
#include "catalog/pg_inherits.h"
@@ -26,8 +27,6 @@
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
/*
* fixup_whole_row_references
*
diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c
index ebfa441..7f4dded 100644
--- a/contrib/sepgsql/hooks.c
+++ b/contrib/sepgsql/hooks.c
@@ -9,6 +9,7 @@
* -------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "sepgsql.h"
#include "catalog/dependency.h"
#include "catalog/objectaccess.h"
@@ -24,8 +25,6 @@
#include "utils/guc.h"
#include "utils/queryenvironment.h"
-#include "sepgsql.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c
index 63a2dd5..94f2c32 100644
--- a/contrib/sepgsql/label.c
+++ b/contrib/sepgsql/label.c
@@ -9,11 +9,12 @@
* -------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "sepgsql.h"
#include <selinux/label.h>
-#include "access/htup_details.h"
#include "access/genam.h"
+#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
#include "catalog/catalog.h"
@@ -36,8 +37,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "sepgsql.h"
-
/*
* Saved hook entries (if stacked)
*/
diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c
index aa12dbe..ded8fc3 100644
--- a/contrib/sepgsql/proc.c
+++ b/contrib/sepgsql/proc.c
@@ -9,6 +9,7 @@
* -------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "sepgsql.h"
#include "access/genam.h"
#include "access/htup_details.h"
@@ -27,8 +28,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
/*
* sepgsql_proc_post_create
*
diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c
index 0615275..3a1dcae 100644
--- a/contrib/sepgsql/relation.c
+++ b/contrib/sepgsql/relation.c
@@ -9,28 +9,27 @@
* -------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "sepgsql.h"
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
-#include "catalog/indexing.h"
#include "catalog/dependency.h"
+#include "catalog/indexing.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_class.h"
#include "catalog/pg_namespace.h"
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
#include "utils/builtins.h"
-#include "utils/fmgroids.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
static void sepgsql_index_modify(Oid indexOid);
/*
diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c
index 4c4a90f..1ba7881 100644
--- a/contrib/sepgsql/schema.c
+++ b/contrib/sepgsql/schema.c
@@ -9,6 +9,7 @@
* -------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "sepgsql.h"
#include "access/genam.h"
#include "access/htup_details.h"
@@ -26,8 +27,6 @@
#include "utils/lsyscache.h"
#include "utils/snapmgr.h"
-#include "sepgsql.h"
-
/*
* sepgsql_schema_post_create
*
diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c
index 60fcf99..ba75c31 100644
--- a/contrib/sepgsql/uavc.c
+++ b/contrib/sepgsql/uavc.c
@@ -11,6 +11,7 @@
* -------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "sepgsql.h"
#include "catalog/pg_proc.h"
#include "commands/seclabel.h"
@@ -19,8 +20,6 @@
#include "utils/hashutils.h"
#include "utils/memutils.h"
-#include "sepgsql.h"
-
/*
* avc_cache
*
diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c
index 70476f7..3eb7004 100644
--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@@ -17,8 +17,8 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com>
#include "access/htup_details.h"
#include "catalog/pg_type.h"
-#include "executor/spi.h"
#include "commands/trigger.h"
+#include "executor/spi.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index e31be80..035d16f 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -31,6 +31,7 @@
*
*/
#include "postgres.h"
+#include "tablefunc.h"
#include <math.h>
@@ -42,8 +43,6 @@
#include "miscadmin.h"
#include "utils/builtins.h"
-#include "tablefunc.h"
-
PG_MODULE_MAGIC;
static HTAB *load_categories_hash(char *cats_sql, MemoryContext per_query_ctx);
diff --git a/contrib/tcn/tcn.c b/contrib/tcn/tcn.c
index 5355a64..4568768 100644
--- a/contrib/tcn/tcn.c
+++ b/contrib/tcn/tcn.c
@@ -16,9 +16,9 @@
#include "postgres.h"
#include "access/htup_details.h"
-#include "executor/spi.h"
#include "commands/async.h"
#include "commands/trigger.h"
+#include "executor/spi.h"
#include "lib/stringinfo.h"
#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index 533e2ce..55b42e3 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -22,12 +22,11 @@
#endif
#include "catalog/pg_class_d.h"
-
#include "common/logging.h"
#include "fe_utils/connect.h"
+#include "getopt_long.h"
#include "libpq-fe.h"
#include "pg_getopt.h"
-#include "getopt_long.h"
#define BUFSIZE 1024
--
1.8.3.1
0003-Ordering-of-header-files-remaining-dir.patchapplication/octet-stream; name=0003-Ordering-of-header-files-remaining-dir.patchDownload
From b79b48a261d82c425d734b97ec035e74f308f07f Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Sun, 20 Oct 2019 18:06:10 +0530
Subject: [PATCH 3/3] Ordering of header files.
Ordering of header files that is included in source code.
---
src/bin/pg_archivecleanup/pg_archivecleanup.c | 6 ++----
src/bin/pg_basebackup/pg_basebackup.c | 2 +-
src/bin/pg_basebackup/pg_receivewal.c | 6 ++----
src/bin/pg_basebackup/pg_recvlogical.c | 8 +++-----
src/bin/pg_basebackup/receivelog.c | 10 ++++------
src/bin/pg_basebackup/streamutil.c | 7 +++----
src/bin/pg_basebackup/walmethods.c | 3 +--
src/bin/pg_config/pg_config.c | 2 +-
src/bin/pg_controldata/pg_controldata.c | 3 +--
src/bin/pg_dump/common.c | 8 +++-----
src/bin/pg_dump/parallel.c | 3 +--
src/bin/pg_dump/pg_backup_archiver.c | 7 +++----
src/bin/pg_dump/pg_backup_custom.c | 3 +--
src/bin/pg_dump/pg_backup_db.c | 16 +++++++---------
src/bin/pg_dump/pg_backup_directory.c | 8 ++++----
src/bin/pg_dump/pg_backup_null.c | 5 ++---
src/bin/pg_dump/pg_backup_tar.c | 14 +++++++-------
src/bin/pg_dump/pg_dump.c | 13 +++++--------
src/bin/pg_dump/pg_dump_sort.c | 3 +--
src/bin/pg_dump/pg_dumpall.c | 7 +++----
src/bin/pg_dump/pg_restore.c | 4 +---
src/bin/pg_resetwal/pg_resetwal.c | 7 +++----
src/bin/pg_rewind/copy_fetch.c | 2 +-
src/bin/pg_rewind/datapagemap.c | 3 +--
src/bin/pg_rewind/fetch.c | 2 +-
src/bin/pg_rewind/file_ops.c | 2 +-
src/bin/pg_rewind/filemap.c | 7 +++----
src/bin/pg_rewind/libpq_fetch.c | 7 +++----
src/bin/pg_rewind/parsexlog.c | 6 ++----
src/bin/pg_rewind/pg_rewind.c | 9 ++++-----
src/bin/pg_rewind/timeline.c | 1 -
src/bin/pg_test_fsync/pg_test_fsync.c | 3 +--
src/bin/pg_upgrade/check.c | 3 +--
src/bin/pg_upgrade/controldata.c | 1 -
src/bin/pg_upgrade/dump.c | 2 --
src/bin/pg_upgrade/exec.c | 3 +--
src/bin/pg_upgrade/file.c | 11 +++++------
src/bin/pg_upgrade/function.c | 2 --
src/bin/pg_upgrade/info.c | 2 --
src/bin/pg_upgrade/option.c | 6 ++----
src/bin/pg_upgrade/parallel.c | 4 +---
src/bin/pg_upgrade/pg_upgrade.c | 10 +++++-----
src/bin/pg_upgrade/relfilenode.c | 5 ++---
src/bin/pg_upgrade/server.c | 3 +--
src/bin/pg_upgrade/tablespace.c | 1 -
src/bin/pg_upgrade/util.c | 3 +--
src/bin/pg_upgrade/version.c | 3 ---
src/bin/pg_waldump/compat.c | 2 +-
src/bin/pg_waldump/pg_waldump.c | 3 +--
src/bin/pgbench/pgbench.c | 15 ++++++++-------
src/bin/psql/common.c | 10 ++++------
src/bin/psql/copy.c | 8 +++-----
src/bin/psql/crosstabview.c | 3 +--
src/bin/psql/describe.c | 7 ++-----
src/bin/psql/help.c | 3 +--
src/bin/psql/input.c | 5 ++---
src/bin/psql/large_obj.c | 5 ++---
src/bin/psql/mainloop.c | 8 +++-----
src/bin/psql/prompt.c | 3 +--
src/bin/psql/startup.c | 10 +++-------
src/bin/psql/variables.c | 4 +---
src/common/f2s.c | 3 +--
src/fe_utils/print.c | 4 +---
src/fe_utils/recovery_gen.c | 3 +--
src/fe_utils/string_utils.c | 4 +---
src/interfaces/ecpg/compatlib/informix.c | 16 ++++++++--------
src/interfaces/ecpg/ecpglib/connect.c | 4 ++--
src/interfaces/ecpg/ecpglib/data.c | 10 +++++-----
src/interfaces/ecpg/ecpglib/descriptor.c | 5 ++---
src/interfaces/ecpg/ecpglib/error.c | 2 +-
src/interfaces/ecpg/ecpglib/execute.c | 17 ++++++++---------
src/interfaces/ecpg/ecpglib/memory.c | 4 ++--
src/interfaces/ecpg/ecpglib/misc.c | 10 +++++-----
src/interfaces/ecpg/ecpglib/prepare.c | 4 ++--
src/interfaces/ecpg/ecpglib/sqlda.c | 9 ++++-----
src/interfaces/ecpg/ecpglib/typename.c | 5 ++---
src/interfaces/ecpg/pgtypeslib/common.c | 2 +-
src/interfaces/ecpg/pgtypeslib/datetime.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/dt_common.c | 2 +-
src/interfaces/ecpg/pgtypeslib/interval.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/numeric.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/timestamp.c | 5 ++---
src/interfaces/ecpg/preproc/c_keywords.c | 5 ++---
src/interfaces/ecpg/preproc/ecpg_keywords.c | 5 ++---
src/interfaces/libpq/fe-auth.c | 3 +--
src/interfaces/libpq/fe-connect.c | 10 ++++------
src/interfaces/libpq/fe-exec.c | 9 ++++-----
src/interfaces/libpq/fe-misc.c | 3 +--
src/interfaces/libpq/fe-protocol2.c | 8 +++-----
src/interfaces/libpq/fe-protocol3.c | 10 ++++------
src/interfaces/libpq/fe-secure-gssapi.c | 2 +-
src/interfaces/libpq/fe-secure.c | 8 ++++----
src/pl/plpgsql/src/pl_comp.c | 4 +---
src/pl/plpgsql/src/pl_exec.c | 4 +---
src/pl/plpgsql/src/pl_funcs.c | 4 +---
src/pl/plpgsql/src/pl_handler.c | 4 +---
src/port/pg_crc32c_armv8.c | 4 ++--
src/port/pg_crc32c_sse42.c | 4 ++--
src/port/tar.c | 4 +++-
src/test/isolation/isolationtester.c | 5 ++---
.../modules/test_ginpostinglist/test_ginpostinglist.c | 2 +-
src/test/modules/test_integerset/test_integerset.c | 6 +++---
src/test/modules/test_rls_hooks/test_rls_hooks.c | 7 ++-----
src/test/modules/test_shm_mq/setup.c | 3 +--
src/test/modules/worker_spi/worker_spi.c | 16 +++++++---------
src/test/regress/pg_regress.c | 3 +--
src/test/regress/regress.c | 3 +--
107 files changed, 238 insertions(+), 351 deletions(-)
diff --git a/src/bin/pg_archivecleanup/pg_archivecleanup.c b/src/bin/pg_archivecleanup/pg_archivecleanup.c
index bb4257f..2917d7f 100644
--- a/src/bin/pg_archivecleanup/pg_archivecleanup.c
+++ b/src/bin/pg_archivecleanup/pg_archivecleanup.c
@@ -15,11 +15,9 @@
#include <signal.h>
#include <sys/time.h>
-#include "pg_getopt.h"
-
-#include "common/logging.h"
-
#include "access/xlog_internal.h"
+#include "common/logging.h"
+#include "pg_getopt.h"
const char *progname;
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 55ef139..a9d162a 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -35,9 +35,9 @@
#include "fe_utils/string_utils.h"
#include "getopt_long.h"
#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "pgtar.h"
#include "pgtime.h"
+#include "pqexpbuffer.h"
#include "receivelog.h"
#include "replication/basebackup.h"
#include "streamutil.h"
diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
index f39c133..c0c8747 100644
--- a/src/bin/pg_basebackup/pg_receivewal.c
+++ b/src/bin/pg_basebackup/pg_receivewal.c
@@ -19,16 +19,14 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/xlog_internal.h"
#include "common/file_perm.h"
#include "common/logging.h"
-#include "libpq-fe.h"
-#include "access/xlog_internal.h"
#include "getopt_long.h"
-
+#include "libpq-fe.h"
#include "receivelog.h"
#include "streamutil.h"
-
/* Time to sleep between reconnection attempts */
#define RECONNECT_SLEEP_TIME 5
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index af29dd7..fb5d875 100644
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -11,6 +11,8 @@
*/
#include "postgres_fe.h"
+/* local includes */
+#include "streamutil.h"
#include <dirent.h>
#include <sys/stat.h>
@@ -19,19 +21,15 @@
#include <sys/select.h>
#endif
-/* local includes */
-#include "streamutil.h"
-
#include "access/xlog_internal.h"
-#include "common/file_perm.h"
#include "common/fe_memutils.h"
+#include "common/file_perm.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "libpq/pqsignal.h"
#include "pqexpbuffer.h"
-
/* Time to sleep between reconnection attempts */
#define RECONNECT_SLEEP_TIME 5
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
index d73f614..69088d8 100644
--- a/src/bin/pg_basebackup/receivelog.c
+++ b/src/bin/pg_basebackup/receivelog.c
@@ -13,6 +13,9 @@
*/
#include "postgres_fe.h"
+/* local includes */
+#include "receivelog.h"
+#include "streamutil.h"
#include <sys/stat.h>
#include <unistd.h>
@@ -20,15 +23,10 @@
#include <sys/select.h>
#endif
-/* local includes */
-#include "receivelog.h"
-#include "streamutil.h"
-
-#include "libpq-fe.h"
#include "access/xlog_internal.h"
#include "common/file_utils.h"
#include "common/logging.h"
-
+#include "libpq-fe.h"
/* fd and filename for currently open WAL file */
static Walfile *walfile = NULL;
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
index 8d8ac11..f937a77 100644
--- a/src/bin/pg_basebackup/streamutil.c
+++ b/src/bin/pg_basebackup/streamutil.c
@@ -13,14 +13,13 @@
*/
#include "postgres_fe.h"
-
-#include <sys/time.h>
-#include <unistd.h>
-
/* local includes */
#include "receivelog.h"
#include "streamutil.h"
+#include <sys/time.h>
+#include <unistd.h>
+
#include "access/xlog_internal.h"
#include "common/fe_memutils.h"
#include "common/file_perm.h"
diff --git a/src/bin/pg_basebackup/walmethods.c b/src/bin/pg_basebackup/walmethods.c
index 8ec12e6..d4d15b3 100644
--- a/src/bin/pg_basebackup/walmethods.c
+++ b/src/bin/pg_basebackup/walmethods.c
@@ -21,10 +21,9 @@
#include <zlib.h>
#endif
-#include "pgtar.h"
#include "common/file_perm.h"
#include "common/file_utils.h"
-
+#include "pgtar.h"
#include "receivelog.h"
#include "streamutil.h"
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 5279e7f..a1da918 100644
--- a/src/bin/pg_config/pg_config.c
+++ b/src/bin/pg_config/pg_config.c
@@ -24,8 +24,8 @@
#include "postgres_fe.h"
-#include "port.h"
#include "common/config_info.h"
+#include "port.h"
static const char *progname;
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index ff17804..b14767f 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -26,9 +26,8 @@
#include "catalog/pg_control.h"
#include "common/controldata_utils.h"
#include "common/logging.h"
-#include "pg_getopt.h"
#include "getopt_long.h"
-
+#include "pg_getopt.h"
static void
usage(const char *progname)
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 3549f7b..37432a6 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -15,15 +15,13 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_utils.h"
-#include "pg_dump.h"
-
#include <ctype.h>
#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"
-
+#include "pg_backup_archiver.h"
+#include "pg_backup_utils.h"
+#include "pg_dump.h"
/*
* Variables for mapping DumpId to DumpableObject
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index 03479f1..24239fa 100644
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -61,10 +61,9 @@
#include <sys/select.h>
#endif
+#include "fe_utils/string_utils.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-
-#include "fe_utils/string_utils.h"
#include "port/pg_bswap.h"
/* Mnemonic macros for indexing the fd array returned by pipe(2) */
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 6c739ce..d051f26 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -30,14 +30,13 @@
#include <io.h>
#endif
+#include "dumputils.h"
+#include "fe_utils/string_utils.h"
+#include "libpq/libpq-fs.h"
#include "parallel.h"
#include "pg_backup_archiver.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
-#include "dumputils.h"
-#include "fe_utils/string_utils.h"
-
-#include "libpq/libpq-fs.h"
#define TEXT_DUMP_HEADER "--\n-- PostgreSQL database dump\n--\n\n"
#define TEXT_DUMPALL_HEADER "--\n-- PostgreSQL database cluster dump\n--\n\n"
diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index 497b81b..fc742f5 100644
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -25,11 +25,10 @@
*/
#include "postgres_fe.h"
+#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-#include "common/file_utils.h"
-
/*--------
* Routines in the format interface
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index ee822c5..6dba7e1 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -11,21 +11,19 @@
*/
#include "postgres_fe.h"
-#include "fe_utils/connect.h"
-#include "fe_utils/string_utils.h"
-
-#include "dumputils.h"
-#include "parallel.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_db.h"
-#include "pg_backup_utils.h"
-
#include <unistd.h>
#include <ctype.h>
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
+#include "dumputils.h"
+#include "fe_utils/connect.h"
+#include "fe_utils/string_utils.h"
+#include "parallel.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_db.h"
+#include "pg_backup_utils.h"
static void _check_database_version(ArchiveHandle *AH);
static PGconn *_connectDB(ArchiveHandle *AH, const char *newdbname, const char *newUser);
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index e1afecf..aa00bca 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -34,13 +34,13 @@
*/
#include "postgres_fe.h"
+#include <dirent.h>
+#include <sys/stat.h>
+
+#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-#include "common/file_utils.h"
-
-#include <dirent.h>
-#include <sys/stat.h>
typedef struct
{
diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c
index 32c911a..c62f943 100644
--- a/src/bin/pg_dump/pg_backup_null.c
+++ b/src/bin/pg_dump/pg_backup_null.c
@@ -23,11 +23,10 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_utils.h"
#include "fe_utils/string_utils.h"
-
#include "libpq/libpq-fs.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_utils.h"
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
static void _WriteBlobData(ArchiveHandle *AH, const void *data, size_t dLen);
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index dead8fc..fd74835 100644
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -29,18 +29,18 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_tar.h"
-#include "pg_backup_utils.h"
-#include "pgtar.h"
-#include "common/file_utils.h"
-#include "fe_utils/string_utils.h"
-
#include <sys/stat.h>
#include <ctype.h>
#include <limits.h>
#include <unistd.h>
+#include "common/file_utils.h"
+#include "fe_utils/string_utils.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_tar.h"
+#include "pg_backup_utils.h"
+#include "pgtar.h"
+
static void _ArchiveEntry(ArchiveHandle *AH, TocEntry *te);
static void _StartData(ArchiveHandle *AH, TocEntry *te);
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 2a087d7..bf69adc 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -38,8 +38,6 @@
#include <termios.h>
#endif
-#include "getopt_long.h"
-
#include "access/attnum.h"
#include "access/sysattr.h"
#include "access/transam.h"
@@ -54,17 +52,16 @@
#include "catalog/pg_proc_d.h"
#include "catalog/pg_trigger_d.h"
#include "catalog/pg_type_d.h"
-#include "libpq/libpq-fs.h"
-#include "storage/block.h"
-
#include "dumputils.h"
+#include "fe_utils/connect.h"
+#include "fe_utils/string_utils.h"
+#include "getopt_long.h"
+#include "libpq/libpq-fs.h"
#include "parallel.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"
-#include "fe_utils/connect.h"
-#include "fe_utils/string_utils.h"
-
+#include "storage/block.h"
typedef struct
{
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 31fc06a..ad01316 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -15,12 +15,11 @@
*/
#include "postgres_fe.h"
+#include "catalog/pg_class_d.h"
#include "pg_backup_archiver.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"
-#include "catalog/pg_class_d.h"
-
/*
* Sort priority for database object types.
* Objects are sorted by type, and within a type by name.
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 0981efc..1442ea9 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -18,14 +18,13 @@
#include <time.h>
#include <unistd.h>
-#include "getopt_long.h"
-
-#include "dumputils.h"
-#include "pg_backup.h"
#include "common/file_utils.h"
#include "common/logging.h"
+#include "dumputils.h"
#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"
+#include "getopt_long.h"
+#include "pg_backup.h"
/* version string we expect back from pg_dump */
#define PGDUMP_VERSIONSTR "pg_dump (PostgreSQL) " PG_VERSION "\n"
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 40a6b37..d1a36b1 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -45,13 +45,11 @@
#include <termios.h>
#endif
-#include "getopt_long.h"
-
#include "dumputils.h"
+#include "getopt_long.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-
static void usage(const char *progname);
int
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index f85ea2d..c83f865 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -44,9 +44,9 @@
#include <time.h>
#include <unistd.h>
-#include "access/transam.h"
#include "access/heaptoast.h"
#include "access/multixact.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlog_internal.h"
#include "common/controldata_utils.h"
@@ -55,10 +55,9 @@
#include "common/logging.h"
#include "common/restricted_token.h"
#include "common/string.h"
-#include "storage/large_object.h"
-#include "pg_getopt.h"
#include "getopt_long.h"
-
+#include "pg_getopt.h"
+#include "storage/large_object.h"
static ControlFileData ControlFile; /* pg_control values */
static XLogSegNo newXlogSegNo; /* new XLOG segment # */
diff --git a/src/bin/pg_rewind/copy_fetch.c b/src/bin/pg_rewind/copy_fetch.c
index d74001e..2222a4e 100644
--- a/src/bin/pg_rewind/copy_fetch.c
+++ b/src/bin/pg_rewind/copy_fetch.c
@@ -8,6 +8,7 @@
*-------------------------------------------------------------------------
*/
#include "postgres_fe.h"
+#include "pg_rewind.h"
#include <sys/stat.h>
#include <dirent.h>
@@ -18,7 +19,6 @@
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
-#include "pg_rewind.h"
static void recurse_dir(const char *datadir, const char *path,
process_file_callback_t callback);
diff --git a/src/bin/pg_rewind/datapagemap.c b/src/bin/pg_rewind/datapagemap.c
index 93165f6..c903dbb 100644
--- a/src/bin/pg_rewind/datapagemap.c
+++ b/src/bin/pg_rewind/datapagemap.c
@@ -12,9 +12,8 @@
#include "postgres_fe.h"
-#include "datapagemap.h"
-
#include "common/logging.h"
+#include "datapagemap.h"
struct datapagemap_iterator
{
diff --git a/src/bin/pg_rewind/fetch.c b/src/bin/pg_rewind/fetch.c
index 03a5fd6..775d162 100644
--- a/src/bin/pg_rewind/fetch.c
+++ b/src/bin/pg_rewind/fetch.c
@@ -15,11 +15,11 @@
*-------------------------------------------------------------------------
*/
#include "postgres_fe.h"
+#include "pg_rewind.h"
#include <sys/stat.h>
#include <unistd.h>
-#include "pg_rewind.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
diff --git a/src/bin/pg_rewind/file_ops.c b/src/bin/pg_rewind/file_ops.c
index f9e41b1..661e0a2 100644
--- a/src/bin/pg_rewind/file_ops.c
+++ b/src/bin/pg_rewind/file_ops.c
@@ -13,6 +13,7 @@
*-------------------------------------------------------------------------
*/
#include "postgres_fe.h"
+#include "pg_rewind.h"
#include <sys/stat.h>
#include <fcntl.h>
@@ -21,7 +22,6 @@
#include "common/file_perm.h"
#include "file_ops.h"
#include "filemap.h"
-#include "pg_rewind.h"
/*
* Currently open target file.
diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c
index 601f7e9..a20eebf 100644
--- a/src/bin/pg_rewind/filemap.c
+++ b/src/bin/pg_rewind/filemap.c
@@ -9,16 +9,15 @@
*/
#include "postgres_fe.h"
+#include "pg_rewind.h"
#include <sys/stat.h>
#include <unistd.h>
+#include "catalog/pg_tablespace_d.h"
+#include "common/string.h"
#include "datapagemap.h"
#include "filemap.h"
-#include "pg_rewind.h"
-
-#include "common/string.h"
-#include "catalog/pg_tablespace_d.h"
#include "storage/fd.h"
filemap_t *filemap = NULL;
diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c
index f4ebf7d..1482b07 100644
--- a/src/bin/pg_rewind/libpq_fetch.c
+++ b/src/bin/pg_rewind/libpq_fetch.c
@@ -8,20 +8,19 @@
*-------------------------------------------------------------------------
*/
#include "postgres_fe.h"
+#include "pg_rewind.h"
#include <sys/stat.h>
#include <dirent.h>
#include <fcntl.h>
#include <unistd.h>
-#include "pg_rewind.h"
+#include "catalog/pg_type_d.h"
#include "datapagemap.h"
+#include "fe_utils/connect.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
-
-#include "catalog/pg_type_d.h"
-#include "fe_utils/connect.h"
#include "port/pg_bswap.h"
PGconn *conn = NULL;
diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c
index 264a8f4..c5f85e3 100644
--- a/src/bin/pg_rewind/parsexlog.c
+++ b/src/bin/pg_rewind/parsexlog.c
@@ -10,19 +10,17 @@
*/
#include "postgres_fe.h"
+#include "pg_rewind.h"
#include <unistd.h>
-#include "pg_rewind.h"
-#include "filemap.h"
-
#include "access/rmgr.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "catalog/pg_control.h"
#include "catalog/storage_xlog.h"
#include "commands/dbcommands_xlog.h"
-
+#include "filemap.h"
/*
* RmgrNames is an array of resource manager names, to make error messages
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 875a43b..9dd0ae6 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -8,17 +8,13 @@
*-------------------------------------------------------------------------
*/
#include "postgres_fe.h"
+#include "pg_rewind.h"
#include <sys/stat.h>
#include <fcntl.h>
#include <time.h>
#include <unistd.h>
-#include "pg_rewind.h"
-#include "fetch.h"
-#include "file_ops.h"
-#include "filemap.h"
-
#include "access/timeline.h"
#include "access/xlog_internal.h"
#include "catalog/catversion.h"
@@ -28,6 +24,9 @@
#include "common/file_utils.h"
#include "common/restricted_token.h"
#include "fe_utils/recovery_gen.h"
+#include "fetch.h"
+#include "file_ops.h"
+#include "filemap.h"
#include "getopt_long.h"
#include "storage/bufpage.h"
diff --git a/src/bin/pg_rewind/timeline.c b/src/bin/pg_rewind/timeline.c
index 987452c..3736523 100644
--- a/src/bin/pg_rewind/timeline.c
+++ b/src/bin/pg_rewind/timeline.c
@@ -8,7 +8,6 @@
*-------------------------------------------------------------------------
*/
#include "postgres_fe.h"
-
#include "pg_rewind.h"
#include "access/timeline.h"
diff --git a/src/bin/pg_test_fsync/pg_test_fsync.c b/src/bin/pg_test_fsync/pg_test_fsync.c
index 225557e..2ca1608 100644
--- a/src/bin/pg_test_fsync/pg_test_fsync.c
+++ b/src/bin/pg_test_fsync/pg_test_fsync.c
@@ -12,10 +12,9 @@
#include <unistd.h>
#include <signal.h>
-#include "getopt_long.h"
#include "access/xlogdefs.h"
#include "common/logging.h"
-
+#include "getopt_long.h"
/*
* put the temp files in the local directory
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 87b9d32..6d227f0 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -8,12 +8,11 @@
*/
#include "postgres_fe.h"
+#include "pg_upgrade.h"
#include "catalog/pg_authid_d.h"
#include "fe_utils/string_utils.h"
#include "mb/pg_wchar.h"
-#include "pg_upgrade.h"
-
static void check_new_cluster_is_empty(void);
static void check_databases_are_compatible(void);
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 3823641..6bae08a 100644
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -8,7 +8,6 @@
*/
#include "postgres_fe.h"
-
#include "pg_upgrade.h"
#include <ctype.h>
diff --git a/src/bin/pg_upgrade/dump.c b/src/bin/pg_upgrade/dump.c
index c1429fe..6b642a6 100644
--- a/src/bin/pg_upgrade/dump.c
+++ b/src/bin/pg_upgrade/dump.c
@@ -8,12 +8,10 @@
*/
#include "postgres_fe.h"
-
#include "pg_upgrade.h"
#include "fe_utils/string_utils.h"
-
void
generate_old_dump(void)
{
diff --git a/src/bin/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c
index dba02c4..14c8dc2 100644
--- a/src/bin/pg_upgrade/exec.c
+++ b/src/bin/pg_upgrade/exec.c
@@ -8,11 +8,10 @@
*/
#include "postgres_fe.h"
+#include "pg_upgrade.h"
#include <fcntl.h>
-#include "pg_upgrade.h"
-
static void check_data_dir(ClusterInfo *cluster);
static void check_bin_dir(ClusterInfo *cluster);
static void get_bin_version(ClusterInfo *cluster);
diff --git a/src/bin/pg_upgrade/file.c b/src/bin/pg_upgrade/file.c
index c7fed24..3172d25 100644
--- a/src/bin/pg_upgrade/file.c
+++ b/src/bin/pg_upgrade/file.c
@@ -8,13 +8,7 @@
*/
#include "postgres_fe.h"
-
-#include "access/visibilitymap.h"
-#include "common/file_perm.h"
#include "pg_upgrade.h"
-#include "storage/bufpage.h"
-#include "storage/checksum.h"
-#include "storage/checksum_impl.h"
#include <sys/stat.h>
#include <fcntl.h>
@@ -26,6 +20,11 @@
#include <linux/fs.h>
#endif
+#include "access/visibilitymap.h"
+#include "common/file_perm.h"
+#include "storage/bufpage.h"
+#include "storage/checksum.h"
+#include "storage/checksum_impl.h"
#ifdef WIN32
static int win32_pghardlink(const char *src, const char *dst);
diff --git a/src/bin/pg_upgrade/function.c b/src/bin/pg_upgrade/function.c
index 3cbaab6..3138bfe 100644
--- a/src/bin/pg_upgrade/function.c
+++ b/src/bin/pg_upgrade/function.c
@@ -8,13 +8,11 @@
*/
#include "postgres_fe.h"
-
#include "pg_upgrade.h"
#include "access/transam.h"
#include "catalog/pg_language_d.h"
-
/*
* qsort comparator for pointers to library names
*
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 5c7b433..9224a11 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -8,13 +8,11 @@
*/
#include "postgres_fe.h"
-
#include "pg_upgrade.h"
#include "access/transam.h"
#include "catalog/pg_class_d.h"
-
static void create_rel_filename_map(const char *old_data, const char *new_data,
const DbInfo *old_db, const DbInfo *new_db,
const RelInfo *old_rel, const RelInfo *new_rel,
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index da9e1da..f34290f 100644
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -8,19 +8,17 @@
*/
#include "postgres_fe.h"
+#include "pg_upgrade.h"
#include <time.h>
#ifdef WIN32
#include <io.h>
#endif
-#include "getopt_long.h"
#include "common/string.h"
+#include "getopt_long.h"
#include "utils/pidfile.h"
-#include "pg_upgrade.h"
-
-
static void usage(void);
static void check_required_directory(char **dirpath,
const char *envVarName, bool useCwd,
diff --git a/src/bin/pg_upgrade/parallel.c b/src/bin/pg_upgrade/parallel.c
index 80ab1b8..682a9bb 100644
--- a/src/bin/pg_upgrade/parallel.c
+++ b/src/bin/pg_upgrade/parallel.c
@@ -8,15 +8,13 @@
*/
#include "postgres_fe.h"
+#include "pg_upgrade.h"
#include <sys/wait.h>
#ifdef WIN32
#include <io.h>
#endif
-#include "pg_upgrade.h"
-
-
static int parallel_jobs;
#ifdef WIN32
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index 5b82e0c..5516e9e 100644
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -36,18 +36,18 @@
#include "postgres_fe.h"
-
#include "pg_upgrade.h"
+
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
#include "catalog/pg_class_d.h"
#include "common/file_perm.h"
#include "common/logging.h"
#include "common/restricted_token.h"
#include "fe_utils/string_utils.h"
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-
static void prepare_new_cluster(void);
static void prepare_new_globals(void);
static void create_new_objects(void);
diff --git a/src/bin/pg_upgrade/relfilenode.c b/src/bin/pg_upgrade/relfilenode.c
index 0c78073..713149c 100644
--- a/src/bin/pg_upgrade/relfilenode.c
+++ b/src/bin/pg_upgrade/relfilenode.c
@@ -8,13 +8,12 @@
*/
#include "postgres_fe.h"
-
#include "pg_upgrade.h"
#include <sys/stat.h>
-#include "catalog/pg_class_d.h"
-#include "access/transam.h"
+#include "access/transam.h"
+#include "catalog/pg_class_d.h"
static void transfer_single_new_db(FileNameMap *maps, int size, char *old_tablespace);
static void transfer_relfile(FileNameMap *map, const char *suffix, bool vm_must_add_frozenbit);
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index 6ad4b14..8975e05 100644
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -8,11 +8,10 @@
*/
#include "postgres_fe.h"
+#include "pg_upgrade.h"
#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"
-#include "pg_upgrade.h"
-
static PGconn *get_db_conn(ClusterInfo *cluster, const char *db_name);
diff --git a/src/bin/pg_upgrade/tablespace.c b/src/bin/pg_upgrade/tablespace.c
index dfe5bfd..c28807a 100644
--- a/src/bin/pg_upgrade/tablespace.c
+++ b/src/bin/pg_upgrade/tablespace.c
@@ -8,7 +8,6 @@
*/
#include "postgres_fe.h"
-
#include "pg_upgrade.h"
static void get_tablespace_paths(void);
diff --git a/src/bin/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c
index d867995..40ca286 100644
--- a/src/bin/pg_upgrade/util.c
+++ b/src/bin/pg_upgrade/util.c
@@ -8,12 +8,11 @@
*/
#include "postgres_fe.h"
-
-#include "common/username.h"
#include "pg_upgrade.h"
#include <signal.h>
+#include "common/username.h"
LogOpts log_opts;
diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index b64171d..67930f1 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -8,14 +8,11 @@
*/
#include "postgres_fe.h"
-
#include "pg_upgrade.h"
#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"
-
-
/*
* new_9_0_populate_pg_largeobject_metadata()
* new >= 9.0, old <= 8.4
diff --git a/src/bin/pg_waldump/compat.c b/src/bin/pg_waldump/compat.c
index 0e0dca7..7b389a2 100644
--- a/src/bin/pg_waldump/compat.c
+++ b/src/bin/pg_waldump/compat.c
@@ -20,8 +20,8 @@
#include <time.h>
-#include "utils/datetime.h"
#include "lib/stringinfo.h"
+#include "utils/datetime.h"
/* copied from timestamp.c */
pg_time_t
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index b79208c..8e54d7f 100644
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -16,16 +16,15 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-#include "access/xlog_internal.h"
#include "access/transam.h"
#include "common/fe_memutils.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "rmgrdesc.h"
-
static const char *progname;
static int WalSegSz;
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index e72ad00..3d5df09 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -32,12 +32,7 @@
#endif
#include "postgres_fe.h"
-#include "common/int.h"
-#include "common/logging.h"
-#include "fe_utils/conditional.h"
-#include "getopt_long.h"
-#include "libpq-fe.h"
-#include "portability/instr_time.h"
+#include "pgbench.h"
#include <ctype.h>
#include <float.h>
@@ -63,11 +58,17 @@
#endif
#endif
+#include "common/int.h"
+#include "common/logging.h"
+#include "fe_utils/conditional.h"
+#include "getopt_long.h"
+#include "libpq-fe.h"
+#include "portability/instr_time.h"
+
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
-#include "pgbench.h"
#define ERRCODE_UNDEFINED_TABLE "42P01"
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 4b26793..90f6380 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -18,18 +18,16 @@
#include <win32.h>
#endif
-#include "common/logging.h"
-#include "fe_utils/mbprint.h"
-#include "fe_utils/string_utils.h"
-#include "portability/instr_time.h"
-
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "copy.h"
#include "crosstabview.h"
+#include "fe_utils/mbprint.h"
+#include "fe_utils/string_utils.h"
+#include "portability/instr_time.h"
#include "settings.h"
-
static bool DescribeQuery(const char *query, double *elapsed_msec);
static bool ExecQueryUsingCursor(const char *query, double *elapsed_msec);
static bool command_no_begin(const char *query);
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index f9e53d6..239f00a 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -16,16 +16,14 @@
#include <io.h> /* I think */
#endif
+#include "common.h"
+#include "common/logging.h"
#include "libpq-fe.h"
#include "pqexpbuffer.h"
-
-#include "settings.h"
-#include "common.h"
#include "prompt.h"
+#include "settings.h"
#include "stringutils.h"
-#include "common/logging.h"
-
/*
* parse_slash_copy
* -- parses \copy command line
diff --git a/src/bin/psql/crosstabview.c b/src/bin/psql/crosstabview.c
index 83789cb..701ef34 100644
--- a/src/bin/psql/crosstabview.c
+++ b/src/bin/psql/crosstabview.c
@@ -8,13 +8,12 @@
#include "postgres_fe.h"
#include "common.h"
+#include "common/logging.h"
#include "crosstabview.h"
#include "pqexpbuffer.h"
#include "psqlscanslash.h"
#include "settings.h"
-#include "common/logging.h"
-
/*
* Value/position from the resultset that goes into the horizontal or vertical
* crosstabview header.
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index d7c0fc0..b3b9313 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -18,18 +18,15 @@
#include "catalog/pg_cast_d.h"
#include "catalog/pg_class_d.h"
#include "catalog/pg_default_acl_d.h"
-
+#include "common.h"
#include "common/logging.h"
+#include "describe.h"
#include "fe_utils/mbprint.h"
#include "fe_utils/print.h"
#include "fe_utils/string_utils.h"
-
-#include "common.h"
-#include "describe.h"
#include "settings.h"
#include "variables.h"
-
static bool describeOneTableDetails(const char *schemaname,
const char *relationname,
const char *oid,
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 59ea8cc..0f58eeb 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -21,10 +21,9 @@
#include <termios.h>
#endif
+#include "common.h"
#include "common/logging.h"
#include "common/username.h"
-
-#include "common.h"
#include "help.h"
#include "input.h"
#include "settings.h"
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 5a18ac9..5798e6e 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -13,12 +13,11 @@
#include <fcntl.h>
#include <limits.h>
+#include "common.h"
+#include "common/logging.h"
#include "input.h"
#include "settings.h"
#include "tab-complete.h"
-#include "common.h"
-
-#include "common/logging.h"
#ifndef WIN32
#define PSQLHISTORY ".psql_history"
diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c
index 2713f15..042403e 100644
--- a/src/bin/psql/large_obj.c
+++ b/src/bin/psql/large_obj.c
@@ -6,12 +6,11 @@
* src/bin/psql/large_obj.c
*/
#include "postgres_fe.h"
-#include "large_obj.h"
-#include "settings.h"
#include "common.h"
-
#include "common/logging.h"
+#include "large_obj.h"
+#include "settings.h"
static void print_lo_result(const char *fmt,...) pg_attribute_printf(1, 2);
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index e386d98..b3a8407 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -6,18 +6,16 @@
* src/bin/psql/mainloop.c
*/
#include "postgres_fe.h"
-#include "mainloop.h"
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "input.h"
+#include "mainloop.h"
+#include "mb/pg_wchar.h"
#include "prompt.h"
#include "settings.h"
-#include "common/logging.h"
-#include "mb/pg_wchar.h"
-
-
/* callback functions for our flex lexer */
const PsqlScanCallbacks psqlscan_callbacks = {
psql_get_variable,
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index 0fcb8c7..195192a 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -18,12 +18,11 @@
#endif
#include "common.h"
+#include "common/string.h"
#include "input.h"
#include "prompt.h"
#include "settings.h"
-#include "common/string.h"
-
/*--------------------------
* get_prompt
*
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index e4c0a7e..0d941ef 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -14,21 +14,17 @@
#include <win32.h>
#endif /* WIN32 */
-#include "getopt_long.h"
-
-#include "common/logging.h"
-#include "fe_utils/print.h"
-
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "describe.h"
+#include "fe_utils/print.h"
+#include "getopt_long.h"
#include "help.h"
#include "input.h"
#include "mainloop.h"
#include "settings.h"
-
-
/*
* Global psql options
*/
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index 1d2a31c..3f7b641 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -8,10 +8,8 @@
#include "postgres_fe.h"
#include "common.h"
-#include "variables.h"
-
#include "common/logging.h"
-
+#include "variables.h"
/*
* Check whether a variable's name is allowed.
diff --git a/src/common/f2s.c b/src/common/f2s.c
index e332557..ea5ca8d 100644
--- a/src/common/f2s.c
+++ b/src/common/f2s.c
@@ -39,9 +39,8 @@
#endif
#include "common/shortest_dec.h"
-
-#include "ryu_common.h"
#include "digit_table.h"
+#include "ryu_common.h"
#define FLOAT_MANTISSA_BITS 23
#define FLOAT_EXPONENT_BITS 8
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index e41f42e..1f8bde8 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -30,11 +30,9 @@
#include <termios.h>
#endif
-#include "fe_utils/print.h"
-
#include "catalog/pg_type_d.h"
#include "fe_utils/mbprint.h"
-
+#include "fe_utils/print.h"
/*
* If the calling program doesn't have any mechanism for setting
diff --git a/src/fe_utils/recovery_gen.c b/src/fe_utils/recovery_gen.c
index 6641f95..aec01c0 100644
--- a/src/fe_utils/recovery_gen.c
+++ b/src/fe_utils/recovery_gen.c
@@ -10,9 +10,8 @@
#include "postgres_fe.h"
#include "common/logging.h"
-#include "fe_utils/string_utils.h"
#include "fe_utils/recovery_gen.h"
-
+#include "fe_utils/string_utils.h"
static char *escape_quotes(const char *src);
diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c
index 8c3a603..b07f142 100644
--- a/src/fe_utils/string_utils.c
+++ b/src/fe_utils/string_utils.c
@@ -17,10 +17,8 @@
#include <ctype.h>
-#include "fe_utils/string_utils.h"
-
#include "common/keywords.h"
-
+#include "fe_utils/string_utils.h"
static PQExpBuffer defaultGetLocalPQExpBuffer(void);
diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
index 6ef1fad..bbaf450 100644
--- a/src/interfaces/ecpg/compatlib/informix.c
+++ b/src/interfaces/ecpg/compatlib/informix.c
@@ -7,14 +7,14 @@
#include <ctype.h>
#include <limits.h>
-#include <ecpgtype.h>
-#include <ecpg_informix.h>
-#include <pgtypes_error.h>
-#include <pgtypes_date.h>
-#include <pgtypes_numeric.h>
-#include <sqltypes.h>
-#include <sqlca.h>
-#include <ecpgerrno.h>
+#include "ecpg_informix.h"
+#include "ecpgerrno.h"
+#include "ecpgtype.h"
+#include "pgtypes_date.h"
+#include "pgtypes_error.h"
+#include "pgtypes_numeric.h"
+#include "sqlca.h"
+#include "sqltypes.h"
/* this is also defined in ecpglib/misc.c, by defining it twice we don't have to export the symbol */
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
index b4f6089..1cb5211 100644
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -4,10 +4,10 @@
#include "postgres_fe.h"
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#ifdef ENABLE_THREAD_SAFETY
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 81f94cc..7d2a78a 100644
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -5,15 +5,15 @@
#include <math.h>
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
+#include "sqlca.h"
/* returns true if character c is a delimiter for the given array type */
static bool
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index ef500a9..ead8778 100644
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -7,12 +7,11 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#include "sqlda.h"
#include "sql3types.h"
diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c
index 9c56991..a4e3c0d 100644
--- a/src/interfaces/ecpg/ecpglib/error.c
+++ b/src/interfaces/ecpg/ecpglib/error.c
@@ -4,9 +4,9 @@
#include "postgres_fe.h"
#include "ecpgerrno.h"
-#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
void
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 7c9cb76..23cc869 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -19,19 +19,18 @@
#include <math.h>
#include "catalog/pg_type_d.h"
-
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "sqlda-native.h"
-#include "sqlda-compat.h"
-#include "sql3types.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
+#include "sql3types.h"
+#include "sqlca.h"
+#include "sqlda-compat.h"
+#include "sqlda-native.h"
/*
* This function returns a newly malloced string that has ' and \
diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c
index 52ca1c5..bd81251 100644
--- a/src/interfaces/ecpg/ecpglib/memory.c
+++ b/src/interfaces/ecpg/ecpglib/memory.c
@@ -4,10 +4,10 @@
#include "postgres_fe.h"
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
void
ecpg_free(void *ptr)
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index 2eec54a..4fbb896 100644
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -6,16 +6,16 @@
#include <limits.h>
#include <unistd.h>
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
#include "pg_config_paths.h"
+#include "sqlca.h"
#ifdef HAVE_LONG_LONG_INT
#ifndef LONG_LONG_MIN
diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c
index 6e7adb9..b9653c0 100644
--- a/src/interfaces/ecpg/ecpglib/prepare.c
+++ b/src/interfaces/ecpg/ecpglib/prepare.c
@@ -5,10 +5,10 @@
#include <ctype.h>
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#define STMTID_SIZE 32
diff --git a/src/interfaces/ecpg/ecpglib/sqlda.c b/src/interfaces/ecpg/ecpglib/sqlda.c
index 3fb0d82..081e326 100644
--- a/src/interfaces/ecpg/ecpglib/sqlda.c
+++ b/src/interfaces/ecpg/ecpglib/sqlda.c
@@ -10,16 +10,15 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
-#include "ecpg-pthread-win32.h"
#include "decimal.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
+#include "ecpg-pthread-win32.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
-#include "sqlda-native.h"
#include "sqlda-compat.h"
+#include "sqlda-native.h"
/*
* Compute the next variable's offset with
diff --git a/src/interfaces/ecpg/ecpglib/typename.c b/src/interfaces/ecpg/ecpglib/typename.c
index 9251450..1d482c4 100644
--- a/src/interfaces/ecpg/ecpglib/typename.c
+++ b/src/interfaces/ecpg/ecpglib/typename.c
@@ -4,12 +4,11 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
-#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqltypes.h"
+#include "ecpgtype.h"
#include "sql3types.h"
+#include "sqltypes.h"
/*
* This function is used to generate the correct type names.
diff --git a/src/interfaces/ecpg/pgtypeslib/common.c b/src/interfaces/ecpg/pgtypeslib/common.c
index abcf7f5..8972229 100644
--- a/src/interfaces/ecpg/pgtypeslib/common.c
+++ b/src/interfaces/ecpg/pgtypeslib/common.c
@@ -2,8 +2,8 @@
#include "postgres_fe.h"
-#include "pgtypeslib_extern.h"
#include "pgtypes.h"
+#include "pgtypeslib_extern.h"
/* Return value is zero-filled. */
char *
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index 9ee460b..71dc1a5 100644
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -6,10 +6,10 @@
#include <ctype.h>
#include <limits.h>
-#include "pgtypeslib_extern.h"
#include "dt.h"
-#include "pgtypes_error.h"
#include "pgtypes_date.h"
+#include "pgtypes_error.h"
+#include "pgtypeslib_extern.h"
date *
PGTYPESdate_new(void)
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index 29c1117..c22f657 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -7,9 +7,9 @@
#include <math.h>
#include "common/string.h"
-#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_timestamp.h"
+#include "pgtypeslib_extern.h"
const int day_tab[2][13] = {
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0},
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index 3ff8a10..5b3c9a7 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -1,6 +1,7 @@
/* src/interfaces/ecpg/pgtypeslib/interval.c */
#include "postgres_fe.h"
+
#include <time.h>
#include <math.h>
#include <limits.h>
@@ -10,11 +11,10 @@
#endif
#include "common/string.h"
-
-#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_error.h"
#include "pgtypes_interval.h"
+#include "pgtypeslib_extern.h"
/* copy&pasted from .../src/backend/utils/adt/datetime.c
* and changesd struct pg_tm to struct tm
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index 22088ba..9d3da4c 100644
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -5,8 +5,9 @@
#include <float.h>
#include <limits.h>
-#include "pgtypeslib_extern.h"
#include "pgtypes_error.h"
+#include "pgtypes_numeric.h"
+#include "pgtypeslib_extern.h"
#define Max(x, y) ((x) > (y) ? (x) : (y))
#define Min(x, y) ((x) < (y) ? (x) : (y))
@@ -20,7 +21,6 @@
free(buf); \
} while (0)
-#include "pgtypes_numeric.h"
#if 0
/* ----------
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 2be151f..7816e6f 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -11,11 +11,10 @@
#error -ffast-math is known to break this code
#endif
-#include "pgtypeslib_extern.h"
#include "dt.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_date.h"
-
+#include "pgtypes_timestamp.h"
+#include "pgtypeslib_extern.h"
static int64
time2t(const int hour, const int min, const int sec, const fsec_t fsec)
diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c
index 80aa7d5..e51c036 100644
--- a/src/interfaces/ecpg/preproc/c_keywords.c
+++ b/src/interfaces/ecpg/preproc/c_keywords.c
@@ -9,11 +9,10 @@
*/
#include "postgres_fe.h"
-#include "preproc_extern.h"
-#include "preproc.h"
-
/* ScanKeywordList lookup data for C keywords */
#include "c_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"
/* Token codes for C keywords */
#define PG_KEYWORD(kwname, value) value,
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index 4839c37..a2db06f 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -13,11 +13,10 @@
#include <ctype.h>
-#include "preproc_extern.h"
-#include "preproc.h"
-
/* ScanKeywordList lookup data for ECPG keywords */
#include "ecpg_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"
/* Token codes for ECPG keywords */
#define PG_KEYWORD(kwname, value) value,
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index a690f3b..2364dda 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -40,9 +40,8 @@
#include "common/md5.h"
#include "common/scram-common.h"
-#include "libpq-fe.h"
#include "fe-auth.h"
-
+#include "libpq-fe.h"
#ifdef ENABLE_GSS
/*
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index f91f0f2..959082b 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -21,11 +21,6 @@
#include <time.h>
#include <unistd.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-#include "fe-auth.h"
-#include "pg_config_paths.h"
-
#ifdef WIN32
#include "win32.h"
#ifdef _WIN32_IE
@@ -74,10 +69,13 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
#include "common/link-canary.h"
#include "common/scram-common.h"
#include "common/string.h"
+#include "fe-auth.h"
+#include "libpq-fe.h"
+#include "libpq-int.h"
#include "mb/pg_wchar.h"
+#include "pg_config_paths.h"
#include "port/pg_bswap.h"
-
#ifndef WIN32
#define PGPASSFILE ".pgpass"
#else
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index b3c59a0..051f548 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -18,17 +18,16 @@
#include <fcntl.h>
#include <limits.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-
-#include "mb/pg_wchar.h"
-
#ifdef WIN32
#include "win32.h"
#else
#include <unistd.h>
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "mb/pg_wchar.h"
+
/* keep this in same order as ExecStatusType in libpq-fe.h */
char *const pgresStatus[] = {
"PGRES_EMPTY_QUERY",
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 18fec4a..a7c08c5 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -50,9 +50,8 @@
#include "libpq-fe.h"
#include "libpq-int.h"
#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
#include "pg_config_paths.h"
-
+#include "port/pg_bswap.h"
static int pqPutMsgBytes(const void *buf, size_t len, PGconn *conn);
static int pqSendSome(PGconn *conn, int len);
diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c
index 0e36974..e71e25a 100644
--- a/src/interfaces/libpq/fe-protocol2.c
+++ b/src/interfaces/libpq/fe-protocol2.c
@@ -17,11 +17,6 @@
#include <ctype.h>
#include <fcntl.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-#include "port/pg_bswap.h"
-
-
#ifdef WIN32
#include "win32.h"
#else
@@ -31,6 +26,9 @@
#endif
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "port/pg_bswap.h"
static int getRowDescriptions(PGconn *conn);
static int getAnotherTuple(PGconn *conn, bool binary);
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
index b04f7ec..c97841e 100644
--- a/src/interfaces/libpq/fe-protocol3.c
+++ b/src/interfaces/libpq/fe-protocol3.c
@@ -17,12 +17,6 @@
#include <ctype.h>
#include <fcntl.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-
-#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
-
#ifdef WIN32
#include "win32.h"
#else
@@ -32,6 +26,10 @@
#endif
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "mb/pg_wchar.h"
+#include "port/pg_bswap.h"
/*
* This macro lists the backend message types that could be "long" (more
diff --git a/src/interfaces/libpq/fe-secure-gssapi.c b/src/interfaces/libpq/fe-secure-gssapi.c
index 095750d..a1c1d12 100644
--- a/src/interfaces/libpq/fe-secure-gssapi.c
+++ b/src/interfaces/libpq/fe-secure-gssapi.c
@@ -13,9 +13,9 @@
#include "postgres_fe.h"
+#include "fe-gssapi-common.h"
#include "libpq-fe.h"
#include "libpq-int.h"
-#include "fe-gssapi-common.h"
#include "port/pg_bswap.h"
/*
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index b8191b4..e55b375 100644
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -28,10 +28,6 @@
#include <fcntl.h>
#include <ctype.h>
-#include "libpq-fe.h"
-#include "fe-auth.h"
-#include "libpq-int.h"
-
#ifdef WIN32
#include "win32.h"
#else
@@ -55,6 +51,10 @@
#endif
#endif
+#include "fe-auth.h"
+#include "libpq-fe.h"
+#include "libpq-int.h"
+
/*
* Macros to handle disabling and then restoring the state of SIGPIPE handling.
* On Windows, these are all no-ops since there's no SIGPIPEs.
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 0c24ba6..3fb8fc7 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -24,6 +24,7 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "parser/parse_type.h"
+#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
@@ -33,9 +34,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "plpgsql.h"
-
-
/* ----------
* Our own local and global variables
* ----------
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 345065e..fd799b7 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -34,6 +34,7 @@
#include "parser/parse_coerce.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
+#include "plpgsql.h"
#include "storage/proc.h"
#include "tcop/tcopprot.h"
#include "tcop/utility.h"
@@ -48,9 +49,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "plpgsql.h"
-
-
typedef struct
{
int nargs; /* number of arguments */
diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
index 053f83d..2d4616c 100644
--- a/src/pl/plpgsql/src/pl_funcs.c
+++ b/src/pl/plpgsql/src/pl_funcs.c
@@ -15,10 +15,8 @@
#include "postgres.h"
-#include "utils/memutils.h"
-
#include "plpgsql.h"
-
+#include "utils/memutils.h"
/* ----------
* Local variables for namespace handling
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index ce03f1e..e92deb3 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -20,15 +20,13 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/varlena.h"
-#include "plpgsql.h"
-
-
static bool plpgsql_extra_checks_check_hook(char **newvalue, void **extra, GucSource source);
static void plpgsql_extra_warnings_assign_hook(const char *newvalue, void *extra);
static void plpgsql_extra_errors_assign_hook(const char *newvalue, void *extra);
diff --git a/src/port/pg_crc32c_armv8.c b/src/port/pg_crc32c_armv8.c
index ebe449e..de725d3 100644
--- a/src/port/pg_crc32c_armv8.c
+++ b/src/port/pg_crc32c_armv8.c
@@ -14,10 +14,10 @@
*/
#include "c.h"
-#include "port/pg_crc32c.h"
-
#include <arm_acle.h>
+#include "port/pg_crc32c.h"
+
pg_crc32c
pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t len)
{
diff --git a/src/port/pg_crc32c_sse42.c b/src/port/pg_crc32c_sse42.c
index ef56cff..a81718b 100644
--- a/src/port/pg_crc32c_sse42.c
+++ b/src/port/pg_crc32c_sse42.c
@@ -14,10 +14,10 @@
*/
#include "c.h"
-#include "port/pg_crc32c.h"
-
#include <nmmintrin.h>
+#include "port/pg_crc32c.h"
+
pg_crc32c
pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len)
{
diff --git a/src/port/tar.c b/src/port/tar.c
index f1da959..4afe9f2 100644
--- a/src/port/tar.c
+++ b/src/port/tar.c
@@ -1,7 +1,9 @@
#include "c.h"
-#include "pgtar.h"
+
#include <sys/stat.h>
+#include "pgtar.h"
+
/*
* Print a numeric field in a tar header. The field starts at *s and is of
* length len; val is the value to be written.
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
index 556b46d..b50c189 100644
--- a/src/test/isolation/isolationtester.c
+++ b/src/test/isolation/isolationtester.c
@@ -13,11 +13,10 @@
#endif
#include "datatype/timestamp.h"
+#include "isolationtester.h"
#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "pg_getopt.h"
-
-#include "isolationtester.h"
+#include "pqexpbuffer.h"
#define PREP_WAITING "isolationtester_waiting"
diff --git a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
index bab073b..7e9d7de 100644
--- a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
+++ b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
@@ -12,10 +12,10 @@
*/
#include "postgres.h"
-#include "fmgr.h"
#include "access/ginblock.h"
#include "access/gin_private.h"
#include "access/htup_details.h"
+#include "fmgr.h"
PG_MODULE_MAGIC;
diff --git a/src/test/modules/test_integerset/test_integerset.c b/src/test/modules/test_integerset/test_integerset.c
index e3925a1..82d8563 100644
--- a/src/test/modules/test_integerset/test_integerset.c
+++ b/src/test/modules/test_integerset/test_integerset.c
@@ -14,12 +14,12 @@
#include "fmgr.h"
#include "lib/integerset.h"
+#include "miscadmin.h"
#include "nodes/bitmapset.h"
-#include "utils/memutils.h"
-#include "utils/timestamp.h"
#include "storage/block.h"
#include "storage/itemptr.h"
-#include "miscadmin.h"
+#include "utils/memutils.h"
+#include "utils/timestamp.h"
/*
* If you enable this, the "pattern" tests will print information about
diff --git a/src/test/modules/test_rls_hooks/test_rls_hooks.c b/src/test/modules/test_rls_hooks/test_rls_hooks.c
index 10379bc..f576ecb 100644
--- a/src/test/modules/test_rls_hooks/test_rls_hooks.c
+++ b/src/test/modules/test_rls_hooks/test_rls_hooks.c
@@ -13,19 +13,16 @@
#include "postgres.h"
+#include "catalog/pg_type.h"
#include "fmgr.h"
#include "miscadmin.h"
-
-#include "test_rls_hooks.h"
-
-#include "catalog/pg_type.h"
-#include "nodes/makefuncs.h"
#include "nodes/makefuncs.h"
#include "parser/parse_clause.h"
#include "parser/parse_collate.h"
#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "rewrite/rowsecurity.h"
+#include "test_rls_hooks.h"
#include "utils/acl.h"
#include "utils/rel.h"
#include "utils/relcache.h"
diff --git a/src/test/modules/test_shm_mq/setup.c b/src/test/modules/test_shm_mq/setup.c
index a318168..c1a0fa4 100644
--- a/src/test/modules/test_shm_mq/setup.c
+++ b/src/test/modules/test_shm_mq/setup.c
@@ -20,9 +20,8 @@
#include "postmaster/bgworker.h"
#include "storage/procsignal.h"
#include "storage/shm_toc.h"
-#include "utils/memutils.h"
-
#include "test_shm_mq.h"
+#include "utils/memutils.h"
typedef struct
{
diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c
index bc9ef64..70ae3cb 100644
--- a/src/test/modules/worker_spi/worker_spi.c
+++ b/src/test/modules/worker_spi/worker_spi.c
@@ -22,24 +22,22 @@
*/
#include "postgres.h"
-/* These are always necessary for a bgworker */
+/* these headers are used by this particular worker's code */
+#include "access/xact.h"
+#include "executor/spi.h"
+#include "fmgr.h"
+#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "pgstat.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 "access/xact.h"
-#include "executor/spi.h"
-#include "fmgr.h"
-#include "lib/stringinfo.h"
-#include "pgstat.h"
+#include "tcop/utility.h"
#include "utils/builtins.h"
#include "utils/snapmgr.h"
-#include "tcop/utility.h"
PG_MODULE_MAGIC;
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 3a39472..6554ce2 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -29,14 +29,13 @@
#include <sys/resource.h>
#endif
-#include "pg_regress.h"
-
#include "common/logging.h"
#include "common/restricted_token.h"
#include "common/username.h"
#include "getopt_long.h"
#include "libpq/pqcomm.h" /* needed for UNIXSOCK_PATH() */
#include "pg_config_paths.h"
+#include "pg_regress.h"
#include "portability/instr_time.h"
/* for resultmap we need a list of pairs of strings */
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index cb8ef53..2f66d76 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -36,10 +36,9 @@
#include "port/atomics.h"
#include "utils/builtins.h"
#include "utils/geo_decls.h"
+#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/typcache.h"
-#include "utils/memutils.h"
-
#define EXPECT_TRUE(expr) \
do { \
--
1.8.3.1
0002-Ordering-of-header-files-in-backend-dir.patchapplication/octet-stream; name=0002-Ordering-of-header-files-in-backend-dir.patchDownload
From af4e632aa6bf3f7a4b11884c4954ee606d253961 Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Sun, 20 Oct 2019 16:57:41 +0530
Subject: [PATCH 2/3] Ordering of header files in backend dir.
Ordering of header files that is included in source code in backend dir.
---
src/backend/access/brin/brin_minmax.c | 5 ++--
src/backend/access/brin/brin_pageops.c | 3 +--
src/backend/access/brin/brin_tuple.c | 3 +--
src/backend/access/brin/brin_validate.c | 3 +--
src/backend/access/gin/ginbtree.c | 2 +-
src/backend/access/gin/ginfast.c | 10 ++++----
src/backend/access/gin/gininsert.c | 5 ++--
src/backend/access/gin/ginvalidate.c | 3 +--
src/backend/access/gist/gist.c | 3 +--
src/backend/access/gist/gistget.c | 4 +--
src/backend/access/gist/gistutil.c | 5 ++--
src/backend/access/hash/hash.c | 2 --
src/backend/access/hash/hash_xlog.c | 6 ++---
src/backend/access/hash/hashinsert.c | 4 +--
src/backend/access/hash/hashpage.c | 3 +--
src/backend/access/hash/hashsearch.c | 2 +-
src/backend/access/hash/hashutil.c | 2 +-
src/backend/access/heap/heapam_handler.c | 5 +---
src/backend/access/heap/pruneheap.c | 4 +--
src/backend/access/heap/rewriteheap.c | 12 ++-------
src/backend/access/nbtree/nbtxlog.c | 2 +-
src/backend/access/spgist/spgquadtreeproc.c | 3 +--
src/backend/access/transam/clog.c | 2 +-
src/backend/access/transam/parallel.c | 3 +--
src/backend/access/transam/rmgr.c | 4 +--
src/backend/access/transam/slru.c | 3 +--
src/backend/access/transam/twophase.c | 3 +--
src/backend/access/transam/xact.c | 3 +--
src/backend/access/transam/xlog.c | 6 ++---
src/backend/access/transam/xlogfuncs.c | 7 +++--
src/backend/access/transam/xloginsert.c | 2 +-
src/backend/access/transam/xlogreader.c | 3 +--
src/backend/catalog/aclchk.c | 5 ++--
src/backend/catalog/catalog.c | 3 +--
src/backend/catalog/index.c | 7 +++--
src/backend/catalog/objectaddress.c | 10 ++++----
src/backend/catalog/partition.c | 3 +--
src/backend/catalog/pg_enum.c | 3 +--
src/backend/catalog/pg_publication.c | 9 +++----
src/backend/catalog/pg_shdepend.c | 7 +++--
src/backend/catalog/pg_subscription.c | 10 ++------
src/backend/catalog/pg_type.c | 2 +-
src/backend/catalog/storage.c | 3 +--
src/backend/commands/alter.c | 5 ++--
src/backend/commands/cluster.c | 5 ++--
src/backend/commands/copy.c | 3 +--
src/backend/commands/createas.c | 3 +--
src/backend/commands/dbcommands.c | 3 +--
src/backend/commands/event_trigger.c | 6 ++---
src/backend/commands/functioncmds.c | 2 +-
src/backend/commands/lockcmds.c | 4 +--
src/backend/commands/opclasscmds.c | 3 +--
src/backend/commands/policy.c | 2 +-
src/backend/commands/publicationcmds.c | 10 +++-----
src/backend/commands/schemacmds.c | 3 +--
src/backend/commands/subscriptioncmds.c | 12 ++-------
src/backend/commands/tablecmds.c | 2 --
src/backend/commands/tablespace.c | 3 +--
src/backend/commands/variable.c | 4 +--
src/backend/commands/view.c | 3 +--
src/backend/executor/execAmi.c | 2 --
src/backend/executor/execExprInterp.c | 5 ++--
src/backend/executor/execGrouping.c | 2 +-
src/backend/executor/execParallel.c | 4 +--
src/backend/executor/execProcnode.c | 3 +--
src/backend/executor/execTuples.c | 3 +--
src/backend/executor/nodeAgg.c | 3 +--
src/backend/executor/nodeBitmapHeapscan.c | 3 +--
src/backend/executor/nodeCustom.c | 3 +--
src/backend/executor/nodeHash.c | 3 +--
src/backend/executor/nodeSubplan.c | 3 +--
src/backend/executor/nodeTableFuncscan.c | 3 +--
src/backend/executor/nodeWindowAgg.c | 2 +-
src/backend/jit/jit.c | 7 ++---
src/backend/jit/llvm/llvmjit_expr.c | 3 +--
src/backend/libpq/hba.c | 2 +-
src/backend/nodes/nodeFuncs.c | 3 +--
src/backend/optimizer/geqo/geqo_cx.c | 2 +-
src/backend/optimizer/geqo/geqo_erx.c | 2 +-
src/backend/optimizer/path/clausesel.c | 3 +--
src/backend/optimizer/plan/initsplan.c | 3 +--
src/backend/optimizer/plan/planagg.c | 3 +--
src/backend/optimizer/plan/planner.c | 7 +++--
src/backend/optimizer/prep/preptlist.c | 3 +--
src/backend/optimizer/util/pathnode.c | 3 +--
src/backend/optimizer/util/plancat.c | 7 +++--
src/backend/parser/parse_clause.c | 12 ++++-----
src/backend/parser/parse_expr.c | 3 +--
src/backend/parser/parse_node.c | 3 +--
src/backend/parser/parse_relation.c | 3 +--
src/backend/parser/parse_target.c | 3 +--
src/backend/parser/parse_type.c | 3 +--
src/backend/parser/scansup.c | 3 +--
src/backend/partitioning/partbounds.c | 2 +-
src/backend/partitioning/partdesc.c | 4 +--
src/backend/postmaster/bgworker.c | 2 +-
src/backend/postmaster/bgwriter.c | 3 +--
src/backend/postmaster/pgstat.c | 4 +--
src/backend/replication/basebackup.c | 3 +--
.../libpqwalreceiver/libpqwalreceiver.c | 4 +--
src/backend/replication/logical/decode.c | 7 ++---
src/backend/replication/logical/launcher.c | 16 +++---------
src/backend/replication/logical/logical.c | 10 +++-----
src/backend/replication/logical/logicalfuncs.c | 30 ++++++++--------------
src/backend/replication/logical/message.c | 9 ++-----
src/backend/replication/logical/origin.c | 18 +++++--------
src/backend/replication/logical/snapbuild.c | 15 ++++-------
src/backend/replication/logical/tablesync.c | 13 +++-------
src/backend/replication/pgoutput/pgoutput.c | 5 +---
src/backend/replication/slotfuncs.c | 2 +-
src/backend/rewrite/rowsecurity.c | 2 +-
src/backend/statistics/dependencies.c | 4 +--
src/backend/statistics/mvdistinct.c | 7 +++--
src/backend/storage/buffer/buf_init.c | 3 +--
src/backend/storage/buffer/buf_table.c | 3 +--
src/backend/storage/file/buffile.c | 4 +--
src/backend/storage/file/copydir.c | 4 +--
src/backend/storage/file/fd.c | 3 +--
src/backend/storage/ipc/dsm_impl.c | 6 ++---
src/backend/storage/ipc/ipci.c | 2 +-
src/backend/storage/ipc/procsignal.c | 3 +--
src/backend/storage/ipc/sinvaladt.c | 3 +--
src/backend/storage/lmgr/lwlock.c | 2 +-
src/backend/storage/lmgr/proc.c | 3 +--
src/backend/storage/lmgr/s_lock.c | 3 +--
src/backend/storage/page/checksum.c | 1 -
src/backend/storage/smgr/md.c | 8 +++---
src/backend/storage/sync/sync.c | 8 +++---
src/backend/tcop/postgres.c | 7 +++--
src/backend/tcop/utility.c | 7 +++--
src/backend/tsearch/wparser.c | 3 +--
src/backend/utils/adt/acl.c | 5 ++--
src/backend/utils/adt/datetime.c | 1 -
src/backend/utils/adt/format_type.c | 2 +-
src/backend/utils/adt/int8.c | 3 +--
src/backend/utils/adt/json.c | 4 +--
src/backend/utils/adt/jsonb.c | 4 +--
src/backend/utils/adt/jsonpath_exec.c | 5 ++--
src/backend/utils/adt/misc.c | 7 +++--
src/backend/utils/adt/oracle_compat.c | 3 +--
src/backend/utils/adt/rangetypes_gist.c | 3 +--
src/backend/utils/adt/regproc.c | 4 +--
src/backend/utils/adt/ri_triggers.c | 3 +--
src/backend/utils/adt/ruleutils.c | 3 +--
src/backend/utils/adt/tsquery.c | 2 +-
src/backend/utils/adt/tsquery_cleanup.c | 2 +-
src/backend/utils/adt/tsquery_gist.c | 2 +-
src/backend/utils/adt/tsquery_util.c | 2 +-
src/backend/utils/adt/tsrank.c | 3 +--
src/backend/utils/adt/txid.c | 3 +--
src/backend/utils/adt/varchar.c | 3 +--
src/backend/utils/cache/evtcache.c | 4 +--
src/backend/utils/cache/relcache.c | 3 +--
src/backend/utils/cache/relfilenodemap.c | 2 +-
src/backend/utils/cache/syscache.c | 3 +--
.../utf8_and_cyrillic/utf8_and_cyrillic.c | 2 +-
.../utf8_and_iso8859/utf8_and_iso8859.c | 3 ++-
src/backend/utils/misc/guc.c | 8 +++---
src/backend/utils/misc/pg_config.c | 6 ++---
src/backend/utils/misc/pg_controldata.c | 2 +-
src/backend/utils/misc/ps_status.c | 2 +-
src/backend/utils/misc/superuser.c | 3 +--
src/backend/utils/mmgr/slab.c | 3 +--
src/backend/utils/time/combocid.c | 3 +--
164 files changed, 271 insertions(+), 449 deletions(-)
diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c
index ad0d18e..655c0b5 100644
--- a/src/backend/access/brin/brin_minmax.c
+++ b/src/backend/access/brin/brin_minmax.c
@@ -10,19 +10,18 @@
*/
#include "postgres.h"
-#include "access/genam.h"
#include "access/brin_internal.h"
#include "access/brin_tuple.h"
+#include "access/genam.h"
#include "access/stratnum.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_amop.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/datum.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-
typedef struct MinmaxOpaque
{
Oid cached_subtype;
diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c
index f907b4b..c4cbe84 100644
--- a/src/backend/access/brin/brin_pageops.c
+++ b/src/backend/access/brin/brin_pageops.c
@@ -10,8 +10,8 @@
*/
#include "postgres.h"
-#include "access/brin_pageops.h"
#include "access/brin_page.h"
+#include "access/brin_pageops.h"
#include "access/brin_revmap.h"
#include "access/brin_xlog.h"
#include "access/xloginsert.h"
@@ -22,7 +22,6 @@
#include "storage/smgr.h"
#include "utils/rel.h"
-
/*
* Maximum size of an entry in a BRIN_PAGETYPE_REGULAR page. We can tolerate
* a single item per page, unlike other index AMs.
diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c
index 2b38617..6d24e53 100644
--- a/src/backend/access/brin/brin_tuple.c
+++ b/src/backend/access/brin/brin_tuple.c
@@ -31,14 +31,13 @@
*/
#include "postgres.h"
-#include "access/htup_details.h"
#include "access/brin_tuple.h"
+#include "access/htup_details.h"
#include "access/tupdesc.h"
#include "access/tupmacs.h"
#include "utils/datum.h"
#include "utils/memutils.h"
-
static inline void brin_deconstruct_tuple(BrinDesc *brdesc,
char *tp, bits8 *nullbits, bool nulls,
Datum *values, bool *allnulls, bool *hasnulls);
diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index 0129338..02337a7 100644
--- a/src/backend/access/brin/brin_validate.c
+++ b/src/backend/access/brin/brin_validate.c
@@ -22,9 +22,8 @@
#include "catalog/pg_opfamily.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
-
+#include "utils/syscache.h"
/*
* Validator for a BRIN opclass.
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 4c29261..20adfa2 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -17,8 +17,8 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
#include "access/xloginsert.h"
-#include "storage/predicate.h"
#include "miscadmin.h"
+#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index 439a91b..3d2153b 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -20,19 +20,19 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/xlog.h"
-#include "commands/vacuum.h"
+#include "access/xloginsert.h"
#include "catalog/pg_am.h"
+#include "commands/vacuum.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/acl.h"
#include "postmaster/autovacuum.h"
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
/* GUC parameter */
int gin_pending_list_limit = 0;
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index 55eab14..bdb3d5f 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -16,18 +16,17 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/tableam.h"
+#include "access/xloginsert.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/smgr.h"
#include "storage/indexfsm.h"
#include "storage/predicate.h"
+#include "storage/smgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
typedef struct
{
GinState ginstate;
diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 63bd7f2..5d96f29 100644
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -23,9 +23,8 @@
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
-
+#include "utils/syscache.h"
/*
* Validator for a GIN opclass.
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 0cc8791..8d9c8d0 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -18,15 +18,14 @@
#include "access/gistscan.h"
#include "catalog/pg_collation.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
/* non-export function prototypes */
static void gistfixsplit(GISTInsertState *state, GISTSTATE *giststate);
static bool gistinserttuple(GISTInsertState *state, GISTInsertStack *stack,
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 22d790d..98b6892 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -17,11 +17,11 @@
#include "access/genam.h"
#include "access/gist_private.h"
#include "access/relscan.h"
+#include "lib/pairingheap.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "pgstat.h"
-#include "lib/pairingheap.h"
#include "utils/float.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
index 45804d7..bf2e848 100644
--- a/src/backend/access/gist/gistutil.c
+++ b/src/backend/access/gist/gistutil.c
@@ -22,10 +22,9 @@
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "utils/float.h"
-#include "utils/syscache.h"
-#include "utils/snapmgr.h"
#include "utils/lsyscache.h"
-
+#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
* Write itup vector to page, has no control of free space.
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 5cc30da..cdb6fa9 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -31,8 +31,6 @@
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/rel.h"
-#include "miscadmin.h"
-
/* Working state for hashbuild and its callback */
typedef struct
diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c
index 86e7210..c1d248a 100644
--- a/src/backend/access/hash/hash_xlog.c
+++ b/src/backend/access/hash/hash_xlog.c
@@ -17,11 +17,11 @@
#include "access/bufmask.h"
#include "access/hash.h"
#include "access/hash_xlog.h"
-#include "access/xlogutils.h"
-#include "access/xlog.h"
#include "access/transam.h"
-#include "storage/procarray.h"
+#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* replay a hash index meta page
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 89876d2..e0ca1b0 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -18,10 +18,10 @@
#include "access/hash.h"
#include "access/hash_xlog.h"
#include "miscadmin.h"
-#include "utils/rel.h"
-#include "storage/lwlock.h"
#include "storage/buf_internals.h"
+#include "storage/lwlock.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static void _hash_vacuum_one_page(Relation rel, Relation hrel,
Buffer metabuf, Buffer buf);
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 838ee68..63697bf 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -32,9 +32,8 @@
#include "access/hash_xlog.h"
#include "miscadmin.h"
#include "storage/lmgr.h"
-#include "storage/smgr.h"
#include "storage/predicate.h"
-
+#include "storage/smgr.h"
static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock,
uint32 nblocks);
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 79ae499..725e614 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -18,8 +18,8 @@
#include "access/relscan.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "utils/rel.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static bool _hash_readpage(IndexScanDesc scan, Buffer *bufP,
ScanDirection dir);
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 3fb92ea..c5005f4 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -17,9 +17,9 @@
#include "access/hash.h"
#include "access/reloptions.h"
#include "access/relscan.h"
+#include "storage/buf_internals.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
-#include "storage/buf_internals.h"
#define CALC_NEW_BUCKET(old_bucket, lowmask) \
old_bucket | (lowmask + 1)
diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
index 2dd8821..2c70a87 100644
--- a/src/backend/access/heap/heapam_handler.c
+++ b/src/backend/access/heap/heapam_handler.c
@@ -19,8 +19,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/heaptoast.h"
@@ -35,10 +33,10 @@
#include "catalog/storage_xlog.h"
#include "commands/progress.h"
#include "executor/executor.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
#include "storage/procarray.h"
@@ -46,7 +44,6 @@
#include "utils/builtins.h"
#include "utils/rel.h"
-
static void reform_and_rewrite_tuple(HeapTuple tuple,
Relation OldHeap, Relation NewHeap,
Datum *values, bool *isnull, RewriteState rwstate);
diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
index a0d2217..6d62a96 100644
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@ -16,15 +16,15 @@
#include "access/heapam.h"
#include "access/heapam_xlog.h"
-#include "access/transam.h"
#include "access/htup_details.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
-#include "utils/snapmgr.h"
#include "utils/rel.h"
+#include "utils/snapmgr.h"
/* Working data for heap_page_prune and subroutines */
typedef struct
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
index 306e74e..c1e7d38 100644
--- a/src/backend/access/heap/rewriteheap.c
+++ b/src/backend/access/heap/rewriteheap.c
@@ -105,8 +105,6 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam.h"
#include "access/heapam_xlog.h"
#include "access/heaptoast.h"
@@ -114,25 +112,19 @@
#include "access/transam.h"
#include "access/xact.h"
#include "access/xloginsert.h"
-
#include "catalog/catalog.h"
-
#include "lib/ilist.h"
-
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "replication/logical.h"
#include "replication/slot.h"
-
#include "storage/bufmgr.h"
#include "storage/fd.h"
+#include "storage/procarray.h"
#include "storage/smgr.h"
-
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "storage/procarray.h"
-
/*
* State associated with a rewrite operation. This is opaque to the user
* of the rewrite facility.
diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index dd5315c..44f6283 100644
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -20,8 +20,8 @@
#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlogutils.h"
-#include "storage/procarray.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* _bt_restore_page -- re-enter all the index tuples on a page
diff --git a/src/backend/access/spgist/spgquadtreeproc.c b/src/backend/access/spgist/spgquadtreeproc.c
index e50108e..992c558 100644
--- a/src/backend/access/spgist/spgquadtreeproc.c
+++ b/src/backend/access/spgist/spgquadtreeproc.c
@@ -16,14 +16,13 @@
#include "postgres.h"
#include "access/spgist.h"
-#include "access/stratnum.h"
#include "access/spgist_private.h"
+#include "access/stratnum.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/float.h"
#include "utils/geo_decls.h"
-
Datum
spg_quad_config(PG_FUNCTION_ARGS)
{
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index 595c860..7f7eb21 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -39,8 +39,8 @@
#include "access/xloginsert.h"
#include "access/xlogutils.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "storage/proc.h"
/*
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
index 55d129a..d147236 100644
--- a/src/backend/access/transam/parallel.c
+++ b/src/backend/access/transam/parallel.c
@@ -19,9 +19,9 @@
#include "access/session.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_enum.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
+#include "catalog/pg_enum.h"
#include "commands/async.h"
#include "executor/execParallel.h"
#include "libpq/libpq.h"
@@ -43,7 +43,6 @@
#include "utils/snapmgr.h"
#include "utils/typcache.h"
-
/*
* We don't want to waste a lot of memory on an error queue which, most of
* the time, will process only a handful of small messages. However, it is
diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c
index 9368b56..58091f6 100644
--- a/src/backend/access/transam/rmgr.c
+++ b/src/backend/access/transam/rmgr.c
@@ -7,14 +7,14 @@
*/
#include "postgres.h"
+#include "access/brin_xlog.h"
#include "access/clog.h"
#include "access/commit_ts.h"
+#include "access/generic_xlog.h"
#include "access/ginxlog.h"
#include "access/gistxlog.h"
-#include "access/generic_xlog.h"
#include "access/hash_xlog.h"
#include "access/heapam_xlog.h"
-#include "access/brin_xlog.h"
#include "access/multixact.h"
#include "access/nbtxlog.h"
#include "access/spgxlog.h"
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index e38f919..59bad09 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -54,11 +54,10 @@
#include "access/slru.h"
#include "access/transam.h"
#include "access/xlog.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/fd.h"
#include "storage/shmem.h"
-#include "miscadmin.h"
-
#define SlruFileName(ctl, path, seg) \
snprintf(path, MAXPGPATH, "%s/%04X", (ctl)->Dir, seg)
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 546bd43..712e842 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -85,8 +85,8 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "access/xloginsert.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
+#include "access/xlogutils.h"
#include "catalog/pg_type.h"
#include "catalog/storage.h"
#include "funcapi.h"
@@ -108,7 +108,6 @@
#include "utils/memutils.h"
#include "utils/timestamp.h"
-
/*
* Directory where Two-phase commit files reside within PGDATA
*/
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index fc55fa6..c3a75a5 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -40,6 +40,7 @@
#include "libpq/be-fsstubs.h"
#include "libpq/pqsignal.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "replication/logical.h"
#include "replication/logicallauncher.h"
@@ -65,8 +66,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
-
/*
* User-tweakable parameters
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index b602e28..bfc9dce 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -42,15 +42,16 @@
#include "commands/tablespace.h"
#include "common/controldata_utils.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "port/atomics.h"
#include "postmaster/bgwriter.h"
-#include "postmaster/walwriter.h"
#include "postmaster/startup.h"
+#include "postmaster/walwriter.h"
#include "replication/basebackup.h"
#include "replication/logical.h"
-#include "replication/slot.h"
#include "replication/origin.h"
+#include "replication/slot.h"
#include "replication/snapbuild.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
@@ -74,7 +75,6 @@
#include "utils/relmapper.h"
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
extern uint32 bootstrap_data_checksum_version;
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index 8f17988..1fccf29 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -27,17 +27,16 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "replication/walreceiver.h"
+#include "storage/fd.h"
+#include "storage/ipc.h"
#include "storage/smgr.h"
#include "utils/builtins.h"
+#include "utils/guc.h"
#include "utils/memutils.h"
#include "utils/numeric.h"
-#include "utils/guc.h"
#include "utils/pg_lsn.h"
#include "utils/timestamp.h"
#include "utils/tuplestore.h"
-#include "storage/fd.h"
-#include "storage/ipc.h"
-
/*
* Store label file and tablespace map during non-exclusive backups.
diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c
index 3ec67d4..aa9dca0 100644
--- a/src/backend/access/transam/xloginsert.c
+++ b/src/backend/access/transam/xloginsert.c
@@ -26,11 +26,11 @@
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/proc.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/* Buffer size required to store a compressed version of backup block image */
#define PGLZ_MAX_BLCKSZ PGLZ_MAX_OUTPUT(BLCKSZ)
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index c8b0d23..fb25864 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -18,9 +18,9 @@
#include "postgres.h"
#include "access/transam.h"
-#include "access/xlogrecord.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
+#include "access/xlogrecord.h"
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "replication/origin.h"
@@ -30,7 +30,6 @@
#include "utils/memutils.h"
#endif
-
static void report_invalid_record(XLogReaderState *state, const char *fmt,...)
pg_attribute_printf(2, 3);
static bool allocate_recordbuf(XLogReaderState *state, uint32 reclength);
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 88ce37c..bed10f9 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -52,12 +52,12 @@
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_tablespace.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_transform.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
#include "catalog/pg_ts_template.h"
-#include "catalog/pg_transform.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
@@ -76,7 +76,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
/*
* Internal format used by ALTER DEFAULT PRIVILEGES.
*/
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 1af31c2..6b10469 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -31,9 +31,9 @@
#include "catalog/pg_auth_members.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_pltemplate.h"
-#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_replication_origin.h"
#include "catalog/pg_shdepend.h"
#include "catalog/pg_shdescription.h"
@@ -50,7 +50,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
/*
* IsSystemRelation
* True iff the relation is either a system catalog or a toast table.
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index c48ad93..3508199 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -43,11 +43,11 @@
#include "catalog/pg_am.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
-#include "catalog/pg_description.h"
#include "catalog/pg_depend.h"
+#include "catalog/pg_description.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_tablespace.h"
#include "catalog/pg_trigger.h"
#include "catalog/pg_type.h"
@@ -76,10 +76,9 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_rusage.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/snapmgr.h"
-
/* Potentially set by pg_upgrade_support functions */
Oid binary_upgrade_next_index_pg_class_oid = InvalidOid;
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index ce8a4e9..3544bd0 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -29,13 +29,13 @@
#include "catalog/pg_attrdef.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_cast.h"
-#include "catalog/pg_default_acl.h"
-#include "catalog/pg_enum.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_conversion.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_default_acl.h"
+#include "catalog/pg_enum.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_extension.h"
#include "catalog/pg_foreign_data_wrapper.h"
#include "catalog/pg_foreign_server.h"
@@ -44,10 +44,10 @@
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_opclass.h"
-#include "catalog/pg_opfamily.h"
#include "catalog/pg_operator.h"
-#include "catalog/pg_proc.h"
+#include "catalog/pg_opfamily.h"
#include "catalog/pg_policy.h"
+#include "catalog/pg_proc.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
#include "catalog/pg_rewrite.h"
diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
index 53af14e..5dfa449 100644
--- a/src/backend/catalog/partition.c
+++ b/src/backend/catalog/partition.c
@@ -16,9 +16,9 @@
#include "access/genam.h"
#include "access/htup_details.h"
+#include "access/sysattr.h"
#include "access/table.h"
#include "access/tupconvert.h"
-#include "access/sysattr.h"
#include "catalog/indexing.h"
#include "catalog/partition.h"
#include "catalog/pg_inherits.h"
@@ -32,7 +32,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static Oid get_partition_parent_worker(Relation inhRel, Oid relid);
static void get_partition_ancestors_worker(Relation inhRel, Oid relid,
List **ancestors);
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index d0ff802..be0f065 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -22,9 +22,9 @@
#include "catalog/indexing.h"
#include "catalog/pg_enum.h"
#include "catalog/pg_type.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "nodes/value.h"
+#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/fmgroids.h"
@@ -32,7 +32,6 @@
#include "utils/memutils.h"
#include "utils/syscache.h"
-
/* Potentially set by pg_upgrade_support functions */
Oid binary_upgrade_next_pg_enum_oid = InvalidOid;
diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index fd5da7d..d442c8e 100644
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -14,15 +14,11 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/index.h"
@@ -30,10 +26,11 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
-
+#include "catalog/pg_type.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index fb7f8dd..59f97bf 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -34,8 +34,8 @@
#include "catalog/pg_largeobject.h"
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_shdepend.h"
@@ -47,9 +47,9 @@
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
#include "commands/alter.h"
-#include "commands/dbcommands.h"
#include "commands/collationcmds.h"
#include "commands/conversioncmds.h"
+#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
@@ -60,13 +60,12 @@
#include "commands/subscriptioncmds.h"
#include "commands/tablecmds.h"
#include "commands/typecmds.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
+#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/fmgroids.h"
#include "utils/syscache.h"
-
typedef enum
{
LOCAL_OBJECT,
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index afee283..68d88ff 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -14,23 +14,18 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/indexing.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "catalog/pg_type.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
-
#include "storage/lmgr.h"
-
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
@@ -38,7 +33,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static List *textarray_to_stringlist(ArrayType *textarray);
/*
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 2a51501..a8c1de5 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-#include "catalog/catalog.h"
#include "catalog/binary_upgrade.h"
+#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/objectaccess.h"
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index b8c9b6f..e22dec1 100644
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -19,8 +19,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/visibilitymap.h"
#include "access/xact.h"
#include "access/xlog.h"
@@ -28,6 +26,7 @@
#include "access/xlogutils.h"
#include "catalog/storage.h"
#include "catalog/storage_xlog.h"
+#include "miscadmin.h"
#include "storage/freespace.h"
#include "storage/smgr.h"
#include "utils/memutils.h"
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 70dbcb0..af1aca9 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -34,8 +34,8 @@
#include "catalog/pg_opclass.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
-#include "catalog/pg_subscription.h"
#include "catalog/pg_statistic_ext.h"
+#include "catalog/pg_subscription.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
@@ -57,8 +57,8 @@
#include "commands/trigger.h"
#include "commands/typecmds.h"
#include "commands/user.h"
-#include "parser/parse_func.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
#include "rewrite/rewriteDefine.h"
#include "tcop/utility.h"
#include "utils/builtins.h"
@@ -67,7 +67,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static Oid AlterObjectNamespace_internal(Relation rel, Oid objid, Oid nspOid);
/*
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index a23128d..b8c349f 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -22,17 +22,17 @@
#include "access/multixact.h"
#include "access/relscan.h"
#include "access/tableam.h"
-#include "access/transam.h"
#include "access/toast_internals.h"
+#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_am.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/heap.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_am.h"
#include "catalog/toasting.h"
#include "commands/cluster.h"
#include "commands/progress.h"
@@ -55,7 +55,6 @@
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-
/*
* This struct is used to pass around the information on tables to be
* clustered. We need this so we can make a list of them when invoked without
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 3aeef30..7a866b5 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -39,8 +39,8 @@
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
-#include "optimizer/optimizer.h"
#include "nodes/makefuncs.h"
+#include "optimizer/optimizer.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
#include "parser/parse_expr.h"
@@ -58,7 +58,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
#define OCTVALUE(c) ((c) - '0')
diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c
index b7d2206..2bf7083 100644
--- a/src/backend/commands/createas.c
+++ b/src/backend/commands/createas.c
@@ -25,8 +25,8 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -51,7 +51,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
typedef struct
{
DestReceiver pub; /* publicly-known function pointers */
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 01d6621..aa03172 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -53,8 +53,8 @@
#include "replication/slot.h"
#include "storage/copydir.h"
#include "storage/fd.h"
-#include "storage/lmgr.h"
#include "storage/ipc.h"
+#include "storage/lmgr.h"
#include "storage/md.h"
#include "storage/procarray.h"
#include "storage/smgr.h"
@@ -65,7 +65,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
typedef struct
{
Oid src_dboid; /* source (template) DB */
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index f7ee983..8657df6 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -33,11 +33,12 @@
#include "commands/extension.h"
#include "commands/trigger.h"
#include "funcapi.h"
-#include "parser/parse_func.h"
-#include "pgstat.h"
#include "lib/ilist.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
+#include "pgstat.h"
#include "tcop/deparse_utility.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/evtcache.h"
@@ -46,7 +47,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
typedef struct EventTriggerQueryState
{
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 40f1f9a..94411b5 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -34,8 +34,8 @@
#include "access/genam.h"
#include "access/htup_details.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index bae3b38..2621e36 100644
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -20,13 +20,13 @@
#include "catalog/pg_inherits.h"
#include "commands/lockcmds.h"
#include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
#include "parser/parse_clause.h"
+#include "rewrite/rewriteHandler.h"
#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "rewrite/rewriteHandler.h"
-#include "nodes/nodeFuncs.h"
static void LockTableRecurse(Oid reloid, LOCKMODE lockmode, bool nowait, Oid userid);
static AclResult LockTableAclCheck(Oid relid, LOCKMODE lockmode, Oid userid);
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index 6a1ccde..cb7a6bd 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -19,8 +19,8 @@
#include "access/genam.h"
#include "access/hash.h"
-#include "access/nbtree.h"
#include "access/htup_details.h"
+#include "access/nbtree.h"
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/catalog.h"
@@ -50,7 +50,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterOpFamilyAdd(AlterOpFamilyStmt *stmt,
Oid amoid, Oid opfamilyoid,
int maxOpNumber, int maxProcNumber,
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index 1df7662..36093dc 100644
--- a/src/backend/commands/policy.c
+++ b/src/backend/commands/policy.c
@@ -16,8 +16,8 @@
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index f115d4b..fbf11c8 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -14,29 +14,25 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/publicationcmds.h"
-
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 6cf94a3..7cf3cc1 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -21,8 +21,8 @@
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_namespace.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterSchemaOwner_internal(HeapTuple tup, Relation rel, Oid newOwnerId);
/*
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 2e67a58..6b33cd6 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -14,38 +14,30 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/subscriptioncmds.h"
-
#include "executor/executor.h"
-
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
-
#include "replication/logicallauncher.h"
#include "replication/origin.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
#include "replication/worker_internal.h"
-
#include "storage/lmgr.h"
-
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 8d25d14..97acdb1 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -20,7 +20,6 @@
#include "access/multixact.h"
#include "access/reloptions.h"
#include "access/relscan.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/tupconvert.h"
@@ -100,7 +99,6 @@
#include "utils/timestamp.h"
#include "utils/typcache.h"
-
/*
* ON COMMIT action list
*/
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 84efb41..570dcb2 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -51,8 +51,8 @@
#include <sys/stat.h>
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -84,7 +84,6 @@
#include "utils/rel.h"
#include "utils/varlena.h"
-
/* GUC variables */
char *default_tablespace = NULL;
char *temp_tablespaces = NULL;
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 1119e21..a0bd8c3 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -24,14 +24,14 @@
#include "access/xlog.h"
#include "catalog/pg_authid.h"
#include "commands/variable.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
/*
* DATESTYLE
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index bea890f..9fa433a 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -26,8 +26,8 @@
#include "parser/analyze.h"
#include "parser/parse_relation.h"
#include "rewrite/rewriteDefine.h"
-#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteHandler.h"
+#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteSupport.h"
#include "utils/acl.h"
#include "utils/builtins.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc);
/*---------------------------------------------------------------------
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 1f18e5d..779d3dc 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -28,7 +28,6 @@
#include "executor/nodeGather.h"
#include "executor/nodeGatherMerge.h"
#include "executor/nodeGroup.h"
-#include "executor/nodeGroup.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
#include "executor/nodeIndexonlyscan.h"
@@ -62,7 +61,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static bool IndexSupportsBackwardScan(Oid indexid);
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
index 0cd6f65..dbed597 100644
--- a/src/backend/executor/execExprInterp.c
+++ b/src/backend/executor/execExprInterp.c
@@ -62,22 +62,21 @@
#include "executor/execExpr.h"
#include "executor/nodeSubplan.h"
#include "funcapi.h"
-#include "utils/array.h"
-#include "utils/memutils.h"
#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
#include "parser/parsetree.h"
#include "pgstat.h"
+#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datum.h"
#include "utils/expandedrecord.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/timestamp.h"
#include "utils/typcache.h"
#include "utils/xml.h"
-
/*
* Use computed-goto-based opcode dispatch when computed gotos are available.
* But use a separate symbol so that it's easy to adjust locally in this file
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index 6349c11..7bc5e40 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -21,8 +21,8 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "miscadmin.h"
-#include "utils/lsyscache.h"
#include "utils/hashutils.h"
+#include "utils/lsyscache.h"
#include "utils/memutils.h"
static uint32 TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple);
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 53cd2fc..b256642 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -31,14 +31,15 @@
#include "executor/nodeForeignscan.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
-#include "executor/nodeIndexscan.h"
#include "executor/nodeIndexonlyscan.h"
+#include "executor/nodeIndexscan.h"
#include "executor/nodeSeqscan.h"
#include "executor/nodeSort.h"
#include "executor/nodeSubplan.h"
#include "executor/tqueue.h"
#include "jit/jit.h"
#include "nodes/nodeFuncs.h"
+#include "pgstat.h"
#include "storage/spin.h"
#include "tcop/tcopprot.h"
#include "utils/datum.h"
@@ -46,7 +47,6 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
-#include "pgstat.h"
/*
* Magic numbers for parallel executor communication. We use constants
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index c227282..7a6e285 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -113,9 +113,8 @@
#include "executor/nodeValuesscan.h"
#include "executor/nodeWindowAgg.h"
#include "executor/nodeWorktablescan.h"
-#include "nodes/nodeFuncs.h"
#include "miscadmin.h"
-
+#include "nodes/nodeFuncs.h"
static TupleTableSlot *ExecProcNodeFirst(PlanState *node);
static TupleTableSlot *ExecProcNodeInstr(PlanState *node);
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 87bc510..da43057 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -60,8 +60,8 @@
#include "access/heaptoast.h"
#include "access/htup_details.h"
#include "access/tupdesc_details.h"
-#include "funcapi.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
#include "nodes/nodeFuncs.h"
#include "storage/bufmgr.h"
#include "utils/builtins.h"
@@ -69,7 +69,6 @@
#include "utils/lsyscache.h"
#include "utils/typcache.h"
-
static TupleDesc ExecTypeFromTLInternal(List *targetList,
bool skipjunk);
static pg_attribute_always_inline void slot_deform_heap_tuple(TupleTableSlot *slot, HeapTuple tuple, uint32 *offp,
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 58c376a..6ee24ea 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -231,13 +231,12 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/datum.h"
#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/datum.h"
-
static void select_current_set(AggState *aggstate, int setno, bool is_hash);
static void initialize_phase(AggState *aggstate, int newphase);
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index f62105f..256d61a 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -49,9 +49,8 @@
#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "utils/spccache.h"
#include "utils/snapmgr.h"
-
+#include "utils/spccache.h"
static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node);
static inline void BitmapDoneInitializingSharedState(ParallelBitmapHeapState *pstate);
diff --git a/src/backend/executor/nodeCustom.c b/src/backend/executor/nodeCustom.c
index 6dd0916..ccaa68b 100644
--- a/src/backend/executor/nodeCustom.c
+++ b/src/backend/executor/nodeCustom.c
@@ -13,16 +13,15 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "executor/nodeCustom.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
#include "nodes/extensible.h"
#include "nodes/plannodes.h"
-#include "miscadmin.h"
#include "parser/parsetree.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
static TupleTableSlot *ExecCustomScan(PlanState *pstate);
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 224cbb3..d6f4eda 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -38,11 +38,10 @@
#include "pgstat.h"
#include "port/atomics.h"
#include "utils/dynahash.h"
-#include "utils/memutils.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/syscache.h"
-
static void ExecHashIncreaseNumBatches(HashJoinTable hashtable);
static void ExecHashIncreaseNumBuckets(HashJoinTable hashtable);
static void ExecParallelHashIncreaseNumBatches(HashJoinTable hashtable);
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 1991b90..2c364bd 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -32,14 +32,13 @@
#include "access/htup_details.h"
#include "executor/executor.h"
#include "executor/nodeSubplan.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "miscadmin.h"
#include "utils/array.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-
static Datum ExecHashSubPlan(SubPlanState *node,
ExprContext *econtext,
bool *isNull);
diff --git a/src/backend/executor/nodeTableFuncscan.c b/src/backend/executor/nodeTableFuncscan.c
index d264337..21cf3ca 100644
--- a/src/backend/executor/nodeTableFuncscan.c
+++ b/src/backend/executor/nodeTableFuncscan.c
@@ -22,17 +22,16 @@
*/
#include "postgres.h"
-#include "nodes/execnodes.h"
#include "executor/executor.h"
#include "executor/nodeTableFuncscan.h"
#include "executor/tablefunc.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/xml.h"
-
static TupleTableSlot *TableFuncNext(TableFuncScanState *node);
static bool TableFuncRecheck(TableFuncScanState *node, TupleTableSlot *slot);
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index b5d3f3c..f1b9407 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -46,8 +46,8 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/expandeddatum.h"
#include "utils/datum.h"
+#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/regproc.h"
diff --git a/src/backend/jit/jit.c b/src/backend/jit/jit.c
index 43e65b1..e066f72 100644
--- a/src/backend/jit/jit.c
+++ b/src/backend/jit/jit.c
@@ -17,19 +17,16 @@
*/
#include "postgres.h"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-
-#include "fmgr.h"
#include "executor/execExpr.h"
+#include "fmgr.h"
#include "jit/jit.h"
#include "miscadmin.h"
-#include "utils/resowner_private.h"
#include "utils/fmgrprotos.h"
-
+#include "utils/resowner_private.h"
/* GUCs */
bool jit_enabled = true;
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index d093246..a9d3621 100644
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -23,10 +23,10 @@
#include "access/tupconvert.h"
#include "catalog/objectaccess.h"
#include "catalog/pg_type.h"
+#include "executor/execExpr.h"
#include "executor/execdebug.h"
#include "executor/nodeAgg.h"
#include "executor/nodeSubplan.h"
-#include "executor/execExpr.h"
#include "funcapi.h"
#include "jit/llvmjit.h"
#include "jit/llvmjit_emit.h"
@@ -46,7 +46,6 @@
#include "utils/typcache.h"
#include "utils/xml.h"
-
typedef struct CompiledExprState
{
LLVMJitContext *context;
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 2221c04..7f59a29 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -39,10 +39,10 @@
#include "storage/fd.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/varlena.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/varlena.h"
#ifdef USE_LDAP
#ifdef WIN32
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index b655931..bcada74 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -17,14 +17,13 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "miscadmin.h"
-#include "nodes/makefuncs.h"
#include "nodes/execnodes.h"
+#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "nodes/pathnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-
static bool expression_returns_set_walker(Node *node, void *context);
static int leftmostLoc(int loc1, int loc2);
static bool fix_opfuncids_walker(Node *node, void *context);
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index a546908..3b8d2fe 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -35,8 +35,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(CX)
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index fbabe2e..3b92f42 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -32,8 +32,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(ERX)
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 4bf777d..fe02050 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -21,11 +21,10 @@
#include "optimizer/optimizer.h"
#include "optimizer/pathnode.h"
#include "optimizer/plancat.h"
+#include "statistics/statistics.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
-#include "statistics/statistics.h"
-
/*
* Data structure for accumulating info about possible range-query
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 274fea0..fa63a38 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -14,8 +14,8 @@
*/
#include "postgres.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/clauses.h"
@@ -34,7 +34,6 @@
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
-
/* These parameters are set by GUC */
int from_collapse_limit;
int join_collapse_limit;
diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c
index 9381939..974f620 100644
--- a/src/backend/optimizer/plan/planagg.c
+++ b/src/backend/optimizer/plan/planagg.c
@@ -41,13 +41,12 @@
#include "optimizer/planmain.h"
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_clause.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
static bool find_minmax_aggs_walker(Node *node, List **context);
static bool build_minmax_path(PlannerInfo *root, MinMaxAggInfo *mminfo,
Oid eqop, Oid sortop, bool nulls_first);
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 17c5f08..7fe11b5 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -31,10 +31,10 @@
#include "executor/executor.h"
#include "executor/nodeAgg.h"
#include "foreign/fdwapi.h"
-#include "miscadmin.h"
#include "jit/jit.h"
#include "lib/bipartite_match.h"
#include "lib/knapsack.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#ifdef OPTIMIZER_DEBUG
@@ -55,17 +55,16 @@
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
#include "parser/parse_agg.h"
+#include "parser/parsetree.h"
#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "storage/dsm_impl.h"
+#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/selfuncs.h"
-#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
/* GUC parameters */
double cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION;
int force_parallel_mode = FORCE_PARALLEL_OFF;
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 792ae39..0da43ef 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -47,12 +47,11 @@
#include "optimizer/optimizer.h"
#include "optimizer/prep.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteHandler.h"
#include "utils/rel.h"
-
static List *expand_targetlist(List *tlist, int command_type,
Index result_relation, Relation rel);
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 34acb73..60c93ee 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -16,8 +16,8 @@
#include <math.h>
-#include "miscadmin.h"
#include "foreign/fdwapi.h"
+#include "miscadmin.h"
#include "nodes/extensible.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/appendinfo.h"
@@ -35,7 +35,6 @@
#include "utils/memutils.h"
#include "utils/selfuncs.h"
-
typedef enum
{
COSTS_EQUAL, /* path costs are fuzzily equal */
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index e5f9e04..5e889d1 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -20,9 +20,9 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/nbtree.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/table.h"
+#include "access/tableam.h"
#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
@@ -40,9 +40,9 @@
#include "optimizer/optimizer.h"
#include "optimizer/plancat.h"
#include "optimizer/prep.h"
-#include "partitioning/partdesc.h"
#include "parser/parse_relation.h"
#include "parser/parsetree.h"
+#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "statistics/statistics.h"
#include "storage/bufmgr.h"
@@ -50,9 +50,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
-
+#include "utils/syscache.h"
/* GUC parameter */
int constraint_exclusion = CONSTRAINT_EXCLUSION_PARTITION;
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 260ccd4..fe41918 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -15,8 +15,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/nbtree.h"
#include "access/table.h"
@@ -29,12 +27,11 @@
#include "catalog/pg_constraint.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
-#include "parser/parser.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -44,14 +41,15 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/builtins.h"
-#include "utils/guc.h"
#include "utils/catcache.h"
+#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
-
+#include "utils/syscache.h"
/* Convenience macro for the most common makeNamespaceItem() case */
#define makeDefaultNSItem(rte) makeNamespaceItem(rte, true, true, false, true)
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 76f3dd7..eb91da2 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -22,6 +22,7 @@
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
+#include "parser/parse_agg.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -31,14 +32,12 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
-#include "parser/parse_agg.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/lsyscache.h"
#include "utils/timestamp.h"
#include "utils/xml.h"
-
/* GUC parameters */
bool operator_precedence_warning = false;
bool Transform_null_equals = false;
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 1baf7ef..bc832e7 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -20,17 +20,16 @@
#include "mb/pg_wchar.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_relation.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/int8.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/varbit.h"
-
static void pcb_error_callback(void *arg);
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 4dd8150..47188fc 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -26,10 +26,10 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_enr.h"
#include "parser/parse_relation.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
@@ -37,7 +37,6 @@
#include "utils/syscache.h"
#include "utils/varlena.h"
-
#define MAX_FUZZY_DISTANCE 3
static RangeTblEntry *scanNameSpaceForRefname(ParseState *pstate,
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 2901025..30d419e 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -20,19 +20,18 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_func.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/typcache.h"
-
static void markTargetListOrigin(ParseState *pstate, TargetEntry *tle,
Var *var, int levelsup);
static Node *transformAssignmentIndirection(ParseState *pstate,
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 7932a96..78fef26 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -19,14 +19,13 @@
#include "catalog/pg_type.h"
#include "lib/stringinfo.h"
#include "nodes/makefuncs.h"
-#include "parser/parser.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
static int32 typenameTypeMod(ParseState *pstate, const TypeName *typeName,
Type typ);
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index 53e3ae2..7745e8d 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -17,9 +17,8 @@
#include <ctype.h>
-#include "parser/scansup.h"
#include "mb/pg_wchar.h"
-
+#include "parser/scansup.h"
/* ----------------
* scanstr
diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c
index 318d8ec..2004e00 100644
--- a/src/backend/partitioning/partbounds.c
+++ b/src/backend/partitioning/partbounds.c
@@ -36,8 +36,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/snapmgr.h"
#include "utils/ruleutils.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
/*
diff --git a/src/backend/partitioning/partdesc.c b/src/backend/partitioning/partdesc.c
index b207b76..6ede084 100644
--- a/src/backend/partitioning/partdesc.c
+++ b/src/backend/partitioning/partdesc.c
@@ -25,13 +25,13 @@
#include "storage/bufmgr.h"
#include "storage/sinval.h"
#include "utils/builtins.h"
-#include "utils/inval.h"
#include "utils/fmgroids.h"
#include "utils/hsearch.h"
+#include "utils/inval.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-#include "utils/rel.h"
#include "utils/partcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
typedef struct PartitionDirectoryData
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index b66b517..5f8a007 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -14,8 +14,8 @@
#include <unistd.h>
-#include "libpq/pqsignal.h"
#include "access/parallel.h"
+#include "libpq/pqsignal.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "port/atomics.h"
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index 8ec16a3..847d96c 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -38,8 +38,8 @@
#include <sys/time.h>
#include <unistd.h>
-#include "access/xlog.h"
#include "access/xlog_internal.h"
+#include "access/xlog.h"
#include "libpq/pqsignal.h"
#include "miscadmin.h"
#include "pgstat.h"
@@ -60,7 +60,6 @@
#include "utils/resowner.h"
#include "utils/timestamp.h"
-
/*
* GUC parameters
*/
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 011076c..fabcf31 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -32,8 +32,6 @@
#include <sys/select.h>
#endif
-#include "pgstat.h"
-
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
@@ -48,6 +46,7 @@
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/autovacuum.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
@@ -69,7 +68,6 @@
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-
/* ----------
* Timer definitions.
* ----------
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index d0f210d..1fa4551 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -24,8 +24,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
#include "nodes/pg_list.h"
-#include "pgtar.h"
#include "pgstat.h"
+#include "pgtar.h"
#include "port.h"
#include "postmaster/syslogger.h"
#include "replication/basebackup.h"
@@ -42,7 +42,6 @@
#include "utils/relcache.h"
#include "utils/timestamp.h"
-
typedef struct
{
const char *label;
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 6eba08a..545d2fc 100644
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -19,14 +19,14 @@
#include <unistd.h>
#include <sys/time.h>
-#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "access/xlog.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "libpq-fe.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "pqexpbuffer.h"
#include "replication/walreceiver.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
index c53e7e2..bc532d0 100644
--- a/src/backend/replication/logical/decode.c
+++ b/src/backend/replication/logical/decode.c
@@ -31,19 +31,16 @@
#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog_internal.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-
+#include "access/xlogutils.h"
#include "catalog/pg_control.h"
-
#include "replication/decode.h"
#include "replication/logical.h"
#include "replication/message.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
#include "storage/standby.h"
typedef struct XLogRecordBuffer
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index 186057b..1f8821c 100644
--- a/src/backend/replication/logical/launcher.c
+++ b/src/backend/replication/logical/launcher.c
@@ -17,43 +17,35 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/heapam.h"
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "funcapi.h"
#include "libpq/pqsignal.h"
-
+#include "miscadmin.h"
+#include "pgstat.h"
#include "postmaster/bgworker.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
-
#include "replication/logicallauncher.h"
#include "replication/logicalworker.h"
#include "replication/slot.h"
#include "replication/walreceiver.h"
#include "replication/worker_internal.h"
-
#include "storage/ipc.h"
#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/procsignal.h"
-
#include "tcop/tcopprot.h"
-
#include "utils/memutils.h"
#include "utils/pg_lsn.h"
#include "utils/ps_status.h"
-#include "utils/timeout.h"
#include "utils/snapmgr.h"
+#include "utils/timeout.h"
/* max sleep time between cycles (3min) */
#define DEFAULT_NAPTIME_PER_CYCLE 180000L
diff --git a/src/backend/replication/logical/logical.c b/src/backend/replication/logical/logical.c
index da265f5..7e06615 100644
--- a/src/backend/replication/logical/logical.c
+++ b/src/backend/replication/logical/logical.c
@@ -28,21 +28,17 @@
#include "postgres.h"
-#include "fmgr.h"
-#include "miscadmin.h"
-
#include "access/xact.h"
#include "access/xlog_internal.h"
-
+#include "fmgr.h"
+#include "miscadmin.h"
#include "replication/decode.h"
#include "replication/logical.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
#include "storage/proc.h"
#include "storage/procarray.h"
-
#include "utils/memutils.h"
/* data for errcontext callback */
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c
index d1cf80d..aa2106b 100644
--- a/src/backend/replication/logical/logicalfuncs.c
+++ b/src/backend/replication/logical/logicalfuncs.c
@@ -17,36 +17,28 @@
#include <unistd.h>
-#include "fmgr.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
+#include "access/xact.h"
#include "access/xlog_internal.h"
#include "access/xlogutils.h"
-
-#include "access/xact.h"
-
#include "catalog/pg_type.h"
-
-#include "nodes/makefuncs.h"
-
+#include "fmgr.h"
+#include "funcapi.h"
#include "mb/pg_wchar.h"
-
+#include "miscadmin.h"
+#include "nodes/makefuncs.h"
+#include "replication/decode.h"
+#include "replication/logical.h"
+#include "replication/logicalfuncs.h"
+#include "replication/message.h"
+#include "storage/fd.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/inval.h"
+#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_lsn.h"
#include "utils/regproc.h"
#include "utils/resowner.h"
-#include "utils/lsyscache.h"
-
-#include "replication/decode.h"
-#include "replication/logical.h"
-#include "replication/logicalfuncs.h"
-#include "replication/message.h"
-
-#include "storage/fd.h"
/* private date for writing out data */
typedef struct DecodingOutputState
diff --git a/src/backend/replication/logical/message.c b/src/backend/replication/logical/message.c
index 0681cb4..1652546 100644
--- a/src/backend/replication/logical/message.c
+++ b/src/backend/replication/logical/message.c
@@ -31,17 +31,12 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/xact.h"
-
#include "catalog/indexing.h"
-
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-
-#include "replication/message.h"
#include "replication/logical.h"
-
+#include "replication/message.h"
#include "utils/memutils.h"
/*
diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c
index 07ae613..a590f9c 100644
--- a/src/backend/replication/logical/origin.c
+++ b/src/backend/replication/logical/origin.c
@@ -70,33 +70,29 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/indexing.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-
-#include "replication/origin.h"
-#include "replication/logical.h"
#include "pgstat.h"
+#include "replication/logical.h"
+#include "replication/origin.h"
+#include "storage/condition_variable.h"
+#include "storage/copydir.h"
#include "storage/fd.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
-#include "storage/condition_variable.h"
-#include "storage/copydir.h"
-
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/pg_lsn.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
* Replay progress of a single remote node.
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index 0bd1d0f..5112eca 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -120,29 +120,24 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam_xlog.h"
#include "access/transam.h"
#include "access/xact.h"
-
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "replication/logical.h"
#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
-#include "utils/builtins.h"
-#include "utils/memutils.h"
-#include "utils/snapshot.h"
-#include "utils/snapmgr.h"
-
#include "storage/block.h" /* debugging output */
#include "storage/fd.h"
#include "storage/lmgr.h"
#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/standby.h"
+#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/snapmgr.h"
+#include "utils/snapshot.h"
/*
* This struct contains the current state of the snapshot building
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
index 7881079..e01d18c 100644
--- a/src/backend/replication/logical/tablesync.c
+++ b/src/backend/replication/logical/tablesync.c
@@ -85,30 +85,23 @@
#include "postgres.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/pg_subscription_rel.h"
#include "catalog/pg_type.h"
-
#include "commands/copy.h"
-
+#include "miscadmin.h"
#include "parser/parse_relation.h"
-
+#include "pgstat.h"
#include "replication/logicallauncher.h"
#include "replication/logicalrelation.h"
#include "replication/walreceiver.h"
#include "replication/worker_internal.h"
-
-#include "utils/snapmgr.h"
#include "storage/ipc.h"
-
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/snapmgr.h"
static bool table_states_valid = false;
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index 9c08757..3483c1b 100644
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -13,16 +13,13 @@
#include "postgres.h"
#include "catalog/pg_publication.h"
-
#include "fmgr.h"
-
#include "replication/logical.h"
#include "replication/logicalproto.h"
#include "replication/origin.h"
#include "replication/pgoutput.h"
-
-#include "utils/inval.h"
#include "utils/int8.h"
+#include "utils/inval.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/varlena.h"
diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c
index 42da631..46e6dd4 100644
--- a/src/backend/replication/slotfuncs.c
+++ b/src/backend/replication/slotfuncs.c
@@ -17,9 +17,9 @@
#include "funcapi.h"
#include "miscadmin.h"
#include "replication/decode.h"
-#include "replication/slot.h"
#include "replication/logical.h"
#include "replication/logicalfuncs.h"
+#include "replication/slot.h"
#include "utils/builtins.h"
#include "utils/inval.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c
index 1c44714..df7bde3 100644
--- a/src/backend/rewrite/rowsecurity.c
+++ b/src/backend/rewrite/rowsecurity.c
@@ -51,12 +51,12 @@
#include "rewrite/rewriteHandler.h"
#include "rewrite/rewriteManip.h"
#include "rewrite/rowsecurity.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/rls.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
static void get_policies_for_relation(Relation relation,
CmdType cmd, Oid user_id,
diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 585cad2..9493b2d 100644
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -20,10 +20,10 @@
#include "catalog/pg_statistic_ext_data.h"
#include "lib/stringinfo.h"
#include "nodes/nodeFuncs.h"
-#include "optimizer/clauses.h"
-#include "optimizer/optimizer.h"
#include "nodes/nodes.h"
#include "nodes/pathnodes.h"
+#include "optimizer/clauses.h"
+#include "optimizer/optimizer.h"
#include "statistics/extended_stats_internal.h"
#include "statistics/statistics.h"
#include "utils/bytea.h"
diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c
index f3383c0..4ccfc5f 100644
--- a/src/backend/statistics/mvdistinct.c
+++ b/src/backend/statistics/mvdistinct.c
@@ -28,14 +28,13 @@
#include "access/htup_details.h"
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_statistic_ext_data.h"
+#include "lib/stringinfo.h"
+#include "statistics/extended_stats_internal.h"
+#include "statistics/statistics.h"
#include "utils/fmgrprotos.h"
#include "utils/lsyscache.h"
-#include "lib/stringinfo.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "statistics/extended_stats_internal.h"
-#include "statistics/statistics.h"
-
static double ndistinct_for_combination(double totalrows, int numrows,
HeapTuple *rows, VacAttrStats **stats,
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index ccd2c31..1eb08cd 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -14,9 +14,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
-
+#include "storage/bufmgr.h"
BufferDescPadded *BufferDescriptors;
char *BufferBlocks;
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index e546585..7e44b51 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -21,9 +21,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
-
+#include "storage/bufmgr.h"
/* entry for buffer lookup hashtable */
typedef struct
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index b40e6f3..440ff77 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -45,9 +45,9 @@
#include "executor/instrument.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "storage/fd.h"
-#include "storage/buffile.h"
#include "storage/buf_internals.h"
+#include "storage/buffile.h"
+#include "storage/fd.h"
#include "utils/resowner.h"
/*
diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c
index ca1c9cd..c94ce5b 100644
--- a/src/backend/storage/file/copydir.c
+++ b/src/backend/storage/file/copydir.c
@@ -22,10 +22,10 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "storage/copydir.h"
-#include "storage/fd.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "storage/copydir.h"
+#include "storage/fd.h"
/*
* copydir: copy a directory
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index fe2bb8f..f18bcb2 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -79,11 +79,11 @@
#include <sys/resource.h> /* for getrlimit */
#endif
-#include "miscadmin.h"
#include "access/xact.h"
#include "access/xlog.h"
#include "catalog/pg_tablespace.h"
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "portability/mem.h"
#include "storage/fd.h"
@@ -91,7 +91,6 @@
#include "utils/guc.h"
#include "utils/resowner_private.h"
-
/* Define PG_FLUSH_DATA_WORKS if we have an implementation for pg_flush_data */
#if defined(HAVE_SYNC_FILE_RANGE)
#define PG_FLUSH_DATA_WORKS 1
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
index 2879b84..d550093 100644
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -47,7 +47,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include <fcntl.h>
#include <unistd.h>
@@ -61,15 +60,16 @@
#ifdef HAVE_SYS_SHM_H
#include <sys/shm.h>
#endif
+
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "portability/mem.h"
+#include "postmaster/postmaster.h"
#include "storage/dsm_impl.h"
#include "storage/fd.h"
#include "utils/guc.h"
#include "utils/memutils.h"
-#include "postmaster/postmaster.h"
#ifdef USE_DSM_POSIX
static bool dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 8853706..4829953 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -29,10 +29,10 @@
#include "postmaster/bgwriter.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
+#include "replication/origin.h"
#include "replication/slot.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
-#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/dsm.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 7605b2c..fde97a1 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -21,14 +21,13 @@
#include "commands/async.h"
#include "miscadmin.h"
#include "replication/walsender.h"
-#include "storage/latch.h"
#include "storage/ipc.h"
+#include "storage/latch.h"
#include "storage/proc.h"
#include "storage/shmem.h"
#include "storage/sinval.h"
#include "tcop/tcopprot.h"
-
/*
* The SIGUSR1 signal is multiplexed to support signalling multiple event
* types. The specific reason is communicated via flags in shared memory.
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index db080c8..0c58b39 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -17,6 +17,7 @@
#include <signal.h>
#include <unistd.h>
+#include "access/transam.h"
#include "miscadmin.h"
#include "storage/backendid.h"
#include "storage/ipc.h"
@@ -25,8 +26,6 @@
#include "storage/shmem.h"
#include "storage/sinvaladt.h"
#include "storage/spin.h"
-#include "access/transam.h"
-
/*
* Conceptually, the shared cache invalidation messages are stored in an
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index fb0bf44..18e3843 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -77,8 +77,8 @@
#include "postgres.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/postmaster.h"
#include "replication/slot.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 498373f..7263c85 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -45,7 +45,6 @@
#include "replication/syncrep.h"
#include "replication/walsender.h"
#include "storage/condition_variable.h"
-#include "storage/standby.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
#include "storage/pmsignal.h"
@@ -53,10 +52,10 @@
#include "storage/procarray.h"
#include "storage/procsignal.h"
#include "storage/spin.h"
+#include "storage/standby.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-
/* GUC variables */
int DeadlockTimeout = 1000;
int StatementTimeout = 0;
diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
index 2e6c55b..04befb7 100644
--- a/src/backend/storage/lmgr/s_lock.c
+++ b/src/backend/storage/lmgr/s_lock.c
@@ -50,9 +50,8 @@
#include <time.h>
#include <unistd.h>
-#include "storage/s_lock.h"
#include "port/atomics.h"
-
+#include "storage/s_lock.h"
#define MIN_SPINS_PER_DELAY 10
#define MAX_SPINS_PER_DELAY 1000
diff --git a/src/backend/storage/page/checksum.c b/src/backend/storage/page/checksum.c
index 1eb7ef6..8f7a110 100644
--- a/src/backend/storage/page/checksum.c
+++ b/src/backend/storage/page/checksum.c
@@ -14,7 +14,6 @@
#include "postgres.h"
#include "storage/checksum.h"
-
/*
* The actual code is in storage/checksum_impl.h. This is done so that
* external programs can incorporate the checksum code by #include'ing
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 07f3c93..8a9eaf6 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -25,21 +25,21 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "postmaster/bgwriter.h"
-#include "storage/fd.h"
#include "storage/bufmgr.h"
+#include "storage/fd.h"
#include "storage/md.h"
#include "storage/relfilenode.h"
#include "storage/smgr.h"
#include "storage/sync.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/*
* The magnetic disk storage manager keeps track of open file
diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
index f329c3f..3485e6f 100644
--- a/src/backend/storage/sync/sync.c
+++ b/src/backend/storage/sync/sync.c
@@ -18,19 +18,19 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "pgstat.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pgstat.h"
#include "portability/instr_time.h"
#include "postmaster/bgwriter.h"
#include "storage/bufmgr.h"
#include "storage/ipc.h"
#include "storage/md.h"
#include "utils/hsearch.h"
-#include "utils/memutils.h"
#include "utils/inval.h"
+#include "utils/memutils.h"
static MemoryContext pendingOpsCxt; /* context for the pending ops state */
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index e8d8e6f..5ddd18d 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -47,14 +47,15 @@
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
#include "libpq/pqsignal.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "nodes/print.h"
#include "optimizer/optimizer.h"
-#include "pgstat.h"
-#include "pg_trace.h"
#include "parser/analyze.h"
#include "parser/parser.h"
#include "pg_getopt.h"
+#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/autovacuum.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
@@ -77,8 +78,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "mb/pg_wchar.h"
-
/* ----------------
* global variables
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index c6faa66..98f1ae8 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -28,8 +28,8 @@
#include "commands/alter.h"
#include "commands/async.h"
#include "commands/cluster.h"
-#include "commands/comment.h"
#include "commands/collationcmds.h"
+#include "commands/comment.h"
#include "commands/conversioncmds.h"
#include "commands/copy.h"
#include "commands/createas.h"
@@ -39,8 +39,8 @@
#include "commands/event_trigger.h"
#include "commands/explain.h"
#include "commands/extension.h"
-#include "commands/matview.h"
#include "commands/lockcmds.h"
+#include "commands/matview.h"
#include "commands/policy.h"
#include "commands/portalcmds.h"
#include "commands/prepare.h"
@@ -68,9 +68,8 @@
#include "utils/acl.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
-
+#include "utils/syscache.h"
/* Hook for plugins to get control in ProcessUtility() */
ProcessUtility_hook_type ProcessUtility_hook = NULL;
diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c
index a3372a8..083292c 100644
--- a/src/backend/tsearch/wparser.c
+++ b/src/backend/tsearch/wparser.c
@@ -13,17 +13,16 @@
*/
#include "postgres.h"
-#include "funcapi.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "funcapi.h"
#include "tsearch/ts_cache.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/jsonapi.h"
#include "utils/varlena.h"
-
/******sql-level interface******/
typedef struct
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index d7e6100..0070a7e 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -19,10 +19,10 @@
#include "access/htup_details.h"
#include "catalog/catalog.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/proclang.h"
#include "commands/tablespace.h"
@@ -40,7 +40,6 @@
#include "utils/syscache.h"
#include "utils/varlena.h"
-
typedef struct
{
const char *name;
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index e38bd93..c911d72 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -31,7 +31,6 @@
#include "utils/memutils.h"
#include "utils/tzparser.h"
-
static int DecodeNumber(int flen, char *field, bool haveTextMonth,
int fmask, int *tmask,
struct pg_tm *tm, fsec_t *fsec, bool *is2digits);
diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c
index 6ae2a31..b6befd6 100644
--- a/src/backend/utils/adt/format_type.c
+++ b/src/backend/utils/adt/format_type.c
@@ -20,11 +20,11 @@
#include "access/htup_details.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/numeric.h"
#include "utils/syscache.h"
-#include "mb/pg_wchar.h"
static char *printTypmod(const char *typname, int32 typmod, Oid typmodout);
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 0ff9394..5a558fb 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -23,9 +23,8 @@
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "optimizer/optimizer.h"
-#include "utils/int8.h"
#include "utils/builtins.h"
-
+#include "utils/int8.h"
#define MAXINT8LEN 25
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index d4ba3bd..e2e16eb 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -27,11 +27,11 @@
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
-#include "utils/typcache.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
+#include "utils/typcache.h"
/*
* The context of the parser is maintained by the recursive descent
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 74b4bbe..9927d08 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -12,20 +12,20 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/transam.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
#include "utils/jsonb.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index a35f718..906630e 100644
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -66,18 +66,17 @@
#include "miscadmin.h"
#include "regex/regex.h"
#include "utils/builtins.h"
+#include "utils/date.h"
#include "utils/datetime.h"
#include "utils/datum.h"
-#include "utils/formatting.h"
#include "utils/float.h"
+#include "utils/formatting.h"
#include "utils/guc.h"
#include "utils/json.h"
#include "utils/jsonpath.h"
-#include "utils/date.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-
/*
* Represents "base object" and it's "id" for .keyvalue() evaluation.
*/
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index d330a88..27474a6 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -29,18 +29,17 @@
#include "common/keywords.h"
#include "funcapi.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "parser/scansup.h"
+#include "pgstat.h"
#include "postmaster/syslogger.h"
#include "rewrite/rewriteHandler.h"
#include "storage/fd.h"
-#include "utils/lsyscache.h"
-#include "utils/ruleutils.h"
#include "tcop/tcopprot.h"
#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/ruleutils.h"
#include "utils/timestamp.h"
-
/*
* Common subroutine for num_nulls() and num_nonnulls().
* Returns true if successful, false if function should return NULL.
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index 0fdfee5..9557732 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -16,10 +16,9 @@
#include "postgres.h"
#include "common/int.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/formatting.h"
-#include "mb/pg_wchar.h"
-
static text *dotrim(const char *string, int stringlen,
const char *set, int setlen,
diff --git a/src/backend/utils/adt/rangetypes_gist.c b/src/backend/utils/adt/rangetypes_gist.c
index 6f93ce6..c0edae6 100644
--- a/src/backend/utils/adt/rangetypes_gist.c
+++ b/src/backend/utils/adt/rangetypes_gist.c
@@ -16,12 +16,11 @@
#include "access/gist.h"
#include "access/stratnum.h"
+#include "utils/datum.h"
#include "utils/float.h"
#include "utils/fmgrprotos.h"
-#include "utils/datum.h"
#include "utils/rangetypes.h"
-
/*
* Range class properties used to segregate different classes of ranges in
* GiST. Each unique combination of properties is a class. CLS_EMPTY cannot
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 17a7f6c..4b1decf 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -33,11 +33,11 @@
#include "miscadmin.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
-#include "utils/acl.h"
#include "utils/regproc.h"
+#include "utils/syscache.h"
#include "utils/varlena.h"
static char *format_operator_internal(Oid operator_oid, bool force_qualify);
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index fb477d4..d4282a3 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -36,9 +36,9 @@
#include "executor/executor.h"
#include "executor/spi.h"
#include "lib/ilist.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "parser/parse_relation.h"
-#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "utils/acl.h"
#include "utils/builtins.h"
@@ -54,7 +54,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
/*
* Local definitions
*/
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 3e64390..c1de869 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -50,9 +50,9 @@
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
-#include "parser/parse_node.h"
#include "parser/parse_agg.h"
#include "parser/parse_func.h"
+#include "parser/parse_node.h"
#include "parser/parse_oper.h"
#include "parser/parser.h"
#include "parser/parsetree.h"
@@ -74,7 +74,6 @@
#include "utils/varlena.h"
#include "utils/xml.h"
-
/* ----------
* Pretty formatting constants
* ----------
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index ab2b49f..4f574b3 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -16,8 +16,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_locale.h"
+#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
index af07563..217de77 100644
--- a/src/backend/utils/adt/tsquery_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -15,8 +15,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
typedef struct NODE
{
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
index 91200ee..282fb2d 100644
--- a/src/backend/utils/adt/tsquery_gist.c
+++ b/src/backend/utils/adt/tsquery_gist.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "access/stratnum.h"
#include "access/gist.h"
+#include "access/stratnum.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
index de46a00..7cb19db 100644
--- a/src/backend/utils/adt/tsquery_util.c
+++ b/src/backend/utils/adt/tsquery_util.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
/*
* Build QTNode tree for a tsquery given in QueryItem array format.
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
index e28859d..2d8359d 100644
--- a/src/backend/utils/adt/tsrank.c
+++ b/src/backend/utils/adt/tsrank.c
@@ -16,11 +16,10 @@
#include <limits.h>
#include <math.h>
+#include "miscadmin.h"
#include "tsearch/ts_utils.h"
#include "utils/array.h"
#include "utils/builtins.h"
-#include "miscadmin.h"
-
static const float weights[] = {0.1f, 0.2f, 0.4f, 1.0f};
diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c
index 90b2c9b..d346324 100644
--- a/src/backend/utils/adt/txid.c
+++ b/src/backend/utils/adt/txid.c
@@ -26,15 +26,14 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "funcapi.h"
-#include "miscadmin.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "postmaster/postmaster.h"
#include "storage/lwlock.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
-
/* txid will be signed int8 in database, so must limit to 63 bits */
#define MAX_TXID ((uint64) PG_INT64_MAX)
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index e63a4e5..2aed411 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -18,6 +18,7 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "libpq/pqformat.h"
+#include "mb/pg_wchar.h"
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "utils/array.h"
@@ -26,8 +27,6 @@
#include "utils/lsyscache.h"
#include "utils/pg_locale.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
-
/* common code for bpchartypmodin and varchartypmodin */
static int32
diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c
index 419bde5..1b0f738 100644
--- a/src/backend/utils/cache/evtcache.c
+++ b/src/backend/utils/cache/evtcache.c
@@ -16,17 +16,17 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/indexing.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_type.h"
#include "commands/trigger.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/evtcache.h"
+#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/memutils.h"
-#include "utils/hsearch.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 585dcee..ad1ff01 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -47,8 +47,8 @@
#include "catalog/pg_am.h"
#include "catalog/pg_amproc.h"
#include "catalog/pg_attrdef.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_database.h"
#include "catalog/pg_namespace.h"
@@ -90,7 +90,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
#define RELCACHE_INIT_FILEMAGIC 0x573266 /* version ID value */
/*
diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c
index c506dc9..d244eaf 100644
--- a/src/backend/utils/cache/relfilenodemap.c
+++ b/src/backend/utils/cache/relfilenodemap.c
@@ -22,9 +22,9 @@
#include "miscadmin.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
-#include "utils/fmgroids.h"
#include "utils/rel.h"
#include "utils/relfilenodemap.h"
#include "utils/relmapper.h"
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 16297a5..13a34d5 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -74,11 +74,10 @@
#include "catalog/pg_ts_template.h"
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
-#include "utils/rel.h"
#include "utils/catcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
-
/*---------------------------------------------------------------------------
Adding system caches:
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
index 10222d5..3c4689a 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
@@ -15,8 +15,8 @@
#include "fmgr.h"
#include "mb/pg_wchar.h"
#include "../../Unicode/utf8_to_koi8r.map"
-#include "../../Unicode/koi8r_to_utf8.map"
#include "../../Unicode/utf8_to_koi8u.map"
+#include "../../Unicode/koi8r_to_utf8.map"
#include "../../Unicode/koi8u_to_utf8.map"
PG_MODULE_MAGIC;
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
index e33ca42..34ddcba 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
@@ -12,12 +12,14 @@
*/
#include "postgres.h"
+
#include "fmgr.h"
#include "mb/pg_wchar.h"
#include "../../Unicode/iso8859_10_to_utf8.map"
#include "../../Unicode/iso8859_13_to_utf8.map"
#include "../../Unicode/iso8859_14_to_utf8.map"
#include "../../Unicode/iso8859_15_to_utf8.map"
+#include "../../Unicode/iso8859_16_to_utf8.map"
#include "../../Unicode/iso8859_2_to_utf8.map"
#include "../../Unicode/iso8859_3_to_utf8.map"
#include "../../Unicode/iso8859_4_to_utf8.map"
@@ -39,7 +41,6 @@
#include "../../Unicode/utf8_to_iso8859_7.map"
#include "../../Unicode/utf8_to_iso8859_8.map"
#include "../../Unicode/utf8_to_iso8859_9.map"
-#include "../../Unicode/iso8859_16_to_utf8.map"
PG_MODULE_MAGIC;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 31a5ef0..0364709 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -38,10 +38,10 @@
#include "catalog/pg_authid.h"
#include "commands/async.h"
#include "commands/prepare.h"
+#include "commands/trigger.h"
#include "commands/user.h"
#include "commands/vacuum.h"
#include "commands/variable.h"
-#include "commands/trigger.h"
#include "common/string.h"
#include "funcapi.h"
#include "jit/jit.h"
@@ -72,18 +72,18 @@
#include "replication/walsender.h"
#include "storage/bufmgr.h"
#include "storage/dsm_impl.h"
-#include "storage/standby.h"
#include "storage/fd.h"
#include "storage/large_object.h"
#include "storage/pg_shmem.h"
-#include "storage/proc.h"
#include "storage/predicate.h"
+#include "storage/proc.h"
+#include "storage/standby.h"
#include "tcop/tcopprot.h"
#include "tsearch/ts_cache.h"
#include "utils/builtins.h"
#include "utils/bytea.h"
-#include "utils/guc_tables.h"
#include "utils/float.h"
+#include "utils/guc_tables.h"
#include "utils/memutils.h"
#include "utils/pg_locale.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index 2d17839..8cab0e1 100644
--- a/src/backend/utils/misc/pg_config.c
+++ b/src/backend/utils/misc/pg_config.c
@@ -14,12 +14,12 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
#include "catalog/pg_type.h"
#include "common/config_info.h"
-#include "utils/builtins.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "port.h"
+#include "utils/builtins.h"
Datum
pg_config(PG_FUNCTION_ARGS)
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index b429218..3d0916f 100644
--- a/src/backend/utils/misc/pg_controldata.c
+++ b/src/backend/utils/misc/pg_controldata.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/transam.h"
-#include "access/xlog_internal.h"
#include "access/xlog.h"
+#include "access/xlog_internal.h"
#include "catalog/pg_control.h"
#include "catalog/pg_type.h"
#include "common/controldata_utils.h"
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index 67ba95c..6c851dd 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -28,8 +28,8 @@
#include "libpq/libpq.h"
#include "miscadmin.h"
-#include "utils/ps_status.h"
#include "utils/guc.h"
+#include "utils/ps_status.h"
extern char **environ;
bool update_process_title = true;
diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 5636081..327dca6 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -22,10 +22,9 @@
#include "access/htup_details.h"
#include "catalog/pg_authid.h"
+#include "miscadmin.h"
#include "utils/inval.h"
#include "utils/syscache.h"
-#include "miscadmin.h"
-
/*
* In common cases the same roleid (ie, the session or current ID) will
diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c
index 50deb35..db1dac3 100644
--- a/src/backend/utils/mmgr/slab.c
+++ b/src/backend/utils/mmgr/slab.c
@@ -52,10 +52,9 @@
#include "postgres.h"
+#include "lib/ilist.h"
#include "utils/memdebug.h"
#include "utils/memutils.h"
-#include "lib/ilist.h"
-
/*
* SlabContext is a specialized implementation of MemoryContext.
diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c
index deb9af5..16d464d 100644
--- a/src/backend/utils/time/combocid.c
+++ b/src/backend/utils/time/combocid.c
@@ -41,15 +41,14 @@
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/xact.h"
+#include "miscadmin.h"
#include "storage/shmem.h"
#include "utils/combocid.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-
/* Hash table to lookup combo cids by cmin and cmax */
static HTAB *comboHash = NULL;
--
1.8.3.1
Re: Ordering of header file inclusion
On Sun, Oct 20, 2019 at 1:20 AM Peter Eisentraut
<peter.eisentraut@2ndquadrant.com> wrote:
diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c index f9fe57f..6224735 100644 --- a/contrib/bloom/blcost.c +++ b/contrib/bloom/blcost.c @@ -12,10 +12,10 @@ */ #include "postgres.h"+#include "bloom.h"
#include "fmgr.h"
#include "utils/selfuncs.h"-#include "bloom.h"
/*
* Estimate cost of bloom index scan.This class of change I don't like.
The existing arrangement keeps "other" header files separate from the
header file of the module itself. It seems useful to keep that separate.
Thanks Peter for your thoughts, I have modified the changes based on
your suggestions.
I have included the module header file in the beginning.
The changes are attached in the previous mail.
Please let me know your suggestions for any changes.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Sun, Oct 20, 2019 at 2:44 AM Andres Freund <andres@anarazel.de> wrote:
Hi,
On 2019-10-19 21:50:03 +0200, Peter Eisentraut wrote:
diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c index f9fe57f..6224735 100644 --- a/contrib/bloom/blcost.c +++ b/contrib/bloom/blcost.c @@ -12,10 +12,10 @@ */ #include "postgres.h"+#include "bloom.h"
#include "fmgr.h"
#include "utils/selfuncs.h"-#include "bloom.h"
/*
* Estimate cost of bloom index scan.This class of change I don't like.
The existing arrangement keeps "other" header files separate from the
header file of the module itself. It seems useful to keep that separate.If we were to do so, we ought to put bloom.h first and clearly seperated
out, not last, as the former makes the bug of the the header not being
standalone more obvious.I'm -1 on having a policy of putting the headers separate though, I feel
that's too much work, and there's too many cases where it's not that
clear which header that should be.
Thanks Andres for reviewing the changes, I have modified the changes
based on your suggestions.
I have included the module header file in the beginning.
The changes are attached in the previous mail.
Please let me know your suggestions for any changes.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Sun, Oct 20, 2019 at 10:58 PM vignesh C <vignesh21@gmail.com> wrote:
On Thu, Oct 17, 2019 at 4:44 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
I haven't reviewed it completely, but generally, the changes seem to
be fine. Please see if you can be consistent in extra space between
includes. Kindly check the same throughout the patch.Thanks for reviewing the patch.
I have made an updated patch with comments you have suggested.
I have split the patch into 3 patches so that the review can be simpler.
This patch also includes the changes suggested by Peter & Andres.
I had just seen seen Tom Lane's suggestions regarding submodule header
file, this patch contains fix based on Andres suggestions. Let me know
if that need to be changed, I can update it.
AFAICS, none of Andres or Tom seems to be in favor of separating
module headers. I am also not sure if we should try to make sure of
that in every case.
Should we make this changes only in master branch or should we make in
back branches also.
I am in favor of doing this only for HEAD, but I am fine if others
want to see for back branches as well and you can prepare the patches
for the same.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
Amit Kapila <amit.kapila16@gmail.com> writes:
On Sun, Oct 20, 2019 at 10:58 PM vignesh C <vignesh21@gmail.com> wrote:
Should we make this changes only in master branch or should we make in
back branches also.
I am in favor of doing this only for HEAD, but I am fine if others
want to see for back branches as well and you can prepare the patches
for the same.
There is no good reason to back-patch this.
regards, tom lane
Re: Ordering of header file inclusion
On Mon, Oct 21, 2019 at 8:47 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Sun, Oct 20, 2019 at 10:58 PM vignesh C <vignesh21@gmail.com> wrote:
On Thu, Oct 17, 2019 at 4:44 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
I haven't reviewed it completely, but generally, the changes seem to
be fine. Please see if you can be consistent in extra space between
includes. Kindly check the same throughout the patch.Thanks for reviewing the patch.
I have made an updated patch with comments you have suggested.
I have split the patch into 3 patches so that the review can be simpler.
This patch also includes the changes suggested by Peter & Andres.
I had just seen seen Tom Lane's suggestions regarding submodule header
file, this patch contains fix based on Andres suggestions. Let me know
if that need to be changed, I can update it.AFAICS, none of Andres or Tom seems to be in favor of separating
module headers. I am also not sure if we should try to make sure of
that in every case.
Thanks for the suggestions.
Updated patch contains the fix based on Tom Lane's Suggestion.
Let me know your thoughts for further revision if required.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Attachments:
0002-Ordering-of-header-files-in-backend-dir-oct21.patchapplication/octet-stream; name=0002-Ordering-of-header-files-in-backend-dir-oct21.patchDownload
From d10bd21cdb78780d7da8dbc4b5e1e26506bc1425 Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Mon, 21 Oct 2019 22:03:52 +0530
Subject: [PATCH 2/3] Ordering of header files in backend dir.
Ordering of header files that is included in source code in backend dir.
---
src/backend/access/brin/brin_minmax.c | 5 ++--
src/backend/access/brin/brin_pageops.c | 3 +--
src/backend/access/brin/brin_tuple.c | 3 +--
src/backend/access/brin/brin_validate.c | 3 +--
src/backend/access/gin/ginbtree.c | 2 +-
src/backend/access/gin/ginfast.c | 10 ++++----
src/backend/access/gin/gininsert.c | 5 ++--
src/backend/access/gin/ginvalidate.c | 3 +--
src/backend/access/gist/gist.c | 3 +--
src/backend/access/gist/gistget.c | 4 +--
src/backend/access/gist/gistutil.c | 5 ++--
src/backend/access/hash/hash.c | 2 --
src/backend/access/hash/hash_xlog.c | 6 ++---
src/backend/access/hash/hashinsert.c | 4 +--
src/backend/access/hash/hashpage.c | 3 +--
src/backend/access/hash/hashsearch.c | 2 +-
src/backend/access/hash/hashutil.c | 2 +-
src/backend/access/heap/heapam_handler.c | 5 +---
src/backend/access/heap/pruneheap.c | 4 +--
src/backend/access/heap/rewriteheap.c | 12 ++-------
src/backend/access/nbtree/nbtxlog.c | 2 +-
src/backend/access/spgist/spgquadtreeproc.c | 3 +--
src/backend/access/transam/clog.c | 2 +-
src/backend/access/transam/parallel.c | 3 +--
src/backend/access/transam/rmgr.c | 4 +--
src/backend/access/transam/slru.c | 3 +--
src/backend/access/transam/twophase.c | 3 +--
src/backend/access/transam/xact.c | 3 +--
src/backend/access/transam/xlog.c | 6 ++---
src/backend/access/transam/xlogfuncs.c | 7 +++--
src/backend/access/transam/xloginsert.c | 2 +-
src/backend/access/transam/xlogreader.c | 3 +--
src/backend/catalog/aclchk.c | 5 ++--
src/backend/catalog/catalog.c | 3 +--
src/backend/catalog/index.c | 7 +++--
src/backend/catalog/objectaddress.c | 10 ++++----
src/backend/catalog/partition.c | 3 +--
src/backend/catalog/pg_enum.c | 3 +--
src/backend/catalog/pg_publication.c | 9 +++----
src/backend/catalog/pg_shdepend.c | 7 +++--
src/backend/catalog/pg_subscription.c | 10 ++------
src/backend/catalog/pg_type.c | 2 +-
src/backend/catalog/storage.c | 3 +--
src/backend/commands/alter.c | 5 ++--
src/backend/commands/cluster.c | 5 ++--
src/backend/commands/copy.c | 3 +--
src/backend/commands/createas.c | 3 +--
src/backend/commands/dbcommands.c | 3 +--
src/backend/commands/event_trigger.c | 6 ++---
src/backend/commands/functioncmds.c | 2 +-
src/backend/commands/lockcmds.c | 4 +--
src/backend/commands/opclasscmds.c | 3 +--
src/backend/commands/policy.c | 2 +-
src/backend/commands/publicationcmds.c | 10 +++-----
src/backend/commands/schemacmds.c | 3 +--
src/backend/commands/subscriptioncmds.c | 12 ++-------
src/backend/commands/tablecmds.c | 2 --
src/backend/commands/tablespace.c | 3 +--
src/backend/commands/variable.c | 4 +--
src/backend/commands/view.c | 3 +--
src/backend/executor/execAmi.c | 2 --
src/backend/executor/execExprInterp.c | 5 ++--
src/backend/executor/execGrouping.c | 2 +-
src/backend/executor/execParallel.c | 4 +--
src/backend/executor/execProcnode.c | 3 +--
src/backend/executor/execTuples.c | 3 +--
src/backend/executor/nodeAgg.c | 3 +--
src/backend/executor/nodeBitmapHeapscan.c | 3 +--
src/backend/executor/nodeCustom.c | 3 +--
src/backend/executor/nodeHash.c | 3 +--
src/backend/executor/nodeSubplan.c | 3 +--
src/backend/executor/nodeTableFuncscan.c | 3 +--
src/backend/executor/nodeWindowAgg.c | 2 +-
src/backend/jit/jit.c | 7 ++---
src/backend/jit/llvm/llvmjit_expr.c | 3 +--
src/backend/libpq/hba.c | 2 +-
src/backend/nodes/nodeFuncs.c | 3 +--
src/backend/optimizer/geqo/geqo_cx.c | 2 +-
src/backend/optimizer/geqo/geqo_erx.c | 2 +-
src/backend/optimizer/path/clausesel.c | 3 +--
src/backend/optimizer/plan/initsplan.c | 3 +--
src/backend/optimizer/plan/planagg.c | 3 +--
src/backend/optimizer/plan/planner.c | 7 +++--
src/backend/optimizer/prep/preptlist.c | 3 +--
src/backend/optimizer/util/pathnode.c | 3 +--
src/backend/optimizer/util/plancat.c | 7 +++--
src/backend/parser/parse_clause.c | 12 ++++-----
src/backend/parser/parse_expr.c | 3 +--
src/backend/parser/parse_node.c | 3 +--
src/backend/parser/parse_relation.c | 3 +--
src/backend/parser/parse_target.c | 3 +--
src/backend/parser/parse_type.c | 3 +--
src/backend/parser/scansup.c | 3 +--
src/backend/partitioning/partbounds.c | 2 +-
src/backend/partitioning/partdesc.c | 4 +--
src/backend/postmaster/bgworker.c | 2 +-
src/backend/postmaster/bgwriter.c | 3 +--
src/backend/postmaster/pgstat.c | 4 +--
src/backend/replication/basebackup.c | 3 +--
.../libpqwalreceiver/libpqwalreceiver.c | 4 +--
src/backend/replication/logical/decode.c | 7 ++---
src/backend/replication/logical/launcher.c | 16 +++---------
src/backend/replication/logical/logical.c | 10 +++-----
src/backend/replication/logical/logicalfuncs.c | 30 ++++++++--------------
src/backend/replication/logical/message.c | 9 ++-----
src/backend/replication/logical/origin.c | 18 +++++--------
src/backend/replication/logical/snapbuild.c | 15 ++++-------
src/backend/replication/logical/tablesync.c | 13 +++-------
src/backend/replication/pgoutput/pgoutput.c | 5 +---
src/backend/replication/slotfuncs.c | 2 +-
src/backend/rewrite/rowsecurity.c | 2 +-
src/backend/statistics/dependencies.c | 4 +--
src/backend/statistics/mvdistinct.c | 7 +++--
src/backend/storage/buffer/buf_init.c | 3 +--
src/backend/storage/buffer/buf_table.c | 3 +--
src/backend/storage/file/buffile.c | 4 +--
src/backend/storage/file/copydir.c | 4 +--
src/backend/storage/file/fd.c | 3 +--
src/backend/storage/ipc/dsm_impl.c | 6 ++---
src/backend/storage/ipc/ipci.c | 2 +-
src/backend/storage/ipc/procsignal.c | 3 +--
src/backend/storage/ipc/sinvaladt.c | 3 +--
src/backend/storage/lmgr/lwlock.c | 2 +-
src/backend/storage/lmgr/proc.c | 3 +--
src/backend/storage/lmgr/s_lock.c | 3 +--
src/backend/storage/page/checksum.c | 1 -
src/backend/storage/smgr/md.c | 8 +++---
src/backend/storage/sync/sync.c | 8 +++---
src/backend/tcop/postgres.c | 7 +++--
src/backend/tcop/utility.c | 7 +++--
src/backend/tsearch/wparser.c | 3 +--
src/backend/utils/adt/acl.c | 5 ++--
src/backend/utils/adt/datetime.c | 1 -
src/backend/utils/adt/format_type.c | 2 +-
src/backend/utils/adt/int8.c | 3 +--
src/backend/utils/adt/json.c | 4 +--
src/backend/utils/adt/jsonb.c | 4 +--
src/backend/utils/adt/jsonpath_exec.c | 5 ++--
src/backend/utils/adt/misc.c | 7 +++--
src/backend/utils/adt/oracle_compat.c | 3 +--
src/backend/utils/adt/rangetypes_gist.c | 3 +--
src/backend/utils/adt/regproc.c | 4 +--
src/backend/utils/adt/ri_triggers.c | 3 +--
src/backend/utils/adt/ruleutils.c | 3 +--
src/backend/utils/adt/tsquery.c | 2 +-
src/backend/utils/adt/tsquery_cleanup.c | 2 +-
src/backend/utils/adt/tsquery_gist.c | 2 +-
src/backend/utils/adt/tsquery_util.c | 2 +-
src/backend/utils/adt/tsrank.c | 3 +--
src/backend/utils/adt/txid.c | 3 +--
src/backend/utils/adt/varchar.c | 3 +--
src/backend/utils/cache/evtcache.c | 4 +--
src/backend/utils/cache/relcache.c | 3 +--
src/backend/utils/cache/relfilenodemap.c | 2 +-
src/backend/utils/cache/syscache.c | 3 +--
.../utf8_and_cyrillic/utf8_and_cyrillic.c | 2 +-
.../utf8_and_iso8859/utf8_and_iso8859.c | 3 ++-
src/backend/utils/misc/guc.c | 8 +++---
src/backend/utils/misc/pg_config.c | 6 ++---
src/backend/utils/misc/pg_controldata.c | 2 +-
src/backend/utils/misc/ps_status.c | 2 +-
src/backend/utils/misc/superuser.c | 3 +--
src/backend/utils/mmgr/slab.c | 3 +--
src/backend/utils/time/combocid.c | 3 +--
164 files changed, 271 insertions(+), 449 deletions(-)
diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c
index ad0d18e..655c0b5 100644
--- a/src/backend/access/brin/brin_minmax.c
+++ b/src/backend/access/brin/brin_minmax.c
@@ -10,19 +10,18 @@
*/
#include "postgres.h"
-#include "access/genam.h"
#include "access/brin_internal.h"
#include "access/brin_tuple.h"
+#include "access/genam.h"
#include "access/stratnum.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_amop.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/datum.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-
typedef struct MinmaxOpaque
{
Oid cached_subtype;
diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c
index f907b4b..c4cbe84 100644
--- a/src/backend/access/brin/brin_pageops.c
+++ b/src/backend/access/brin/brin_pageops.c
@@ -10,8 +10,8 @@
*/
#include "postgres.h"
-#include "access/brin_pageops.h"
#include "access/brin_page.h"
+#include "access/brin_pageops.h"
#include "access/brin_revmap.h"
#include "access/brin_xlog.h"
#include "access/xloginsert.h"
@@ -22,7 +22,6 @@
#include "storage/smgr.h"
#include "utils/rel.h"
-
/*
* Maximum size of an entry in a BRIN_PAGETYPE_REGULAR page. We can tolerate
* a single item per page, unlike other index AMs.
diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c
index 2b38617..6d24e53 100644
--- a/src/backend/access/brin/brin_tuple.c
+++ b/src/backend/access/brin/brin_tuple.c
@@ -31,14 +31,13 @@
*/
#include "postgres.h"
-#include "access/htup_details.h"
#include "access/brin_tuple.h"
+#include "access/htup_details.h"
#include "access/tupdesc.h"
#include "access/tupmacs.h"
#include "utils/datum.h"
#include "utils/memutils.h"
-
static inline void brin_deconstruct_tuple(BrinDesc *brdesc,
char *tp, bits8 *nullbits, bool nulls,
Datum *values, bool *allnulls, bool *hasnulls);
diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index 0129338..02337a7 100644
--- a/src/backend/access/brin/brin_validate.c
+++ b/src/backend/access/brin/brin_validate.c
@@ -22,9 +22,8 @@
#include "catalog/pg_opfamily.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
-
+#include "utils/syscache.h"
/*
* Validator for a BRIN opclass.
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 4c29261..20adfa2 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -17,8 +17,8 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
#include "access/xloginsert.h"
-#include "storage/predicate.h"
#include "miscadmin.h"
+#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index 439a91b..3d2153b 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -20,19 +20,19 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/xlog.h"
-#include "commands/vacuum.h"
+#include "access/xloginsert.h"
#include "catalog/pg_am.h"
+#include "commands/vacuum.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/acl.h"
#include "postmaster/autovacuum.h"
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
/* GUC parameter */
int gin_pending_list_limit = 0;
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index 55eab14..bdb3d5f 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -16,18 +16,17 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/tableam.h"
+#include "access/xloginsert.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/smgr.h"
#include "storage/indexfsm.h"
#include "storage/predicate.h"
+#include "storage/smgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
typedef struct
{
GinState ginstate;
diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 63bd7f2..5d96f29 100644
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -23,9 +23,8 @@
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
-
+#include "utils/syscache.h"
/*
* Validator for a GIN opclass.
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 0cc8791..8d9c8d0 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -18,15 +18,14 @@
#include "access/gistscan.h"
#include "catalog/pg_collation.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
/* non-export function prototypes */
static void gistfixsplit(GISTInsertState *state, GISTSTATE *giststate);
static bool gistinserttuple(GISTInsertState *state, GISTInsertStack *stack,
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 22d790d..98b6892 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -17,11 +17,11 @@
#include "access/genam.h"
#include "access/gist_private.h"
#include "access/relscan.h"
+#include "lib/pairingheap.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "pgstat.h"
-#include "lib/pairingheap.h"
#include "utils/float.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
index 45804d7..bf2e848 100644
--- a/src/backend/access/gist/gistutil.c
+++ b/src/backend/access/gist/gistutil.c
@@ -22,10 +22,9 @@
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "utils/float.h"
-#include "utils/syscache.h"
-#include "utils/snapmgr.h"
#include "utils/lsyscache.h"
-
+#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
* Write itup vector to page, has no control of free space.
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 5cc30da..cdb6fa9 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -31,8 +31,6 @@
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/rel.h"
-#include "miscadmin.h"
-
/* Working state for hashbuild and its callback */
typedef struct
diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c
index 86e7210..c1d248a 100644
--- a/src/backend/access/hash/hash_xlog.c
+++ b/src/backend/access/hash/hash_xlog.c
@@ -17,11 +17,11 @@
#include "access/bufmask.h"
#include "access/hash.h"
#include "access/hash_xlog.h"
-#include "access/xlogutils.h"
-#include "access/xlog.h"
#include "access/transam.h"
-#include "storage/procarray.h"
+#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* replay a hash index meta page
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 89876d2..e0ca1b0 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -18,10 +18,10 @@
#include "access/hash.h"
#include "access/hash_xlog.h"
#include "miscadmin.h"
-#include "utils/rel.h"
-#include "storage/lwlock.h"
#include "storage/buf_internals.h"
+#include "storage/lwlock.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static void _hash_vacuum_one_page(Relation rel, Relation hrel,
Buffer metabuf, Buffer buf);
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 838ee68..63697bf 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -32,9 +32,8 @@
#include "access/hash_xlog.h"
#include "miscadmin.h"
#include "storage/lmgr.h"
-#include "storage/smgr.h"
#include "storage/predicate.h"
-
+#include "storage/smgr.h"
static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock,
uint32 nblocks);
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 79ae499..725e614 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -18,8 +18,8 @@
#include "access/relscan.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "utils/rel.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static bool _hash_readpage(IndexScanDesc scan, Buffer *bufP,
ScanDirection dir);
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 3fb92ea..c5005f4 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -17,9 +17,9 @@
#include "access/hash.h"
#include "access/reloptions.h"
#include "access/relscan.h"
+#include "storage/buf_internals.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
-#include "storage/buf_internals.h"
#define CALC_NEW_BUCKET(old_bucket, lowmask) \
old_bucket | (lowmask + 1)
diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
index 2dd8821..2c70a87 100644
--- a/src/backend/access/heap/heapam_handler.c
+++ b/src/backend/access/heap/heapam_handler.c
@@ -19,8 +19,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/heaptoast.h"
@@ -35,10 +33,10 @@
#include "catalog/storage_xlog.h"
#include "commands/progress.h"
#include "executor/executor.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
#include "storage/procarray.h"
@@ -46,7 +44,6 @@
#include "utils/builtins.h"
#include "utils/rel.h"
-
static void reform_and_rewrite_tuple(HeapTuple tuple,
Relation OldHeap, Relation NewHeap,
Datum *values, bool *isnull, RewriteState rwstate);
diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
index a0d2217..6d62a96 100644
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@ -16,15 +16,15 @@
#include "access/heapam.h"
#include "access/heapam_xlog.h"
-#include "access/transam.h"
#include "access/htup_details.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
-#include "utils/snapmgr.h"
#include "utils/rel.h"
+#include "utils/snapmgr.h"
/* Working data for heap_page_prune and subroutines */
typedef struct
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
index 306e74e..c1e7d38 100644
--- a/src/backend/access/heap/rewriteheap.c
+++ b/src/backend/access/heap/rewriteheap.c
@@ -105,8 +105,6 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam.h"
#include "access/heapam_xlog.h"
#include "access/heaptoast.h"
@@ -114,25 +112,19 @@
#include "access/transam.h"
#include "access/xact.h"
#include "access/xloginsert.h"
-
#include "catalog/catalog.h"
-
#include "lib/ilist.h"
-
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "replication/logical.h"
#include "replication/slot.h"
-
#include "storage/bufmgr.h"
#include "storage/fd.h"
+#include "storage/procarray.h"
#include "storage/smgr.h"
-
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "storage/procarray.h"
-
/*
* State associated with a rewrite operation. This is opaque to the user
* of the rewrite facility.
diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index dd5315c..44f6283 100644
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -20,8 +20,8 @@
#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlogutils.h"
-#include "storage/procarray.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* _bt_restore_page -- re-enter all the index tuples on a page
diff --git a/src/backend/access/spgist/spgquadtreeproc.c b/src/backend/access/spgist/spgquadtreeproc.c
index e50108e..992c558 100644
--- a/src/backend/access/spgist/spgquadtreeproc.c
+++ b/src/backend/access/spgist/spgquadtreeproc.c
@@ -16,14 +16,13 @@
#include "postgres.h"
#include "access/spgist.h"
-#include "access/stratnum.h"
#include "access/spgist_private.h"
+#include "access/stratnum.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/float.h"
#include "utils/geo_decls.h"
-
Datum
spg_quad_config(PG_FUNCTION_ARGS)
{
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index 595c860..7f7eb21 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -39,8 +39,8 @@
#include "access/xloginsert.h"
#include "access/xlogutils.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "storage/proc.h"
/*
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
index 55d129a..d147236 100644
--- a/src/backend/access/transam/parallel.c
+++ b/src/backend/access/transam/parallel.c
@@ -19,9 +19,9 @@
#include "access/session.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_enum.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
+#include "catalog/pg_enum.h"
#include "commands/async.h"
#include "executor/execParallel.h"
#include "libpq/libpq.h"
@@ -43,7 +43,6 @@
#include "utils/snapmgr.h"
#include "utils/typcache.h"
-
/*
* We don't want to waste a lot of memory on an error queue which, most of
* the time, will process only a handful of small messages. However, it is
diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c
index 9368b56..58091f6 100644
--- a/src/backend/access/transam/rmgr.c
+++ b/src/backend/access/transam/rmgr.c
@@ -7,14 +7,14 @@
*/
#include "postgres.h"
+#include "access/brin_xlog.h"
#include "access/clog.h"
#include "access/commit_ts.h"
+#include "access/generic_xlog.h"
#include "access/ginxlog.h"
#include "access/gistxlog.h"
-#include "access/generic_xlog.h"
#include "access/hash_xlog.h"
#include "access/heapam_xlog.h"
-#include "access/brin_xlog.h"
#include "access/multixact.h"
#include "access/nbtxlog.h"
#include "access/spgxlog.h"
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index e38f919..59bad09 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -54,11 +54,10 @@
#include "access/slru.h"
#include "access/transam.h"
#include "access/xlog.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/fd.h"
#include "storage/shmem.h"
-#include "miscadmin.h"
-
#define SlruFileName(ctl, path, seg) \
snprintf(path, MAXPGPATH, "%s/%04X", (ctl)->Dir, seg)
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 546bd43..712e842 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -85,8 +85,8 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "access/xloginsert.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
+#include "access/xlogutils.h"
#include "catalog/pg_type.h"
#include "catalog/storage.h"
#include "funcapi.h"
@@ -108,7 +108,6 @@
#include "utils/memutils.h"
#include "utils/timestamp.h"
-
/*
* Directory where Two-phase commit files reside within PGDATA
*/
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index fc55fa6..c3a75a5 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -40,6 +40,7 @@
#include "libpq/be-fsstubs.h"
#include "libpq/pqsignal.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "replication/logical.h"
#include "replication/logicallauncher.h"
@@ -65,8 +66,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
-
/*
* User-tweakable parameters
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index b602e28..bfc9dce 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -42,15 +42,16 @@
#include "commands/tablespace.h"
#include "common/controldata_utils.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "port/atomics.h"
#include "postmaster/bgwriter.h"
-#include "postmaster/walwriter.h"
#include "postmaster/startup.h"
+#include "postmaster/walwriter.h"
#include "replication/basebackup.h"
#include "replication/logical.h"
-#include "replication/slot.h"
#include "replication/origin.h"
+#include "replication/slot.h"
#include "replication/snapbuild.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
@@ -74,7 +75,6 @@
#include "utils/relmapper.h"
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
extern uint32 bootstrap_data_checksum_version;
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index 8f17988..1fccf29 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -27,17 +27,16 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "replication/walreceiver.h"
+#include "storage/fd.h"
+#include "storage/ipc.h"
#include "storage/smgr.h"
#include "utils/builtins.h"
+#include "utils/guc.h"
#include "utils/memutils.h"
#include "utils/numeric.h"
-#include "utils/guc.h"
#include "utils/pg_lsn.h"
#include "utils/timestamp.h"
#include "utils/tuplestore.h"
-#include "storage/fd.h"
-#include "storage/ipc.h"
-
/*
* Store label file and tablespace map during non-exclusive backups.
diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c
index 3ec67d4..aa9dca0 100644
--- a/src/backend/access/transam/xloginsert.c
+++ b/src/backend/access/transam/xloginsert.c
@@ -26,11 +26,11 @@
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/proc.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/* Buffer size required to store a compressed version of backup block image */
#define PGLZ_MAX_BLCKSZ PGLZ_MAX_OUTPUT(BLCKSZ)
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index c8b0d23..fb25864 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -18,9 +18,9 @@
#include "postgres.h"
#include "access/transam.h"
-#include "access/xlogrecord.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
+#include "access/xlogrecord.h"
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "replication/origin.h"
@@ -30,7 +30,6 @@
#include "utils/memutils.h"
#endif
-
static void report_invalid_record(XLogReaderState *state, const char *fmt,...)
pg_attribute_printf(2, 3);
static bool allocate_recordbuf(XLogReaderState *state, uint32 reclength);
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 88ce37c..bed10f9 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -52,12 +52,12 @@
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_tablespace.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_transform.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
#include "catalog/pg_ts_template.h"
-#include "catalog/pg_transform.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
@@ -76,7 +76,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
/*
* Internal format used by ALTER DEFAULT PRIVILEGES.
*/
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 1af31c2..6b10469 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -31,9 +31,9 @@
#include "catalog/pg_auth_members.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_pltemplate.h"
-#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_replication_origin.h"
#include "catalog/pg_shdepend.h"
#include "catalog/pg_shdescription.h"
@@ -50,7 +50,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
/*
* IsSystemRelation
* True iff the relation is either a system catalog or a toast table.
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index c48ad93..3508199 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -43,11 +43,11 @@
#include "catalog/pg_am.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
-#include "catalog/pg_description.h"
#include "catalog/pg_depend.h"
+#include "catalog/pg_description.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_tablespace.h"
#include "catalog/pg_trigger.h"
#include "catalog/pg_type.h"
@@ -76,10 +76,9 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_rusage.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/snapmgr.h"
-
/* Potentially set by pg_upgrade_support functions */
Oid binary_upgrade_next_index_pg_class_oid = InvalidOid;
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index ce8a4e9..3544bd0 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -29,13 +29,13 @@
#include "catalog/pg_attrdef.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_cast.h"
-#include "catalog/pg_default_acl.h"
-#include "catalog/pg_enum.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_conversion.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_default_acl.h"
+#include "catalog/pg_enum.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_extension.h"
#include "catalog/pg_foreign_data_wrapper.h"
#include "catalog/pg_foreign_server.h"
@@ -44,10 +44,10 @@
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_opclass.h"
-#include "catalog/pg_opfamily.h"
#include "catalog/pg_operator.h"
-#include "catalog/pg_proc.h"
+#include "catalog/pg_opfamily.h"
#include "catalog/pg_policy.h"
+#include "catalog/pg_proc.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
#include "catalog/pg_rewrite.h"
diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
index 53af14e..5dfa449 100644
--- a/src/backend/catalog/partition.c
+++ b/src/backend/catalog/partition.c
@@ -16,9 +16,9 @@
#include "access/genam.h"
#include "access/htup_details.h"
+#include "access/sysattr.h"
#include "access/table.h"
#include "access/tupconvert.h"
-#include "access/sysattr.h"
#include "catalog/indexing.h"
#include "catalog/partition.h"
#include "catalog/pg_inherits.h"
@@ -32,7 +32,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static Oid get_partition_parent_worker(Relation inhRel, Oid relid);
static void get_partition_ancestors_worker(Relation inhRel, Oid relid,
List **ancestors);
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index d0ff802..be0f065 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -22,9 +22,9 @@
#include "catalog/indexing.h"
#include "catalog/pg_enum.h"
#include "catalog/pg_type.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "nodes/value.h"
+#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/fmgroids.h"
@@ -32,7 +32,6 @@
#include "utils/memutils.h"
#include "utils/syscache.h"
-
/* Potentially set by pg_upgrade_support functions */
Oid binary_upgrade_next_pg_enum_oid = InvalidOid;
diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index fd5da7d..d442c8e 100644
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -14,15 +14,11 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/index.h"
@@ -30,10 +26,11 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
-
+#include "catalog/pg_type.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index fb7f8dd..59f97bf 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -34,8 +34,8 @@
#include "catalog/pg_largeobject.h"
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_shdepend.h"
@@ -47,9 +47,9 @@
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
#include "commands/alter.h"
-#include "commands/dbcommands.h"
#include "commands/collationcmds.h"
#include "commands/conversioncmds.h"
+#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
@@ -60,13 +60,12 @@
#include "commands/subscriptioncmds.h"
#include "commands/tablecmds.h"
#include "commands/typecmds.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
+#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/fmgroids.h"
#include "utils/syscache.h"
-
typedef enum
{
LOCAL_OBJECT,
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index afee283..68d88ff 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -14,23 +14,18 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/indexing.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "catalog/pg_type.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
-
#include "storage/lmgr.h"
-
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
@@ -38,7 +33,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static List *textarray_to_stringlist(ArrayType *textarray);
/*
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 2a51501..a8c1de5 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-#include "catalog/catalog.h"
#include "catalog/binary_upgrade.h"
+#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/objectaccess.h"
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index b8c9b6f..e22dec1 100644
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -19,8 +19,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/visibilitymap.h"
#include "access/xact.h"
#include "access/xlog.h"
@@ -28,6 +26,7 @@
#include "access/xlogutils.h"
#include "catalog/storage.h"
#include "catalog/storage_xlog.h"
+#include "miscadmin.h"
#include "storage/freespace.h"
#include "storage/smgr.h"
#include "utils/memutils.h"
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 70dbcb0..af1aca9 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -34,8 +34,8 @@
#include "catalog/pg_opclass.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
-#include "catalog/pg_subscription.h"
#include "catalog/pg_statistic_ext.h"
+#include "catalog/pg_subscription.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
@@ -57,8 +57,8 @@
#include "commands/trigger.h"
#include "commands/typecmds.h"
#include "commands/user.h"
-#include "parser/parse_func.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
#include "rewrite/rewriteDefine.h"
#include "tcop/utility.h"
#include "utils/builtins.h"
@@ -67,7 +67,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static Oid AlterObjectNamespace_internal(Relation rel, Oid objid, Oid nspOid);
/*
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index a23128d..b8c349f 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -22,17 +22,17 @@
#include "access/multixact.h"
#include "access/relscan.h"
#include "access/tableam.h"
-#include "access/transam.h"
#include "access/toast_internals.h"
+#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_am.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/heap.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_am.h"
#include "catalog/toasting.h"
#include "commands/cluster.h"
#include "commands/progress.h"
@@ -55,7 +55,6 @@
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-
/*
* This struct is used to pass around the information on tables to be
* clustered. We need this so we can make a list of them when invoked without
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 3aeef30..7a866b5 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -39,8 +39,8 @@
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
-#include "optimizer/optimizer.h"
#include "nodes/makefuncs.h"
+#include "optimizer/optimizer.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
#include "parser/parse_expr.h"
@@ -58,7 +58,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
#define OCTVALUE(c) ((c) - '0')
diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c
index b7d2206..2bf7083 100644
--- a/src/backend/commands/createas.c
+++ b/src/backend/commands/createas.c
@@ -25,8 +25,8 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -51,7 +51,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
typedef struct
{
DestReceiver pub; /* publicly-known function pointers */
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 01d6621..aa03172 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -53,8 +53,8 @@
#include "replication/slot.h"
#include "storage/copydir.h"
#include "storage/fd.h"
-#include "storage/lmgr.h"
#include "storage/ipc.h"
+#include "storage/lmgr.h"
#include "storage/md.h"
#include "storage/procarray.h"
#include "storage/smgr.h"
@@ -65,7 +65,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
typedef struct
{
Oid src_dboid; /* source (template) DB */
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index f7ee983..8657df6 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -33,11 +33,12 @@
#include "commands/extension.h"
#include "commands/trigger.h"
#include "funcapi.h"
-#include "parser/parse_func.h"
-#include "pgstat.h"
#include "lib/ilist.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
+#include "pgstat.h"
#include "tcop/deparse_utility.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/evtcache.h"
@@ -46,7 +47,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
typedef struct EventTriggerQueryState
{
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 40f1f9a..94411b5 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -34,8 +34,8 @@
#include "access/genam.h"
#include "access/htup_details.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index bae3b38..2621e36 100644
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -20,13 +20,13 @@
#include "catalog/pg_inherits.h"
#include "commands/lockcmds.h"
#include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
#include "parser/parse_clause.h"
+#include "rewrite/rewriteHandler.h"
#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "rewrite/rewriteHandler.h"
-#include "nodes/nodeFuncs.h"
static void LockTableRecurse(Oid reloid, LOCKMODE lockmode, bool nowait, Oid userid);
static AclResult LockTableAclCheck(Oid relid, LOCKMODE lockmode, Oid userid);
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index 6a1ccde..cb7a6bd 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -19,8 +19,8 @@
#include "access/genam.h"
#include "access/hash.h"
-#include "access/nbtree.h"
#include "access/htup_details.h"
+#include "access/nbtree.h"
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/catalog.h"
@@ -50,7 +50,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterOpFamilyAdd(AlterOpFamilyStmt *stmt,
Oid amoid, Oid opfamilyoid,
int maxOpNumber, int maxProcNumber,
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index 1df7662..36093dc 100644
--- a/src/backend/commands/policy.c
+++ b/src/backend/commands/policy.c
@@ -16,8 +16,8 @@
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index f115d4b..fbf11c8 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -14,29 +14,25 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/publicationcmds.h"
-
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 6cf94a3..7cf3cc1 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -21,8 +21,8 @@
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_namespace.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterSchemaOwner_internal(HeapTuple tup, Relation rel, Oid newOwnerId);
/*
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 2e67a58..6b33cd6 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -14,38 +14,30 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/subscriptioncmds.h"
-
#include "executor/executor.h"
-
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
-
#include "replication/logicallauncher.h"
#include "replication/origin.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
#include "replication/worker_internal.h"
-
#include "storage/lmgr.h"
-
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 8d25d14..97acdb1 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -20,7 +20,6 @@
#include "access/multixact.h"
#include "access/reloptions.h"
#include "access/relscan.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/tupconvert.h"
@@ -100,7 +99,6 @@
#include "utils/timestamp.h"
#include "utils/typcache.h"
-
/*
* ON COMMIT action list
*/
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 84efb41..570dcb2 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -51,8 +51,8 @@
#include <sys/stat.h>
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -84,7 +84,6 @@
#include "utils/rel.h"
#include "utils/varlena.h"
-
/* GUC variables */
char *default_tablespace = NULL;
char *temp_tablespaces = NULL;
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 1119e21..a0bd8c3 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -24,14 +24,14 @@
#include "access/xlog.h"
#include "catalog/pg_authid.h"
#include "commands/variable.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
/*
* DATESTYLE
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index bea890f..9fa433a 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -26,8 +26,8 @@
#include "parser/analyze.h"
#include "parser/parse_relation.h"
#include "rewrite/rewriteDefine.h"
-#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteHandler.h"
+#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteSupport.h"
#include "utils/acl.h"
#include "utils/builtins.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc);
/*---------------------------------------------------------------------
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 1f18e5d..779d3dc 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -28,7 +28,6 @@
#include "executor/nodeGather.h"
#include "executor/nodeGatherMerge.h"
#include "executor/nodeGroup.h"
-#include "executor/nodeGroup.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
#include "executor/nodeIndexonlyscan.h"
@@ -62,7 +61,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static bool IndexSupportsBackwardScan(Oid indexid);
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
index 0cd6f65..dbed597 100644
--- a/src/backend/executor/execExprInterp.c
+++ b/src/backend/executor/execExprInterp.c
@@ -62,22 +62,21 @@
#include "executor/execExpr.h"
#include "executor/nodeSubplan.h"
#include "funcapi.h"
-#include "utils/array.h"
-#include "utils/memutils.h"
#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
#include "parser/parsetree.h"
#include "pgstat.h"
+#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datum.h"
#include "utils/expandedrecord.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/timestamp.h"
#include "utils/typcache.h"
#include "utils/xml.h"
-
/*
* Use computed-goto-based opcode dispatch when computed gotos are available.
* But use a separate symbol so that it's easy to adjust locally in this file
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index 6349c11..7bc5e40 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -21,8 +21,8 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "miscadmin.h"
-#include "utils/lsyscache.h"
#include "utils/hashutils.h"
+#include "utils/lsyscache.h"
#include "utils/memutils.h"
static uint32 TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple);
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 53cd2fc..b256642 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -31,14 +31,15 @@
#include "executor/nodeForeignscan.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
-#include "executor/nodeIndexscan.h"
#include "executor/nodeIndexonlyscan.h"
+#include "executor/nodeIndexscan.h"
#include "executor/nodeSeqscan.h"
#include "executor/nodeSort.h"
#include "executor/nodeSubplan.h"
#include "executor/tqueue.h"
#include "jit/jit.h"
#include "nodes/nodeFuncs.h"
+#include "pgstat.h"
#include "storage/spin.h"
#include "tcop/tcopprot.h"
#include "utils/datum.h"
@@ -46,7 +47,6 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
-#include "pgstat.h"
/*
* Magic numbers for parallel executor communication. We use constants
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index c227282..7a6e285 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -113,9 +113,8 @@
#include "executor/nodeValuesscan.h"
#include "executor/nodeWindowAgg.h"
#include "executor/nodeWorktablescan.h"
-#include "nodes/nodeFuncs.h"
#include "miscadmin.h"
-
+#include "nodes/nodeFuncs.h"
static TupleTableSlot *ExecProcNodeFirst(PlanState *node);
static TupleTableSlot *ExecProcNodeInstr(PlanState *node);
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 87bc510..da43057 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -60,8 +60,8 @@
#include "access/heaptoast.h"
#include "access/htup_details.h"
#include "access/tupdesc_details.h"
-#include "funcapi.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
#include "nodes/nodeFuncs.h"
#include "storage/bufmgr.h"
#include "utils/builtins.h"
@@ -69,7 +69,6 @@
#include "utils/lsyscache.h"
#include "utils/typcache.h"
-
static TupleDesc ExecTypeFromTLInternal(List *targetList,
bool skipjunk);
static pg_attribute_always_inline void slot_deform_heap_tuple(TupleTableSlot *slot, HeapTuple tuple, uint32 *offp,
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 58c376a..6ee24ea 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -231,13 +231,12 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/datum.h"
#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/datum.h"
-
static void select_current_set(AggState *aggstate, int setno, bool is_hash);
static void initialize_phase(AggState *aggstate, int newphase);
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index f62105f..256d61a 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -49,9 +49,8 @@
#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "utils/spccache.h"
#include "utils/snapmgr.h"
-
+#include "utils/spccache.h"
static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node);
static inline void BitmapDoneInitializingSharedState(ParallelBitmapHeapState *pstate);
diff --git a/src/backend/executor/nodeCustom.c b/src/backend/executor/nodeCustom.c
index 6dd0916..ccaa68b 100644
--- a/src/backend/executor/nodeCustom.c
+++ b/src/backend/executor/nodeCustom.c
@@ -13,16 +13,15 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "executor/nodeCustom.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
#include "nodes/extensible.h"
#include "nodes/plannodes.h"
-#include "miscadmin.h"
#include "parser/parsetree.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
static TupleTableSlot *ExecCustomScan(PlanState *pstate);
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 224cbb3..d6f4eda 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -38,11 +38,10 @@
#include "pgstat.h"
#include "port/atomics.h"
#include "utils/dynahash.h"
-#include "utils/memutils.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/syscache.h"
-
static void ExecHashIncreaseNumBatches(HashJoinTable hashtable);
static void ExecHashIncreaseNumBuckets(HashJoinTable hashtable);
static void ExecParallelHashIncreaseNumBatches(HashJoinTable hashtable);
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 1991b90..2c364bd 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -32,14 +32,13 @@
#include "access/htup_details.h"
#include "executor/executor.h"
#include "executor/nodeSubplan.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "miscadmin.h"
#include "utils/array.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-
static Datum ExecHashSubPlan(SubPlanState *node,
ExprContext *econtext,
bool *isNull);
diff --git a/src/backend/executor/nodeTableFuncscan.c b/src/backend/executor/nodeTableFuncscan.c
index d264337..21cf3ca 100644
--- a/src/backend/executor/nodeTableFuncscan.c
+++ b/src/backend/executor/nodeTableFuncscan.c
@@ -22,17 +22,16 @@
*/
#include "postgres.h"
-#include "nodes/execnodes.h"
#include "executor/executor.h"
#include "executor/nodeTableFuncscan.h"
#include "executor/tablefunc.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/xml.h"
-
static TupleTableSlot *TableFuncNext(TableFuncScanState *node);
static bool TableFuncRecheck(TableFuncScanState *node, TupleTableSlot *slot);
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index b5d3f3c..f1b9407 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -46,8 +46,8 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/expandeddatum.h"
#include "utils/datum.h"
+#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/regproc.h"
diff --git a/src/backend/jit/jit.c b/src/backend/jit/jit.c
index 43e65b1..e066f72 100644
--- a/src/backend/jit/jit.c
+++ b/src/backend/jit/jit.c
@@ -17,19 +17,16 @@
*/
#include "postgres.h"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-
-#include "fmgr.h"
#include "executor/execExpr.h"
+#include "fmgr.h"
#include "jit/jit.h"
#include "miscadmin.h"
-#include "utils/resowner_private.h"
#include "utils/fmgrprotos.h"
-
+#include "utils/resowner_private.h"
/* GUCs */
bool jit_enabled = true;
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index d093246..a9d3621 100644
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -23,10 +23,10 @@
#include "access/tupconvert.h"
#include "catalog/objectaccess.h"
#include "catalog/pg_type.h"
+#include "executor/execExpr.h"
#include "executor/execdebug.h"
#include "executor/nodeAgg.h"
#include "executor/nodeSubplan.h"
-#include "executor/execExpr.h"
#include "funcapi.h"
#include "jit/llvmjit.h"
#include "jit/llvmjit_emit.h"
@@ -46,7 +46,6 @@
#include "utils/typcache.h"
#include "utils/xml.h"
-
typedef struct CompiledExprState
{
LLVMJitContext *context;
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 2221c04..7f59a29 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -39,10 +39,10 @@
#include "storage/fd.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/varlena.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/varlena.h"
#ifdef USE_LDAP
#ifdef WIN32
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index b655931..bcada74 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -17,14 +17,13 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "miscadmin.h"
-#include "nodes/makefuncs.h"
#include "nodes/execnodes.h"
+#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "nodes/pathnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-
static bool expression_returns_set_walker(Node *node, void *context);
static int leftmostLoc(int loc1, int loc2);
static bool fix_opfuncids_walker(Node *node, void *context);
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index a546908..3b8d2fe 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -35,8 +35,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(CX)
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index fbabe2e..3b92f42 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -32,8 +32,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(ERX)
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 4bf777d..fe02050 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -21,11 +21,10 @@
#include "optimizer/optimizer.h"
#include "optimizer/pathnode.h"
#include "optimizer/plancat.h"
+#include "statistics/statistics.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
-#include "statistics/statistics.h"
-
/*
* Data structure for accumulating info about possible range-query
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 274fea0..fa63a38 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -14,8 +14,8 @@
*/
#include "postgres.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/clauses.h"
@@ -34,7 +34,6 @@
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
-
/* These parameters are set by GUC */
int from_collapse_limit;
int join_collapse_limit;
diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c
index 9381939..974f620 100644
--- a/src/backend/optimizer/plan/planagg.c
+++ b/src/backend/optimizer/plan/planagg.c
@@ -41,13 +41,12 @@
#include "optimizer/planmain.h"
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_clause.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
static bool find_minmax_aggs_walker(Node *node, List **context);
static bool build_minmax_path(PlannerInfo *root, MinMaxAggInfo *mminfo,
Oid eqop, Oid sortop, bool nulls_first);
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 17c5f08..7fe11b5 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -31,10 +31,10 @@
#include "executor/executor.h"
#include "executor/nodeAgg.h"
#include "foreign/fdwapi.h"
-#include "miscadmin.h"
#include "jit/jit.h"
#include "lib/bipartite_match.h"
#include "lib/knapsack.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#ifdef OPTIMIZER_DEBUG
@@ -55,17 +55,16 @@
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
#include "parser/parse_agg.h"
+#include "parser/parsetree.h"
#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "storage/dsm_impl.h"
+#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/selfuncs.h"
-#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
/* GUC parameters */
double cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION;
int force_parallel_mode = FORCE_PARALLEL_OFF;
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 792ae39..0da43ef 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -47,12 +47,11 @@
#include "optimizer/optimizer.h"
#include "optimizer/prep.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteHandler.h"
#include "utils/rel.h"
-
static List *expand_targetlist(List *tlist, int command_type,
Index result_relation, Relation rel);
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 34acb73..60c93ee 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -16,8 +16,8 @@
#include <math.h>
-#include "miscadmin.h"
#include "foreign/fdwapi.h"
+#include "miscadmin.h"
#include "nodes/extensible.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/appendinfo.h"
@@ -35,7 +35,6 @@
#include "utils/memutils.h"
#include "utils/selfuncs.h"
-
typedef enum
{
COSTS_EQUAL, /* path costs are fuzzily equal */
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index e5f9e04..5e889d1 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -20,9 +20,9 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/nbtree.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/table.h"
+#include "access/tableam.h"
#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
@@ -40,9 +40,9 @@
#include "optimizer/optimizer.h"
#include "optimizer/plancat.h"
#include "optimizer/prep.h"
-#include "partitioning/partdesc.h"
#include "parser/parse_relation.h"
#include "parser/parsetree.h"
+#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "statistics/statistics.h"
#include "storage/bufmgr.h"
@@ -50,9 +50,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
-
+#include "utils/syscache.h"
/* GUC parameter */
int constraint_exclusion = CONSTRAINT_EXCLUSION_PARTITION;
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 260ccd4..fe41918 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -15,8 +15,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/nbtree.h"
#include "access/table.h"
@@ -29,12 +27,11 @@
#include "catalog/pg_constraint.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
-#include "parser/parser.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -44,14 +41,15 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/builtins.h"
-#include "utils/guc.h"
#include "utils/catcache.h"
+#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
-
+#include "utils/syscache.h"
/* Convenience macro for the most common makeNamespaceItem() case */
#define makeDefaultNSItem(rte) makeNamespaceItem(rte, true, true, false, true)
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 76f3dd7..eb91da2 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -22,6 +22,7 @@
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
+#include "parser/parse_agg.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -31,14 +32,12 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
-#include "parser/parse_agg.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/lsyscache.h"
#include "utils/timestamp.h"
#include "utils/xml.h"
-
/* GUC parameters */
bool operator_precedence_warning = false;
bool Transform_null_equals = false;
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 1baf7ef..bc832e7 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -20,17 +20,16 @@
#include "mb/pg_wchar.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_relation.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/int8.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/varbit.h"
-
static void pcb_error_callback(void *arg);
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 4dd8150..47188fc 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -26,10 +26,10 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_enr.h"
#include "parser/parse_relation.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
@@ -37,7 +37,6 @@
#include "utils/syscache.h"
#include "utils/varlena.h"
-
#define MAX_FUZZY_DISTANCE 3
static RangeTblEntry *scanNameSpaceForRefname(ParseState *pstate,
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 2901025..30d419e 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -20,19 +20,18 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_func.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/typcache.h"
-
static void markTargetListOrigin(ParseState *pstate, TargetEntry *tle,
Var *var, int levelsup);
static Node *transformAssignmentIndirection(ParseState *pstate,
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 7932a96..78fef26 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -19,14 +19,13 @@
#include "catalog/pg_type.h"
#include "lib/stringinfo.h"
#include "nodes/makefuncs.h"
-#include "parser/parser.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
static int32 typenameTypeMod(ParseState *pstate, const TypeName *typeName,
Type typ);
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index 53e3ae2..7745e8d 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -17,9 +17,8 @@
#include <ctype.h>
-#include "parser/scansup.h"
#include "mb/pg_wchar.h"
-
+#include "parser/scansup.h"
/* ----------------
* scanstr
diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c
index 318d8ec..2004e00 100644
--- a/src/backend/partitioning/partbounds.c
+++ b/src/backend/partitioning/partbounds.c
@@ -36,8 +36,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/snapmgr.h"
#include "utils/ruleutils.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
/*
diff --git a/src/backend/partitioning/partdesc.c b/src/backend/partitioning/partdesc.c
index b207b76..6ede084 100644
--- a/src/backend/partitioning/partdesc.c
+++ b/src/backend/partitioning/partdesc.c
@@ -25,13 +25,13 @@
#include "storage/bufmgr.h"
#include "storage/sinval.h"
#include "utils/builtins.h"
-#include "utils/inval.h"
#include "utils/fmgroids.h"
#include "utils/hsearch.h"
+#include "utils/inval.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-#include "utils/rel.h"
#include "utils/partcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
typedef struct PartitionDirectoryData
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index b66b517..5f8a007 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -14,8 +14,8 @@
#include <unistd.h>
-#include "libpq/pqsignal.h"
#include "access/parallel.h"
+#include "libpq/pqsignal.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "port/atomics.h"
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index 8ec16a3..847d96c 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -38,8 +38,8 @@
#include <sys/time.h>
#include <unistd.h>
-#include "access/xlog.h"
#include "access/xlog_internal.h"
+#include "access/xlog.h"
#include "libpq/pqsignal.h"
#include "miscadmin.h"
#include "pgstat.h"
@@ -60,7 +60,6 @@
#include "utils/resowner.h"
#include "utils/timestamp.h"
-
/*
* GUC parameters
*/
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 011076c..fabcf31 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -32,8 +32,6 @@
#include <sys/select.h>
#endif
-#include "pgstat.h"
-
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
@@ -48,6 +46,7 @@
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/autovacuum.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
@@ -69,7 +68,6 @@
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-
/* ----------
* Timer definitions.
* ----------
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index d0f210d..1fa4551 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -24,8 +24,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
#include "nodes/pg_list.h"
-#include "pgtar.h"
#include "pgstat.h"
+#include "pgtar.h"
#include "port.h"
#include "postmaster/syslogger.h"
#include "replication/basebackup.h"
@@ -42,7 +42,6 @@
#include "utils/relcache.h"
#include "utils/timestamp.h"
-
typedef struct
{
const char *label;
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 6eba08a..545d2fc 100644
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -19,14 +19,14 @@
#include <unistd.h>
#include <sys/time.h>
-#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "access/xlog.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "libpq-fe.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "pqexpbuffer.h"
#include "replication/walreceiver.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
index c53e7e2..bc532d0 100644
--- a/src/backend/replication/logical/decode.c
+++ b/src/backend/replication/logical/decode.c
@@ -31,19 +31,16 @@
#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog_internal.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-
+#include "access/xlogutils.h"
#include "catalog/pg_control.h"
-
#include "replication/decode.h"
#include "replication/logical.h"
#include "replication/message.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
#include "storage/standby.h"
typedef struct XLogRecordBuffer
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index 186057b..1f8821c 100644
--- a/src/backend/replication/logical/launcher.c
+++ b/src/backend/replication/logical/launcher.c
@@ -17,43 +17,35 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/heapam.h"
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "funcapi.h"
#include "libpq/pqsignal.h"
-
+#include "miscadmin.h"
+#include "pgstat.h"
#include "postmaster/bgworker.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
-
#include "replication/logicallauncher.h"
#include "replication/logicalworker.h"
#include "replication/slot.h"
#include "replication/walreceiver.h"
#include "replication/worker_internal.h"
-
#include "storage/ipc.h"
#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/procsignal.h"
-
#include "tcop/tcopprot.h"
-
#include "utils/memutils.h"
#include "utils/pg_lsn.h"
#include "utils/ps_status.h"
-#include "utils/timeout.h"
#include "utils/snapmgr.h"
+#include "utils/timeout.h"
/* max sleep time between cycles (3min) */
#define DEFAULT_NAPTIME_PER_CYCLE 180000L
diff --git a/src/backend/replication/logical/logical.c b/src/backend/replication/logical/logical.c
index da265f5..7e06615 100644
--- a/src/backend/replication/logical/logical.c
+++ b/src/backend/replication/logical/logical.c
@@ -28,21 +28,17 @@
#include "postgres.h"
-#include "fmgr.h"
-#include "miscadmin.h"
-
#include "access/xact.h"
#include "access/xlog_internal.h"
-
+#include "fmgr.h"
+#include "miscadmin.h"
#include "replication/decode.h"
#include "replication/logical.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
#include "storage/proc.h"
#include "storage/procarray.h"
-
#include "utils/memutils.h"
/* data for errcontext callback */
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c
index d1cf80d..aa2106b 100644
--- a/src/backend/replication/logical/logicalfuncs.c
+++ b/src/backend/replication/logical/logicalfuncs.c
@@ -17,36 +17,28 @@
#include <unistd.h>
-#include "fmgr.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
+#include "access/xact.h"
#include "access/xlog_internal.h"
#include "access/xlogutils.h"
-
-#include "access/xact.h"
-
#include "catalog/pg_type.h"
-
-#include "nodes/makefuncs.h"
-
+#include "fmgr.h"
+#include "funcapi.h"
#include "mb/pg_wchar.h"
-
+#include "miscadmin.h"
+#include "nodes/makefuncs.h"
+#include "replication/decode.h"
+#include "replication/logical.h"
+#include "replication/logicalfuncs.h"
+#include "replication/message.h"
+#include "storage/fd.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/inval.h"
+#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_lsn.h"
#include "utils/regproc.h"
#include "utils/resowner.h"
-#include "utils/lsyscache.h"
-
-#include "replication/decode.h"
-#include "replication/logical.h"
-#include "replication/logicalfuncs.h"
-#include "replication/message.h"
-
-#include "storage/fd.h"
/* private date for writing out data */
typedef struct DecodingOutputState
diff --git a/src/backend/replication/logical/message.c b/src/backend/replication/logical/message.c
index 0681cb4..1652546 100644
--- a/src/backend/replication/logical/message.c
+++ b/src/backend/replication/logical/message.c
@@ -31,17 +31,12 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/xact.h"
-
#include "catalog/indexing.h"
-
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-
-#include "replication/message.h"
#include "replication/logical.h"
-
+#include "replication/message.h"
#include "utils/memutils.h"
/*
diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c
index 07ae613..a590f9c 100644
--- a/src/backend/replication/logical/origin.c
+++ b/src/backend/replication/logical/origin.c
@@ -70,33 +70,29 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/indexing.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-
-#include "replication/origin.h"
-#include "replication/logical.h"
#include "pgstat.h"
+#include "replication/logical.h"
+#include "replication/origin.h"
+#include "storage/condition_variable.h"
+#include "storage/copydir.h"
#include "storage/fd.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
-#include "storage/condition_variable.h"
-#include "storage/copydir.h"
-
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/pg_lsn.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
* Replay progress of a single remote node.
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index 0bd1d0f..5112eca 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -120,29 +120,24 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam_xlog.h"
#include "access/transam.h"
#include "access/xact.h"
-
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "replication/logical.h"
#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
-#include "utils/builtins.h"
-#include "utils/memutils.h"
-#include "utils/snapshot.h"
-#include "utils/snapmgr.h"
-
#include "storage/block.h" /* debugging output */
#include "storage/fd.h"
#include "storage/lmgr.h"
#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/standby.h"
+#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/snapmgr.h"
+#include "utils/snapshot.h"
/*
* This struct contains the current state of the snapshot building
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
index 7881079..e01d18c 100644
--- a/src/backend/replication/logical/tablesync.c
+++ b/src/backend/replication/logical/tablesync.c
@@ -85,30 +85,23 @@
#include "postgres.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/pg_subscription_rel.h"
#include "catalog/pg_type.h"
-
#include "commands/copy.h"
-
+#include "miscadmin.h"
#include "parser/parse_relation.h"
-
+#include "pgstat.h"
#include "replication/logicallauncher.h"
#include "replication/logicalrelation.h"
#include "replication/walreceiver.h"
#include "replication/worker_internal.h"
-
-#include "utils/snapmgr.h"
#include "storage/ipc.h"
-
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/snapmgr.h"
static bool table_states_valid = false;
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index 9c08757..3483c1b 100644
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -13,16 +13,13 @@
#include "postgres.h"
#include "catalog/pg_publication.h"
-
#include "fmgr.h"
-
#include "replication/logical.h"
#include "replication/logicalproto.h"
#include "replication/origin.h"
#include "replication/pgoutput.h"
-
-#include "utils/inval.h"
#include "utils/int8.h"
+#include "utils/inval.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/varlena.h"
diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c
index 42da631..46e6dd4 100644
--- a/src/backend/replication/slotfuncs.c
+++ b/src/backend/replication/slotfuncs.c
@@ -17,9 +17,9 @@
#include "funcapi.h"
#include "miscadmin.h"
#include "replication/decode.h"
-#include "replication/slot.h"
#include "replication/logical.h"
#include "replication/logicalfuncs.h"
+#include "replication/slot.h"
#include "utils/builtins.h"
#include "utils/inval.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c
index 1c44714..df7bde3 100644
--- a/src/backend/rewrite/rowsecurity.c
+++ b/src/backend/rewrite/rowsecurity.c
@@ -51,12 +51,12 @@
#include "rewrite/rewriteHandler.h"
#include "rewrite/rewriteManip.h"
#include "rewrite/rowsecurity.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/rls.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
static void get_policies_for_relation(Relation relation,
CmdType cmd, Oid user_id,
diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 585cad2..9493b2d 100644
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -20,10 +20,10 @@
#include "catalog/pg_statistic_ext_data.h"
#include "lib/stringinfo.h"
#include "nodes/nodeFuncs.h"
-#include "optimizer/clauses.h"
-#include "optimizer/optimizer.h"
#include "nodes/nodes.h"
#include "nodes/pathnodes.h"
+#include "optimizer/clauses.h"
+#include "optimizer/optimizer.h"
#include "statistics/extended_stats_internal.h"
#include "statistics/statistics.h"
#include "utils/bytea.h"
diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c
index f3383c0..4ccfc5f 100644
--- a/src/backend/statistics/mvdistinct.c
+++ b/src/backend/statistics/mvdistinct.c
@@ -28,14 +28,13 @@
#include "access/htup_details.h"
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_statistic_ext_data.h"
+#include "lib/stringinfo.h"
+#include "statistics/extended_stats_internal.h"
+#include "statistics/statistics.h"
#include "utils/fmgrprotos.h"
#include "utils/lsyscache.h"
-#include "lib/stringinfo.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "statistics/extended_stats_internal.h"
-#include "statistics/statistics.h"
-
static double ndistinct_for_combination(double totalrows, int numrows,
HeapTuple *rows, VacAttrStats **stats,
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index ccd2c31..1eb08cd 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -14,9 +14,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
-
+#include "storage/bufmgr.h"
BufferDescPadded *BufferDescriptors;
char *BufferBlocks;
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index e546585..7e44b51 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -21,9 +21,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
-
+#include "storage/bufmgr.h"
/* entry for buffer lookup hashtable */
typedef struct
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index b40e6f3..440ff77 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -45,9 +45,9 @@
#include "executor/instrument.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "storage/fd.h"
-#include "storage/buffile.h"
#include "storage/buf_internals.h"
+#include "storage/buffile.h"
+#include "storage/fd.h"
#include "utils/resowner.h"
/*
diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c
index ca1c9cd..c94ce5b 100644
--- a/src/backend/storage/file/copydir.c
+++ b/src/backend/storage/file/copydir.c
@@ -22,10 +22,10 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "storage/copydir.h"
-#include "storage/fd.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "storage/copydir.h"
+#include "storage/fd.h"
/*
* copydir: copy a directory
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index fe2bb8f..f18bcb2 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -79,11 +79,11 @@
#include <sys/resource.h> /* for getrlimit */
#endif
-#include "miscadmin.h"
#include "access/xact.h"
#include "access/xlog.h"
#include "catalog/pg_tablespace.h"
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "portability/mem.h"
#include "storage/fd.h"
@@ -91,7 +91,6 @@
#include "utils/guc.h"
#include "utils/resowner_private.h"
-
/* Define PG_FLUSH_DATA_WORKS if we have an implementation for pg_flush_data */
#if defined(HAVE_SYNC_FILE_RANGE)
#define PG_FLUSH_DATA_WORKS 1
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
index 2879b84..d550093 100644
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -47,7 +47,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include <fcntl.h>
#include <unistd.h>
@@ -61,15 +60,16 @@
#ifdef HAVE_SYS_SHM_H
#include <sys/shm.h>
#endif
+
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "portability/mem.h"
+#include "postmaster/postmaster.h"
#include "storage/dsm_impl.h"
#include "storage/fd.h"
#include "utils/guc.h"
#include "utils/memutils.h"
-#include "postmaster/postmaster.h"
#ifdef USE_DSM_POSIX
static bool dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 8853706..4829953 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -29,10 +29,10 @@
#include "postmaster/bgwriter.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
+#include "replication/origin.h"
#include "replication/slot.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
-#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/dsm.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 7605b2c..fde97a1 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -21,14 +21,13 @@
#include "commands/async.h"
#include "miscadmin.h"
#include "replication/walsender.h"
-#include "storage/latch.h"
#include "storage/ipc.h"
+#include "storage/latch.h"
#include "storage/proc.h"
#include "storage/shmem.h"
#include "storage/sinval.h"
#include "tcop/tcopprot.h"
-
/*
* The SIGUSR1 signal is multiplexed to support signalling multiple event
* types. The specific reason is communicated via flags in shared memory.
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index db080c8..0c58b39 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -17,6 +17,7 @@
#include <signal.h>
#include <unistd.h>
+#include "access/transam.h"
#include "miscadmin.h"
#include "storage/backendid.h"
#include "storage/ipc.h"
@@ -25,8 +26,6 @@
#include "storage/shmem.h"
#include "storage/sinvaladt.h"
#include "storage/spin.h"
-#include "access/transam.h"
-
/*
* Conceptually, the shared cache invalidation messages are stored in an
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index fb0bf44..18e3843 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -77,8 +77,8 @@
#include "postgres.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/postmaster.h"
#include "replication/slot.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 498373f..7263c85 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -45,7 +45,6 @@
#include "replication/syncrep.h"
#include "replication/walsender.h"
#include "storage/condition_variable.h"
-#include "storage/standby.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
#include "storage/pmsignal.h"
@@ -53,10 +52,10 @@
#include "storage/procarray.h"
#include "storage/procsignal.h"
#include "storage/spin.h"
+#include "storage/standby.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-
/* GUC variables */
int DeadlockTimeout = 1000;
int StatementTimeout = 0;
diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
index 2e6c55b..04befb7 100644
--- a/src/backend/storage/lmgr/s_lock.c
+++ b/src/backend/storage/lmgr/s_lock.c
@@ -50,9 +50,8 @@
#include <time.h>
#include <unistd.h>
-#include "storage/s_lock.h"
#include "port/atomics.h"
-
+#include "storage/s_lock.h"
#define MIN_SPINS_PER_DELAY 10
#define MAX_SPINS_PER_DELAY 1000
diff --git a/src/backend/storage/page/checksum.c b/src/backend/storage/page/checksum.c
index 1eb7ef6..8f7a110 100644
--- a/src/backend/storage/page/checksum.c
+++ b/src/backend/storage/page/checksum.c
@@ -14,7 +14,6 @@
#include "postgres.h"
#include "storage/checksum.h"
-
/*
* The actual code is in storage/checksum_impl.h. This is done so that
* external programs can incorporate the checksum code by #include'ing
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 07f3c93..8a9eaf6 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -25,21 +25,21 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "postmaster/bgwriter.h"
-#include "storage/fd.h"
#include "storage/bufmgr.h"
+#include "storage/fd.h"
#include "storage/md.h"
#include "storage/relfilenode.h"
#include "storage/smgr.h"
#include "storage/sync.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/*
* The magnetic disk storage manager keeps track of open file
diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
index f329c3f..3485e6f 100644
--- a/src/backend/storage/sync/sync.c
+++ b/src/backend/storage/sync/sync.c
@@ -18,19 +18,19 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "pgstat.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pgstat.h"
#include "portability/instr_time.h"
#include "postmaster/bgwriter.h"
#include "storage/bufmgr.h"
#include "storage/ipc.h"
#include "storage/md.h"
#include "utils/hsearch.h"
-#include "utils/memutils.h"
#include "utils/inval.h"
+#include "utils/memutils.h"
static MemoryContext pendingOpsCxt; /* context for the pending ops state */
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index e8d8e6f..5ddd18d 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -47,14 +47,15 @@
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
#include "libpq/pqsignal.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "nodes/print.h"
#include "optimizer/optimizer.h"
-#include "pgstat.h"
-#include "pg_trace.h"
#include "parser/analyze.h"
#include "parser/parser.h"
#include "pg_getopt.h"
+#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/autovacuum.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
@@ -77,8 +78,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "mb/pg_wchar.h"
-
/* ----------------
* global variables
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index c6faa66..98f1ae8 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -28,8 +28,8 @@
#include "commands/alter.h"
#include "commands/async.h"
#include "commands/cluster.h"
-#include "commands/comment.h"
#include "commands/collationcmds.h"
+#include "commands/comment.h"
#include "commands/conversioncmds.h"
#include "commands/copy.h"
#include "commands/createas.h"
@@ -39,8 +39,8 @@
#include "commands/event_trigger.h"
#include "commands/explain.h"
#include "commands/extension.h"
-#include "commands/matview.h"
#include "commands/lockcmds.h"
+#include "commands/matview.h"
#include "commands/policy.h"
#include "commands/portalcmds.h"
#include "commands/prepare.h"
@@ -68,9 +68,8 @@
#include "utils/acl.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
-
+#include "utils/syscache.h"
/* Hook for plugins to get control in ProcessUtility() */
ProcessUtility_hook_type ProcessUtility_hook = NULL;
diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c
index a3372a8..083292c 100644
--- a/src/backend/tsearch/wparser.c
+++ b/src/backend/tsearch/wparser.c
@@ -13,17 +13,16 @@
*/
#include "postgres.h"
-#include "funcapi.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "funcapi.h"
#include "tsearch/ts_cache.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/jsonapi.h"
#include "utils/varlena.h"
-
/******sql-level interface******/
typedef struct
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index d7e6100..0070a7e 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -19,10 +19,10 @@
#include "access/htup_details.h"
#include "catalog/catalog.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/proclang.h"
#include "commands/tablespace.h"
@@ -40,7 +40,6 @@
#include "utils/syscache.h"
#include "utils/varlena.h"
-
typedef struct
{
const char *name;
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index e38bd93..c911d72 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -31,7 +31,6 @@
#include "utils/memutils.h"
#include "utils/tzparser.h"
-
static int DecodeNumber(int flen, char *field, bool haveTextMonth,
int fmask, int *tmask,
struct pg_tm *tm, fsec_t *fsec, bool *is2digits);
diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c
index 6ae2a31..b6befd6 100644
--- a/src/backend/utils/adt/format_type.c
+++ b/src/backend/utils/adt/format_type.c
@@ -20,11 +20,11 @@
#include "access/htup_details.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/numeric.h"
#include "utils/syscache.h"
-#include "mb/pg_wchar.h"
static char *printTypmod(const char *typname, int32 typmod, Oid typmodout);
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 0ff9394..5a558fb 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -23,9 +23,8 @@
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "optimizer/optimizer.h"
-#include "utils/int8.h"
#include "utils/builtins.h"
-
+#include "utils/int8.h"
#define MAXINT8LEN 25
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index d4ba3bd..e2e16eb 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -27,11 +27,11 @@
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
-#include "utils/typcache.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
+#include "utils/typcache.h"
/*
* The context of the parser is maintained by the recursive descent
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 74b4bbe..9927d08 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -12,20 +12,20 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/transam.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
#include "utils/jsonb.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index a35f718..906630e 100644
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -66,18 +66,17 @@
#include "miscadmin.h"
#include "regex/regex.h"
#include "utils/builtins.h"
+#include "utils/date.h"
#include "utils/datetime.h"
#include "utils/datum.h"
-#include "utils/formatting.h"
#include "utils/float.h"
+#include "utils/formatting.h"
#include "utils/guc.h"
#include "utils/json.h"
#include "utils/jsonpath.h"
-#include "utils/date.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-
/*
* Represents "base object" and it's "id" for .keyvalue() evaluation.
*/
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index d330a88..27474a6 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -29,18 +29,17 @@
#include "common/keywords.h"
#include "funcapi.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "parser/scansup.h"
+#include "pgstat.h"
#include "postmaster/syslogger.h"
#include "rewrite/rewriteHandler.h"
#include "storage/fd.h"
-#include "utils/lsyscache.h"
-#include "utils/ruleutils.h"
#include "tcop/tcopprot.h"
#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/ruleutils.h"
#include "utils/timestamp.h"
-
/*
* Common subroutine for num_nulls() and num_nonnulls().
* Returns true if successful, false if function should return NULL.
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index 0fdfee5..9557732 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -16,10 +16,9 @@
#include "postgres.h"
#include "common/int.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/formatting.h"
-#include "mb/pg_wchar.h"
-
static text *dotrim(const char *string, int stringlen,
const char *set, int setlen,
diff --git a/src/backend/utils/adt/rangetypes_gist.c b/src/backend/utils/adt/rangetypes_gist.c
index 6f93ce6..c0edae6 100644
--- a/src/backend/utils/adt/rangetypes_gist.c
+++ b/src/backend/utils/adt/rangetypes_gist.c
@@ -16,12 +16,11 @@
#include "access/gist.h"
#include "access/stratnum.h"
+#include "utils/datum.h"
#include "utils/float.h"
#include "utils/fmgrprotos.h"
-#include "utils/datum.h"
#include "utils/rangetypes.h"
-
/*
* Range class properties used to segregate different classes of ranges in
* GiST. Each unique combination of properties is a class. CLS_EMPTY cannot
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 17a7f6c..4b1decf 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -33,11 +33,11 @@
#include "miscadmin.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
-#include "utils/acl.h"
#include "utils/regproc.h"
+#include "utils/syscache.h"
#include "utils/varlena.h"
static char *format_operator_internal(Oid operator_oid, bool force_qualify);
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index fb477d4..d4282a3 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -36,9 +36,9 @@
#include "executor/executor.h"
#include "executor/spi.h"
#include "lib/ilist.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "parser/parse_relation.h"
-#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "utils/acl.h"
#include "utils/builtins.h"
@@ -54,7 +54,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
/*
* Local definitions
*/
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 3e64390..c1de869 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -50,9 +50,9 @@
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
-#include "parser/parse_node.h"
#include "parser/parse_agg.h"
#include "parser/parse_func.h"
+#include "parser/parse_node.h"
#include "parser/parse_oper.h"
#include "parser/parser.h"
#include "parser/parsetree.h"
@@ -74,7 +74,6 @@
#include "utils/varlena.h"
#include "utils/xml.h"
-
/* ----------
* Pretty formatting constants
* ----------
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index ab2b49f..4f574b3 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -16,8 +16,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_locale.h"
+#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
index af07563..217de77 100644
--- a/src/backend/utils/adt/tsquery_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -15,8 +15,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
typedef struct NODE
{
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
index 91200ee..282fb2d 100644
--- a/src/backend/utils/adt/tsquery_gist.c
+++ b/src/backend/utils/adt/tsquery_gist.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "access/stratnum.h"
#include "access/gist.h"
+#include "access/stratnum.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
index de46a00..7cb19db 100644
--- a/src/backend/utils/adt/tsquery_util.c
+++ b/src/backend/utils/adt/tsquery_util.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
/*
* Build QTNode tree for a tsquery given in QueryItem array format.
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
index e28859d..2d8359d 100644
--- a/src/backend/utils/adt/tsrank.c
+++ b/src/backend/utils/adt/tsrank.c
@@ -16,11 +16,10 @@
#include <limits.h>
#include <math.h>
+#include "miscadmin.h"
#include "tsearch/ts_utils.h"
#include "utils/array.h"
#include "utils/builtins.h"
-#include "miscadmin.h"
-
static const float weights[] = {0.1f, 0.2f, 0.4f, 1.0f};
diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c
index 90b2c9b..d346324 100644
--- a/src/backend/utils/adt/txid.c
+++ b/src/backend/utils/adt/txid.c
@@ -26,15 +26,14 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "funcapi.h"
-#include "miscadmin.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "postmaster/postmaster.h"
#include "storage/lwlock.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
-
/* txid will be signed int8 in database, so must limit to 63 bits */
#define MAX_TXID ((uint64) PG_INT64_MAX)
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index e63a4e5..2aed411 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -18,6 +18,7 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "libpq/pqformat.h"
+#include "mb/pg_wchar.h"
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "utils/array.h"
@@ -26,8 +27,6 @@
#include "utils/lsyscache.h"
#include "utils/pg_locale.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
-
/* common code for bpchartypmodin and varchartypmodin */
static int32
diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c
index 419bde5..1b0f738 100644
--- a/src/backend/utils/cache/evtcache.c
+++ b/src/backend/utils/cache/evtcache.c
@@ -16,17 +16,17 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/indexing.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_type.h"
#include "commands/trigger.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/evtcache.h"
+#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/memutils.h"
-#include "utils/hsearch.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 585dcee..ad1ff01 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -47,8 +47,8 @@
#include "catalog/pg_am.h"
#include "catalog/pg_amproc.h"
#include "catalog/pg_attrdef.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_database.h"
#include "catalog/pg_namespace.h"
@@ -90,7 +90,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
#define RELCACHE_INIT_FILEMAGIC 0x573266 /* version ID value */
/*
diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c
index c506dc9..d244eaf 100644
--- a/src/backend/utils/cache/relfilenodemap.c
+++ b/src/backend/utils/cache/relfilenodemap.c
@@ -22,9 +22,9 @@
#include "miscadmin.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
-#include "utils/fmgroids.h"
#include "utils/rel.h"
#include "utils/relfilenodemap.h"
#include "utils/relmapper.h"
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 16297a5..13a34d5 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -74,11 +74,10 @@
#include "catalog/pg_ts_template.h"
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
-#include "utils/rel.h"
#include "utils/catcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
-
/*---------------------------------------------------------------------------
Adding system caches:
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
index 10222d5..3c4689a 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
@@ -15,8 +15,8 @@
#include "fmgr.h"
#include "mb/pg_wchar.h"
#include "../../Unicode/utf8_to_koi8r.map"
-#include "../../Unicode/koi8r_to_utf8.map"
#include "../../Unicode/utf8_to_koi8u.map"
+#include "../../Unicode/koi8r_to_utf8.map"
#include "../../Unicode/koi8u_to_utf8.map"
PG_MODULE_MAGIC;
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
index e33ca42..34ddcba 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
@@ -12,12 +12,14 @@
*/
#include "postgres.h"
+
#include "fmgr.h"
#include "mb/pg_wchar.h"
#include "../../Unicode/iso8859_10_to_utf8.map"
#include "../../Unicode/iso8859_13_to_utf8.map"
#include "../../Unicode/iso8859_14_to_utf8.map"
#include "../../Unicode/iso8859_15_to_utf8.map"
+#include "../../Unicode/iso8859_16_to_utf8.map"
#include "../../Unicode/iso8859_2_to_utf8.map"
#include "../../Unicode/iso8859_3_to_utf8.map"
#include "../../Unicode/iso8859_4_to_utf8.map"
@@ -39,7 +41,6 @@
#include "../../Unicode/utf8_to_iso8859_7.map"
#include "../../Unicode/utf8_to_iso8859_8.map"
#include "../../Unicode/utf8_to_iso8859_9.map"
-#include "../../Unicode/iso8859_16_to_utf8.map"
PG_MODULE_MAGIC;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 31a5ef0..0364709 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -38,10 +38,10 @@
#include "catalog/pg_authid.h"
#include "commands/async.h"
#include "commands/prepare.h"
+#include "commands/trigger.h"
#include "commands/user.h"
#include "commands/vacuum.h"
#include "commands/variable.h"
-#include "commands/trigger.h"
#include "common/string.h"
#include "funcapi.h"
#include "jit/jit.h"
@@ -72,18 +72,18 @@
#include "replication/walsender.h"
#include "storage/bufmgr.h"
#include "storage/dsm_impl.h"
-#include "storage/standby.h"
#include "storage/fd.h"
#include "storage/large_object.h"
#include "storage/pg_shmem.h"
-#include "storage/proc.h"
#include "storage/predicate.h"
+#include "storage/proc.h"
+#include "storage/standby.h"
#include "tcop/tcopprot.h"
#include "tsearch/ts_cache.h"
#include "utils/builtins.h"
#include "utils/bytea.h"
-#include "utils/guc_tables.h"
#include "utils/float.h"
+#include "utils/guc_tables.h"
#include "utils/memutils.h"
#include "utils/pg_locale.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index 2d17839..8cab0e1 100644
--- a/src/backend/utils/misc/pg_config.c
+++ b/src/backend/utils/misc/pg_config.c
@@ -14,12 +14,12 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
#include "catalog/pg_type.h"
#include "common/config_info.h"
-#include "utils/builtins.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "port.h"
+#include "utils/builtins.h"
Datum
pg_config(PG_FUNCTION_ARGS)
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index b429218..3d0916f 100644
--- a/src/backend/utils/misc/pg_controldata.c
+++ b/src/backend/utils/misc/pg_controldata.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/transam.h"
-#include "access/xlog_internal.h"
#include "access/xlog.h"
+#include "access/xlog_internal.h"
#include "catalog/pg_control.h"
#include "catalog/pg_type.h"
#include "common/controldata_utils.h"
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index 67ba95c..6c851dd 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -28,8 +28,8 @@
#include "libpq/libpq.h"
#include "miscadmin.h"
-#include "utils/ps_status.h"
#include "utils/guc.h"
+#include "utils/ps_status.h"
extern char **environ;
bool update_process_title = true;
diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 5636081..327dca6 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -22,10 +22,9 @@
#include "access/htup_details.h"
#include "catalog/pg_authid.h"
+#include "miscadmin.h"
#include "utils/inval.h"
#include "utils/syscache.h"
-#include "miscadmin.h"
-
/*
* In common cases the same roleid (ie, the session or current ID) will
diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c
index 50deb35..db1dac3 100644
--- a/src/backend/utils/mmgr/slab.c
+++ b/src/backend/utils/mmgr/slab.c
@@ -52,10 +52,9 @@
#include "postgres.h"
+#include "lib/ilist.h"
#include "utils/memdebug.h"
#include "utils/memutils.h"
-#include "lib/ilist.h"
-
/*
* SlabContext is a specialized implementation of MemoryContext.
diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c
index deb9af5..16d464d 100644
--- a/src/backend/utils/time/combocid.c
+++ b/src/backend/utils/time/combocid.c
@@ -41,15 +41,14 @@
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/xact.h"
+#include "miscadmin.h"
#include "storage/shmem.h"
#include "utils/combocid.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-
/* Hash table to lookup combo cids by cmin and cmax */
static HTAB *comboHash = NULL;
--
1.8.3.1
0001-Ordering-of-header-files-in-contrib-dir-oct21.patchapplication/octet-stream; name=0001-Ordering-of-header-files-in-contrib-dir-oct21.patchDownload
From 653a5c02808cd15d72ceda6e84689544f975e889 Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Mon, 21 Oct 2019 18:03:34 +0530
Subject: [PATCH 1/3] Ordering of header files in contrib dir.
Ordering of header files that is included in source code in contrib dir.
---
contrib/bloom/blcost.c | 3 +--
contrib/bloom/blinsert.c | 3 +--
contrib/bloom/blscan.c | 5 ++---
contrib/bloom/blutils.c | 10 ++++------
contrib/bloom/blvalidate.c | 3 +--
contrib/btree_gin/btree_gin.c | 2 +-
contrib/btree_gist/btree_enum.c | 4 ++--
contrib/btree_gist/btree_inet.c | 2 +-
contrib/btree_gist/btree_numeric.c | 3 +--
contrib/btree_gist/btree_utils_var.c | 5 ++---
contrib/cube/cube.c | 3 +--
contrib/dblink/dblink.c | 3 +--
contrib/hstore/hstore_gist.c | 3 +--
contrib/hstore/hstore_io.c | 2 +-
contrib/hstore/hstore_op.c | 3 +--
contrib/hstore_plpython/hstore_plpython.c | 4 ++--
contrib/intarray/_int_bool.c | 3 +--
contrib/intarray/_int_gin.c | 3 +--
contrib/intarray/_int_gist.c | 3 +--
contrib/intarray/_int_selfuncs.c | 6 +++---
contrib/intarray/_int_tool.c | 4 +---
contrib/intarray/_intbig_gist.c | 3 +--
contrib/isn/isn.c | 2 +-
contrib/jsonb_plperl/jsonb_plperl.c | 2 +-
contrib/jsonb_plpython/jsonb_plpython.c | 4 ++--
contrib/ltree/_ltree_gist.c | 4 +---
contrib/ltree/crc32.c | 2 +-
contrib/ltree/lquery_op.c | 2 +-
contrib/ltree/ltree_io.c | 2 +-
contrib/ltree/ltree_op.c | 2 +-
contrib/ltree_plpython/ltree_plpython.c | 2 +-
contrib/oid2name/oid2name.c | 4 +---
contrib/pageinspect/brinfuncs.c | 8 +++-----
contrib/pageinspect/btreefuncs.c | 4 +---
contrib/pageinspect/fsmfuncs.c | 3 +--
contrib/pageinspect/ginfuncs.c | 3 +--
contrib/pageinspect/hashfuncs.c | 5 ++---
contrib/pageinspect/heapfuncs.c | 5 ++---
contrib/pageinspect/rawpage.c | 3 +--
contrib/passwordcheck/passwordcheck.c | 2 +-
contrib/pg_standby/pg_standby.c | 3 +--
contrib/pg_trgm/trgm_gin.c | 4 +---
contrib/pg_trgm/trgm_gist.c | 4 +---
contrib/pg_trgm/trgm_op.c | 3 +--
contrib/pg_trgm/trgm_regexp.c | 4 +---
contrib/pgcrypto/crypt-md5.c | 2 +-
contrib/pgcrypto/internal.c | 6 +++---
contrib/pgcrypto/mbuf.c | 2 +-
contrib/pgcrypto/openssl.c | 3 +--
contrib/pgcrypto/pgcrypto.c | 7 +++----
contrib/pgcrypto/pgp-armor.c | 2 +-
contrib/pgcrypto/pgp-cfb.c | 2 +-
contrib/pgcrypto/pgp-compress.c | 3 +--
contrib/pgcrypto/pgp-decrypt.c | 2 +-
contrib/pgcrypto/pgp-encrypt.c | 3 +--
contrib/pgcrypto/pgp-info.c | 2 +-
contrib/pgcrypto/pgp-mpi-internal.c | 3 +--
contrib/pgcrypto/pgp-mpi-openssl.c | 2 +-
contrib/pgcrypto/pgp-mpi.c | 2 +-
contrib/pgcrypto/pgp-pgsql.c | 11 +++++------
contrib/pgcrypto/pgp-pubdec.c | 2 +-
contrib/pgcrypto/pgp-pubenc.c | 2 +-
contrib/pgcrypto/pgp-pubkey.c | 2 +-
contrib/pgcrypto/pgp-s2k.c | 3 +--
contrib/pgcrypto/pgp.c | 2 +-
contrib/pgcrypto/px-crypt.c | 3 +--
contrib/pgstattuple/pgstatapprox.c | 6 +++---
contrib/postgres_fdw/connection.c | 4 +---
contrib/postgres_fdw/deparse.c | 4 +---
contrib/postgres_fdw/option.c | 4 +---
contrib/postgres_fdw/postgres_fdw.c | 3 +--
contrib/postgres_fdw/shippable.c | 4 +---
contrib/sepgsql/database.c | 4 ++--
contrib/sepgsql/dml.c | 5 ++---
contrib/sepgsql/hooks.c | 3 +--
contrib/sepgsql/label.c | 5 ++---
contrib/sepgsql/proc.c | 3 +--
contrib/sepgsql/relation.c | 7 +++----
contrib/sepgsql/schema.c | 3 +--
contrib/sepgsql/uavc.c | 3 +--
contrib/spi/moddatetime.c | 2 +-
contrib/tablefunc/tablefunc.c | 3 +--
contrib/tcn/tcn.c | 2 +-
contrib/vacuumlo/vacuumlo.c | 3 +--
84 files changed, 113 insertions(+), 178 deletions(-)
diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c
index f9fe57f..b2cd649 100644
--- a/contrib/bloom/blcost.c
+++ b/contrib/bloom/blcost.c
@@ -12,11 +12,10 @@
*/
#include "postgres.h"
+#include "bloom.h"
#include "fmgr.h"
#include "utils/selfuncs.h"
-#include "bloom.h"
-
/*
* Estimate cost of bloom index scan.
*/
diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c
index 4b2186b..30d17f5 100644
--- a/contrib/bloom/blinsert.c
+++ b/contrib/bloom/blinsert.c
@@ -15,6 +15,7 @@
#include "access/genam.h"
#include "access/generic_xlog.h"
#include "access/tableam.h"
+#include "bloom.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
@@ -23,8 +24,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "bloom.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c
index 49e364a..30fa206 100644
--- a/contrib/bloom/blscan.c
+++ b/contrib/bloom/blscan.c
@@ -13,15 +13,14 @@
#include "postgres.h"
#include "access/relscan.h"
-#include "pgstat.h"
+#include "bloom.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "bloom.h"
-
/*
* Begin scan of bloom index.
*/
diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c
index dbb24cb..3d44616 100644
--- a/contrib/bloom/blutils.c
+++ b/contrib/bloom/blutils.c
@@ -15,17 +15,15 @@
#include "access/amapi.h"
#include "access/generic_xlog.h"
+#include "access/reloptions.h"
+#include "bloom.h"
#include "catalog/index.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/indexfsm.h"
-#include "utils/memutils.h"
-#include "access/reloptions.h"
#include "storage/freespace.h"
#include "storage/indexfsm.h"
-
-#include "bloom.h"
+#include "storage/lmgr.h"
+#include "utils/memutils.h"
/* Signature dealing macros - note i is assumed to be of type int */
#define GETWORD(x,i) ( *( (BloomSignatureWord *)(x) + ( (i) / SIGNWORDBITS ) ) )
diff --git a/contrib/bloom/blvalidate.c b/contrib/bloom/blvalidate.c
index e9bd1b4..b3dfe03 100644
--- a/contrib/bloom/blvalidate.c
+++ b/contrib/bloom/blvalidate.c
@@ -14,6 +14,7 @@
#include "access/amvalidate.h"
#include "access/htup_details.h"
+#include "bloom.h"
#include "catalog/pg_amop.h"
#include "catalog/pg_amproc.h"
#include "catalog/pg_opclass.h"
@@ -24,8 +25,6 @@
#include "utils/regproc.h"
#include "utils/syscache.h"
-#include "bloom.h"
-
/*
* Validator for a bloom opclass.
*/
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c
index 2ecf7a2..0ed3d58 100644
--- a/contrib/btree_gin/btree_gin.c
+++ b/contrib/btree_gin/btree_gin.c
@@ -14,8 +14,8 @@
#include "utils/inet.h"
#include "utils/numeric.h"
#include "utils/timestamp.h"
-#include "utils/varbit.h"
#include "utils/uuid.h"
+#include "utils/varbit.h"
PG_MODULE_MAGIC;
diff --git a/contrib/btree_gist/btree_enum.c b/contrib/btree_gist/btree_enum.c
index 0ec7d8b..b563012 100644
--- a/contrib/btree_gist/btree_enum.c
+++ b/contrib/btree_gist/btree_enum.c
@@ -2,11 +2,11 @@
* contrib/btree_gist/btree_enum.c
*/
#include "postgres.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
#include "btree_gist.h"
#include "btree_utils_num.h"
+#include "fmgr.h"
+#include "utils/builtins.h"
/* enums are really Oids, so we just use the same structure */
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 34308cc..a3b4301 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -5,9 +5,9 @@
#include "btree_gist.h"
#include "btree_utils_num.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/inet.h"
-#include "catalog/pg_type.h"
typedef struct inetkey
{
diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c
index b72060c..d43612a 100644
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -3,11 +3,10 @@
*/
#include "postgres.h"
-#include "btree_gist.h"
-
#include <math.h>
#include <float.h>
+#include "btree_gist.h"
#include "btree_utils_var.h"
#include "utils/builtins.h"
#include "utils/numeric.h"
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 670c879..452241f 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -3,15 +3,14 @@
*/
#include "postgres.h"
-#include "btree_gist.h"
-
#include <math.h>
#include <limits.h>
#include <float.h>
+#include "btree_gist.h"
#include "btree_utils_var.h"
-#include "utils/pg_locale.h"
#include "utils/builtins.h"
+#include "utils/pg_locale.h"
#include "utils/rel.h"
/* used for key sorting */
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index b720366..b98118e 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -12,11 +12,10 @@
#include "access/gist.h"
#include "access/stratnum.h"
+#include "cubedata.h"
#include "utils/array.h"
#include "utils/float.h"
-#include "cubedata.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index e432457..54b7bf9 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -34,8 +34,6 @@
#include <limits.h>
-#include "libpq-fe.h"
-
#include "access/htup_details.h"
#include "access/relation.h"
#include "access/reloptions.h"
@@ -50,6 +48,7 @@
#include "foreign/foreign.h"
#include "funcapi.h"
#include "lib/stringinfo.h"
+#include "libpq-fe.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "parser/scansup.h"
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index 6a885f2..e860f1e 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -6,9 +6,8 @@
#include "access/gist.h"
#include "access/stratnum.h"
#include "catalog/pg_type.h"
-#include "utils/pg_crc.h"
-
#include "hstore.h"
+#include "utils/pg_crc.h"
/* bigint defines */
#define BITBYTE 8
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
index 745497c..542f4b5 100644
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -8,6 +8,7 @@
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "hstore.h"
#include "lib/stringinfo.h"
#include "libpq/pqformat.h"
#include "utils/builtins.h"
@@ -18,7 +19,6 @@
#include "utils/memutils.h"
#include "utils/typcache.h"
-#include "hstore.h"
PG_MODULE_MAGIC;
diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index a3a8a91..c54071b 100644
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -6,12 +6,11 @@
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "hstore.h"
#include "utils/builtins.h"
#include "utils/hashutils.h"
#include "utils/memutils.h"
-#include "hstore.h"
-
/* old names for C functions */
HSTORE_POLLUTE(hstore_fetchval, fetchval);
HSTORE_POLLUTE(hstore_exists, exists);
diff --git a/contrib/hstore_plpython/hstore_plpython.c b/contrib/hstore_plpython/hstore_plpython.c
index 93705f0..4dee569 100644
--- a/contrib/hstore_plpython/hstore_plpython.c
+++ b/contrib/hstore_plpython/hstore_plpython.c
@@ -1,9 +1,9 @@
#include "postgres.h"
#include "fmgr.h"
-#include "plpython.h"
-#include "plpy_typeio.h"
#include "hstore/hstore.h"
+#include "plpy_typeio.h"
+#include "plpython.h"
PG_MODULE_MAGIC;
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 91e2a80..fd97690 100644
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -3,11 +3,10 @@
*/
#include "postgres.h"
+#include "_int.h"
#include "miscadmin.h"
#include "utils/builtins.h"
-#include "_int.h"
-
PG_FUNCTION_INFO_V1(bqarr_in);
PG_FUNCTION_INFO_V1(bqarr_out);
PG_FUNCTION_INFO_V1(boolop);
diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c
index 7aebfec..b7958d8 100644
--- a/contrib/intarray/_int_gin.c
+++ b/contrib/intarray/_int_gin.c
@@ -3,11 +3,10 @@
*/
#include "postgres.h"
+#include "_int.h"
#include "access/gin.h"
#include "access/stratnum.h"
-#include "_int.h"
-
PG_FUNCTION_INFO_V1(ginint4_queryextract);
Datum
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
index e5a8011..50effc3 100644
--- a/contrib/intarray/_int_gist.c
+++ b/contrib/intarray/_int_gist.c
@@ -5,11 +5,10 @@
#include <limits.h>
+#include "_int.h"
#include "access/gist.h"
#include "access/stratnum.h"
-#include "_int.h"
-
#define GETENTRY(vec,pos) ((ArrayType *) DatumGetPointer((vec)->vector[(pos)].key))
/*
diff --git a/contrib/intarray/_int_selfuncs.c b/contrib/intarray/_int_selfuncs.c
index aebffae..8fb05d1 100644
--- a/contrib/intarray/_int_selfuncs.c
+++ b/contrib/intarray/_int_selfuncs.c
@@ -13,17 +13,17 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "_int.h"
+#include "_int.h"
#include "access/htup_details.h"
#include "catalog/pg_operator.h"
#include "catalog/pg_statistic.h"
#include "catalog/pg_type.h"
+#include "miscadmin.h"
#include "utils/builtins.h"
+#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
#include "utils/syscache.h"
-#include "utils/lsyscache.h"
-#include "miscadmin.h"
PG_FUNCTION_INFO_V1(_int_overlap_sel);
PG_FUNCTION_INFO_V1(_int_contains_sel);
diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c
index fde8d15..efff81d 100644
--- a/contrib/intarray/_int_tool.c
+++ b/contrib/intarray/_int_tool.c
@@ -5,10 +5,8 @@
#include <limits.h>
-#include "catalog/pg_type.h"
-
#include "_int.h"
-
+#include "catalog/pg_type.h"
/* arguments are assumed sorted & unique-ified */
bool
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index 2a20abe..be51dac 100644
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -3,12 +3,11 @@
*/
#include "postgres.h"
+#include "_int.h"
#include "access/gist.h"
#include "access/stratnum.h"
#include "port/pg_bitutils.h"
-#include "_int.h"
-
#define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer((vec)->vector[(pos)].key))
/*
** _intbig methods
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 0c2cac7..36bb582 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -15,9 +15,9 @@
#include "postgres.h"
#include "fmgr.h"
+#include "isn.h"
#include "utils/builtins.h"
-#include "isn.h"
#include "EAN13.h"
#include "ISBN.h"
#include "ISMN.h"
diff --git a/contrib/jsonb_plperl/jsonb_plperl.c b/contrib/jsonb_plperl/jsonb_plperl.c
index 04b04df..4ae1353 100644
--- a/contrib/jsonb_plperl/jsonb_plperl.c
+++ b/contrib/jsonb_plperl/jsonb_plperl.c
@@ -5,8 +5,8 @@
#include "fmgr.h"
#include "plperl.h"
#include "plperl_helpers.h"
-#include "utils/jsonb.h"
#include "utils/fmgrprotos.h"
+#include "utils/jsonb.h"
PG_MODULE_MAGIC;
diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c
index 776cf7c..ecaa4c6 100644
--- a/contrib/jsonb_plpython/jsonb_plpython.c
+++ b/contrib/jsonb_plpython/jsonb_plpython.c
@@ -1,10 +1,10 @@
#include "postgres.h"
-#include "plpython.h"
#include "plpy_elog.h"
#include "plpy_typeio.h"
-#include "utils/jsonb.h"
+#include "plpython.h"
#include "utils/fmgrprotos.h"
+#include "utils/jsonb.h"
#include "utils/numeric.h"
PG_MODULE_MAGIC;
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index c33ac4e..6b14ed5 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -9,11 +9,9 @@
#include "access/gist.h"
#include "access/stratnum.h"
-#include "port/pg_bitutils.h"
-
#include "crc32.h"
#include "ltree.h"
-
+#include "port/pg_bitutils.h"
PG_FUNCTION_INFO_V1(_ltree_compress);
PG_FUNCTION_INFO_V1(_ltree_same);
diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c
index 447e4b2..0c3e459 100644
--- a/contrib/ltree/crc32.c
+++ b/contrib/ltree/crc32.c
@@ -16,8 +16,8 @@
#define TOLOWER(x) (x)
#endif
-#include "utils/pg_crc.h"
#include "crc32.h"
+#include "utils/pg_crc.h"
unsigned int
ltree_crc32_sz(char *buf, int size)
diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c
index 62172d5..fa47710 100644
--- a/contrib/ltree/lquery_op.c
+++ b/contrib/ltree/lquery_op.c
@@ -8,8 +8,8 @@
#include <ctype.h>
#include "catalog/pg_collation.h"
-#include "utils/formatting.h"
#include "ltree.h"
+#include "utils/formatting.h"
PG_FUNCTION_INFO_V1(ltq_regex);
PG_FUNCTION_INFO_V1(ltq_rregex);
diff --git a/contrib/ltree/ltree_io.c b/contrib/ltree/ltree_io.c
index f54f037..900a46a 100644
--- a/contrib/ltree/ltree_io.c
+++ b/contrib/ltree/ltree_io.c
@@ -7,9 +7,9 @@
#include <ctype.h>
+#include "crc32.h"
#include "ltree.h"
#include "utils/memutils.h"
-#include "crc32.h"
PG_FUNCTION_INFO_V1(ltree_in);
PG_FUNCTION_INFO_V1(ltree_out);
diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c
index df61c63..070868f 100644
--- a/contrib/ltree/ltree_op.c
+++ b/contrib/ltree/ltree_op.c
@@ -9,10 +9,10 @@
#include "access/htup_details.h"
#include "catalog/pg_statistic.h"
+#include "ltree.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
-#include "ltree.h"
PG_MODULE_MAGIC;
diff --git a/contrib/ltree_plpython/ltree_plpython.c b/contrib/ltree_plpython/ltree_plpython.c
index b254aa5..1570e77 100644
--- a/contrib/ltree_plpython/ltree_plpython.c
+++ b/contrib/ltree_plpython/ltree_plpython.c
@@ -1,8 +1,8 @@
#include "postgres.h"
#include "fmgr.h"
-#include "plpython.h"
#include "ltree/ltree.h"
+#include "plpython.h"
PG_MODULE_MAGIC;
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index fa1e795..9a3eac2 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -10,13 +10,11 @@
#include "postgres_fe.h"
#include "catalog/pg_class_d.h"
-
#include "common/logging.h"
#include "fe_utils/connect.h"
+#include "getopt_long.h"
#include "libpq-fe.h"
#include "pg_getopt.h"
-#include "getopt_long.h"
-
/* an extensible array to keep track of elements to show */
typedef struct
diff --git a/contrib/pageinspect/brinfuncs.c b/contrib/pageinspect/brinfuncs.c
index 04140ec..d0a12f1 100644
--- a/contrib/pageinspect/brinfuncs.c
+++ b/contrib/pageinspect/brinfuncs.c
@@ -9,24 +9,22 @@
*/
#include "postgres.h"
-#include "pageinspect.h"
-
-#include "access/htup_details.h"
#include "access/brin.h"
#include "access/brin_internal.h"
#include "access/brin_page.h"
#include "access/brin_revmap.h"
#include "access/brin_tuple.h"
+#include "access/htup_details.h"
#include "catalog/index.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "lib/stringinfo.h"
+#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
-#include "miscadmin.h"
-
PG_FUNCTION_INFO_V1(brin_page_type);
PG_FUNCTION_INFO_V1(brin_page_items);
diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
index 8d27c9b..78cdc69 100644
--- a/contrib/pageinspect/btreefuncs.c
+++ b/contrib/pageinspect/btreefuncs.c
@@ -27,19 +27,17 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/nbtree.h"
#include "access/relation.h"
#include "catalog/namespace.h"
#include "catalog/pg_am.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/builtins.h"
#include "utils/rel.h"
#include "utils/varlena.h"
-
PG_FUNCTION_INFO_V1(bt_metap);
PG_FUNCTION_INFO_V1(bt_page_items);
PG_FUNCTION_INFO_V1(bt_page_items_bytea);
diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c
index 4b3c596..8567a38 100644
--- a/contrib/pageinspect/fsmfuncs.c
+++ b/contrib/pageinspect/fsmfuncs.c
@@ -19,11 +19,10 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "funcapi.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "storage/fsm_internals.h"
#include "utils/builtins.h"
diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c
index 229f9f9..a2cd9ed 100644
--- a/contrib/pageinspect/ginfuncs.c
+++ b/contrib/pageinspect/ginfuncs.c
@@ -9,8 +9,6 @@
*/
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/gin.h"
#include "access/gin_private.h"
#include "access/htup_details.h"
@@ -18,6 +16,7 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/pageinspect/hashfuncs.c b/contrib/pageinspect/hashfuncs.c
index 9374c4a..bcc39a8 100644
--- a/contrib/pageinspect/hashfuncs.c
+++ b/contrib/pageinspect/hashfuncs.c
@@ -10,14 +10,13 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/hash.h"
#include "access/htup_details.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_am.h"
+#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
index 02e2ab9..8e69cb3 100644
--- a/contrib/pageinspect/heapfuncs.c
+++ b/contrib/pageinspect/heapfuncs.c
@@ -25,14 +25,13 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/htup_details.h"
#include "access/relation.h"
-#include "funcapi.h"
#include "catalog/pg_am_d.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "port/pg_bitutils.h"
#include "utils/array.h"
#include "utils/builtins.h"
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index f08f62f..ffb4418 100644
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -15,14 +15,13 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/htup_details.h"
#include "access/relation.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "storage/bufmgr.h"
#include "storage/checksum.h"
#include "utils/builtins.h"
diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c
index c3fb5a9..6810cab 100644
--- a/contrib/passwordcheck/passwordcheck.c
+++ b/contrib/passwordcheck/passwordcheck.c
@@ -21,8 +21,8 @@
#endif
#include "commands/user.h"
-#include "libpq/crypt.h"
#include "fmgr.h"
+#include "libpq/crypt.h"
PG_MODULE_MAGIC;
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index 9fae146..c6beea7 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -30,9 +30,8 @@
#include <signal.h>
#include <sys/time.h>
-#include "pg_getopt.h"
-
#include "access/xlog_internal.h"
+#include "pg_getopt.h"
const char *progname;
diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c
index 1b9809b..4dbf0ff 100644
--- a/contrib/pg_trgm/trgm_gin.c
+++ b/contrib/pg_trgm/trgm_gin.c
@@ -3,12 +3,10 @@
*/
#include "postgres.h"
-#include "trgm.h"
-
#include "access/gin.h"
#include "access/stratnum.h"
#include "fmgr.h"
-
+#include "trgm.h"
PG_FUNCTION_INFO_V1(gin_extract_trgm);
PG_FUNCTION_INFO_V1(gin_extract_value_trgm);
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
index e79db8a..e022d0b 100644
--- a/contrib/pg_trgm/trgm_gist.c
+++ b/contrib/pg_trgm/trgm_gist.c
@@ -3,12 +3,10 @@
*/
#include "postgres.h"
-#include "trgm.h"
-
#include "access/stratnum.h"
#include "fmgr.h"
#include "port/pg_bitutils.h"
-
+#include "trgm.h"
typedef struct
{
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
index 0d4614e..4679efe 100644
--- a/contrib/pg_trgm/trgm_op.c
+++ b/contrib/pg_trgm/trgm_op.c
@@ -5,9 +5,8 @@
#include <ctype.h>
-#include "trgm.h"
-
#include "catalog/pg_type.h"
+#include "trgm.h"
#include "tsearch/ts_locale.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
diff --git a/contrib/pg_trgm/trgm_regexp.c b/contrib/pg_trgm/trgm_regexp.c
index 3ad5731..7965a29 100644
--- a/contrib/pg_trgm/trgm_regexp.c
+++ b/contrib/pg_trgm/trgm_regexp.c
@@ -191,14 +191,12 @@
*/
#include "postgres.h"
-#include "trgm.h"
-
#include "regex/regexport.h"
+#include "trgm.h"
#include "tsearch/ts_locale.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-
/*
* Uncomment (or use -DTRGM_REGEXP_DEBUG) to print debug info,
* for exploring and debugging the algorithm implementation.
diff --git a/contrib/pgcrypto/crypt-md5.c b/contrib/pgcrypto/crypt-md5.c
index 6a09d76..b6466d3 100644
--- a/contrib/pgcrypto/crypt-md5.c
+++ b/contrib/pgcrypto/crypt-md5.c
@@ -8,8 +8,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
+#include "px.h"
#define MD5_SIZE 16
diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
index db58408..a12d7b4 100644
--- a/contrib/pgcrypto/internal.c
+++ b/contrib/pgcrypto/internal.c
@@ -33,11 +33,11 @@
#include <time.h>
-#include "px.h"
-#include "md5.h"
-#include "sha1.h"
#include "blf.h"
+#include "md5.h"
+#include "px.h"
#include "rijndael.h"
+#include "sha1.h"
#ifndef MD5_DIGEST_LENGTH
#define MD5_DIGEST_LENGTH 16
diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c
index 73dbfbd..0467212 100644
--- a/contrib/pgcrypto/mbuf.c
+++ b/contrib/pgcrypto/mbuf.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
+#include "px.h"
#define STEP (16*1024)
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
index 7d686f3..3057afb 100644
--- a/contrib/pgcrypto/openssl.c
+++ b/contrib/pgcrypto/openssl.c
@@ -31,12 +31,11 @@
#include "postgres.h"
-#include "px.h"
-
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/rand.h>
+#include "px.h"
#include "utils/memutils.h"
#include "utils/resowner.h"
diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index f69ae10..f0ac625 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -34,13 +34,12 @@
#include <ctype.h>
#include "parser/scansup.h"
+#include "pgcrypto.h"
+#include "px-crypt.h"
+#include "px.h"
#include "utils/builtins.h"
#include "utils/uuid.h"
-#include "px.h"
-#include "px-crypt.h"
-#include "pgcrypto.h"
-
PG_MODULE_MAGIC;
/* private stuff */
diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c
index aa5b563..679779a 100644
--- a/contrib/pgcrypto/pgp-armor.c
+++ b/contrib/pgcrypto/pgp-armor.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* BASE64 - duplicated :(
diff --git a/contrib/pgcrypto/pgp-cfb.c b/contrib/pgcrypto/pgp-cfb.c
index 1d99915..8ae7c86 100644
--- a/contrib/pgcrypto/pgp-cfb.c
+++ b/contrib/pgcrypto/pgp-cfb.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
typedef int (*mix_data_t) (PGP_CFB *ctx, const uint8 *data, int len, uint8 *dst);
diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c
index 2adaf2c..0505bde 100644
--- a/contrib/pgcrypto/pgp-compress.c
+++ b/contrib/pgcrypto/pgp-compress.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
/*
* Compressed pkt writer
diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c
index 4c43eb7..3ecbf9c 100644
--- a/contrib/pgcrypto/pgp-decrypt.c
+++ b/contrib/pgcrypto/pgp-decrypt.c
@@ -31,9 +31,9 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
#define NO_CTX_SIZE 0
#define ALLOW_CTX_SIZE 1
diff --git a/contrib/pgcrypto/pgp-encrypt.c b/contrib/pgcrypto/pgp-encrypt.c
index 2938b4b..4651894 100644
--- a/contrib/pgcrypto/pgp-encrypt.c
+++ b/contrib/pgcrypto/pgp-encrypt.c
@@ -34,9 +34,8 @@
#include <time.h>
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
#define MDC_DIGEST_LEN 20
#define STREAM_ID 0xE0
diff --git a/contrib/pgcrypto/pgp-info.c b/contrib/pgcrypto/pgp-info.c
index 9bfbbe6..b2300ea 100644
--- a/contrib/pgcrypto/pgp-info.c
+++ b/contrib/pgcrypto/pgp-info.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
static int
read_pubkey_keyid(PullFilter *pkt, uint8 *keyid_buf)
diff --git a/contrib/pgcrypto/pgp-mpi-internal.c b/contrib/pgcrypto/pgp-mpi-internal.c
index c73f086..2353a48 100644
--- a/contrib/pgcrypto/pgp-mpi-internal.c
+++ b/contrib/pgcrypto/pgp-mpi-internal.c
@@ -31,9 +31,8 @@
#include "postgres.h"
#include "imath.h"
-
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static mpz_t *
mp_new()
diff --git a/contrib/pgcrypto/pgp-mpi-openssl.c b/contrib/pgcrypto/pgp-mpi-openssl.c
index afece26..75e4c8b 100644
--- a/contrib/pgcrypto/pgp-mpi-openssl.c
+++ b/contrib/pgcrypto/pgp-mpi-openssl.c
@@ -32,8 +32,8 @@
#include <openssl/bn.h>
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static BIGNUM *
mpi_to_bn(PGP_MPI *n)
diff --git a/contrib/pgcrypto/pgp-mpi.c b/contrib/pgcrypto/pgp-mpi.c
index 1da52ac..36a6d36 100644
--- a/contrib/pgcrypto/pgp-mpi.c
+++ b/contrib/pgcrypto/pgp-mpi.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
int
pgp_mpi_alloc(int bits, PGP_MPI **mpi)
diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c
index 3feadf7..8be895d 100644
--- a/contrib/pgcrypto/pgp-pgsql.c
+++ b/contrib/pgcrypto/pgp-pgsql.c
@@ -31,16 +31,15 @@
#include "postgres.h"
-#include "lib/stringinfo.h"
#include "catalog/pg_type.h"
-#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
-#include "utils/array.h"
#include "funcapi.h"
-
+#include "lib/stringinfo.h"
+#include "mb/pg_wchar.h"
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
/*
* public functions
diff --git a/contrib/pgcrypto/pgp-pubdec.c b/contrib/pgcrypto/pgp-pubdec.c
index b925ff8..a0a5738 100644
--- a/contrib/pgcrypto/pgp-pubdec.c
+++ b/contrib/pgcrypto/pgp-pubdec.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg = 02 || PS || 00 || M
diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c
index 08599f0..9fdcf7c 100644
--- a/contrib/pgcrypto/pgp-pubenc.c
+++ b/contrib/pgcrypto/pgp-pubenc.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg: 02 || non-zero pad bytes || 00 || msg
diff --git a/contrib/pgcrypto/pgp-pubkey.c b/contrib/pgcrypto/pgp-pubkey.c
index f898d72..d447e5f 100644
--- a/contrib/pgcrypto/pgp-pubkey.c
+++ b/contrib/pgcrypto/pgp-pubkey.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
int
pgp_key_alloc(PGP_PubKey **pk_p)
diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c
index 3f2f442..81ca1f0 100644
--- a/contrib/pgcrypto/pgp-s2k.c
+++ b/contrib/pgcrypto/pgp-s2k.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
static int
calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key,
diff --git a/contrib/pgcrypto/pgp.c b/contrib/pgcrypto/pgp.c
index dd8dae1..9b245fe 100644
--- a/contrib/pgcrypto/pgp.c
+++ b/contrib/pgcrypto/pgp.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* Defaults.
diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c
index 51be0b7..0913ff2 100644
--- a/contrib/pgcrypto/px-crypt.c
+++ b/contrib/pgcrypto/px-crypt.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
-
+#include "px.h"
static char *
run_crypt_des(const char *psw, const char *salt,
diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c
index 636c8d4..c17f244 100644
--- a/contrib/pgstattuple/pgstatapprox.c
+++ b/contrib/pgstattuple/pgstatapprox.c
@@ -13,12 +13,12 @@
#include "postgres.h"
#include "access/heapam.h"
+#include "access/htup_details.h"
+#include "access/multixact.h"
#include "access/relation.h"
#include "access/transam.h"
#include "access/visibilitymap.h"
#include "access/xact.h"
-#include "access/multixact.h"
-#include "access/htup_details.h"
#include "catalog/namespace.h"
#include "catalog/pg_am_d.h"
#include "commands/vacuum.h"
@@ -26,8 +26,8 @@
#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "storage/freespace.h"
-#include "storage/procarray.h"
#include "storage/lmgr.h"
+#include "storage/procarray.h"
#include "utils/builtins.h"
PG_FUNCTION_INFO_V1(pgstattuple_approx);
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index 57ed5f4..12f9dd3 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -12,21 +12,19 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/htup_details.h"
#include "access/xact.h"
#include "catalog/pg_user_mapping.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "postgres_fdw.h"
#include "storage/latch.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
-
/*
* Connection cache hash table entry
*
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c
index 431c34a..e803997 100644
--- a/contrib/postgres_fdw/deparse.c
+++ b/contrib/postgres_fdw/deparse.c
@@ -33,8 +33,6 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
@@ -52,13 +50,13 @@
#include "optimizer/prep.h"
#include "optimizer/tlist.h"
#include "parser/parsetree.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
-
/*
* Global context for foreign_expr_walker's search of an expression tree.
*/
diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
index 7ea68c3..da175a6 100644
--- a/contrib/postgres_fdw/option.c
+++ b/contrib/postgres_fdw/option.c
@@ -12,18 +12,16 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/reloptions.h"
#include "catalog/pg_foreign_server.h"
#include "catalog/pg_foreign_table.h"
#include "catalog/pg_user_mapping.h"
#include "commands/defrem.h"
#include "commands/extension.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/varlena.h"
-
/*
* Describes the valid options for objects that this wrapper uses.
*/
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 82d8140..3236664 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -12,8 +12,6 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
@@ -35,6 +33,7 @@
#include "optimizer/restrictinfo.h"
#include "optimizer/tlist.h"
#include "parser/parsetree.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/float.h"
#include "utils/guc.h"
diff --git a/contrib/postgres_fdw/shippable.c b/contrib/postgres_fdw/shippable.c
index 2b55a40..14d6d09 100644
--- a/contrib/postgres_fdw/shippable.c
+++ b/contrib/postgres_fdw/shippable.c
@@ -23,15 +23,13 @@
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/transam.h"
#include "catalog/dependency.h"
+#include "postgres_fdw.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/syscache.h"
-
/* Hash table for caching the results of shippability lookups */
static HTAB *ShippableCacheHash = NULL;
diff --git a/contrib/sepgsql/database.c b/contrib/sepgsql/database.c
index 8edd3df..0190d38 100644
--- a/contrib/sepgsql/database.c
+++ b/contrib/sepgsql/database.c
@@ -15,14 +15,14 @@
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/dependency.h"
-#include "catalog/pg_database.h"
#include "catalog/indexing.h"
+#include "catalog/pg_database.h"
#include "commands/dbcommands.h"
#include "commands/seclabel.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/snapmgr.h"
-#include "sepgsql.h"
/*
* sepgsql_database_post_create
diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c
index 2892346..1419879 100644
--- a/contrib/sepgsql/dml.c
+++ b/contrib/sepgsql/dml.c
@@ -14,8 +14,8 @@
#include "access/sysattr.h"
#include "access/tupdesc.h"
#include "catalog/catalog.h"
-#include "catalog/heap.h"
#include "catalog/dependency.h"
+#include "catalog/heap.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_class.h"
#include "catalog/pg_inherits.h"
@@ -23,11 +23,10 @@
#include "commands/tablecmds.h"
#include "executor/executor.h"
#include "nodes/bitmapset.h"
+#include "sepgsql.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
/*
* fixup_whole_row_references
*
diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c
index ebfa441..992c70e 100644
--- a/contrib/sepgsql/hooks.c
+++ b/contrib/sepgsql/hooks.c
@@ -20,12 +20,11 @@
#include "executor/executor.h"
#include "fmgr.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "tcop/utility.h"
#include "utils/guc.h"
#include "utils/queryenvironment.h"
-#include "sepgsql.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c
index 63a2dd5..d2505f7 100644
--- a/contrib/sepgsql/label.c
+++ b/contrib/sepgsql/label.c
@@ -12,8 +12,8 @@
#include <selinux/label.h>
-#include "access/htup_details.h"
#include "access/genam.h"
+#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
#include "catalog/catalog.h"
@@ -29,6 +29,7 @@
#include "libpq/auth.h"
#include "libpq/libpq-be.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/guc.h"
@@ -36,8 +37,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "sepgsql.h"
-
/*
* Saved hook entries (if stacked)
*/
diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c
index aa12dbe..345a4c2 100644
--- a/contrib/sepgsql/proc.c
+++ b/contrib/sepgsql/proc.c
@@ -21,14 +21,13 @@
#include "catalog/pg_type.h"
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
/*
* sepgsql_proc_post_create
*
diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c
index 0615275..714cffe 100644
--- a/contrib/sepgsql/relation.c
+++ b/contrib/sepgsql/relation.c
@@ -14,23 +14,22 @@
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
-#include "catalog/indexing.h"
#include "catalog/dependency.h"
+#include "catalog/indexing.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_class.h"
#include "catalog/pg_namespace.h"
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
-#include "utils/fmgroids.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
static void sepgsql_index_modify(Oid indexOid);
/*
diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c
index 4c4a90f..92ef156 100644
--- a/contrib/sepgsql/schema.c
+++ b/contrib/sepgsql/schema.c
@@ -21,13 +21,12 @@
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/snapmgr.h"
-#include "sepgsql.h"
-
/*
* sepgsql_schema_post_create
*
diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c
index 60fcf99..8ce0bc6 100644
--- a/contrib/sepgsql/uavc.c
+++ b/contrib/sepgsql/uavc.c
@@ -14,13 +14,12 @@
#include "catalog/pg_proc.h"
#include "commands/seclabel.h"
+#include "sepgsql.h"
#include "storage/ipc.h"
#include "utils/guc.h"
#include "utils/hashutils.h"
#include "utils/memutils.h"
-#include "sepgsql.h"
-
/*
* avc_cache
*
diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c
index 70476f7..3eb7004 100644
--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@@ -17,8 +17,8 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com>
#include "access/htup_details.h"
#include "catalog/pg_type.h"
-#include "executor/spi.h"
#include "commands/trigger.h"
+#include "executor/spi.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index e31be80..256d52f 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -40,9 +40,8 @@
#include "funcapi.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
-#include "utils/builtins.h"
-
#include "tablefunc.h"
+#include "utils/builtins.h"
PG_MODULE_MAGIC;
diff --git a/contrib/tcn/tcn.c b/contrib/tcn/tcn.c
index 5355a64..4568768 100644
--- a/contrib/tcn/tcn.c
+++ b/contrib/tcn/tcn.c
@@ -16,9 +16,9 @@
#include "postgres.h"
#include "access/htup_details.h"
-#include "executor/spi.h"
#include "commands/async.h"
#include "commands/trigger.h"
+#include "executor/spi.h"
#include "lib/stringinfo.h"
#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index 533e2ce..55b42e3 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -22,12 +22,11 @@
#endif
#include "catalog/pg_class_d.h"
-
#include "common/logging.h"
#include "fe_utils/connect.h"
+#include "getopt_long.h"
#include "libpq-fe.h"
#include "pg_getopt.h"
-#include "getopt_long.h"
#define BUFSIZE 1024
--
1.8.3.1
0003-Ordering-of-header-files-remaining-dir-oct21.patchapplication/octet-stream; name=0003-Ordering-of-header-files-remaining-dir-oct21.patchDownload
From a162a273af19e6f53743802303c5ddfe390136a8 Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Mon, 21 Oct 2019 22:49:11 +0530
Subject: [PATCH 3/3] Ordering of header files.
Ordering of header files that is included in source code.
---
src/bin/pg_archivecleanup/pg_archivecleanup.c | 6 ++----
src/bin/pg_basebackup/pg_basebackup.c | 2 +-
src/bin/pg_basebackup/pg_receivewal.c | 6 ++----
src/bin/pg_basebackup/pg_recvlogical.c | 6 ++----
src/bin/pg_basebackup/receivelog.c | 9 +++------
src/bin/pg_basebackup/streamutil.c | 6 ++----
src/bin/pg_basebackup/walmethods.c | 3 +--
src/bin/pg_config/pg_config.c | 2 +-
src/bin/pg_controldata/pg_controldata.c | 3 +--
src/bin/pg_dump/common.c | 8 +++-----
src/bin/pg_dump/parallel.c | 3 +--
src/bin/pg_dump/pg_backup_archiver.c | 7 +++----
src/bin/pg_dump/pg_backup_custom.c | 3 +--
src/bin/pg_dump/pg_backup_db.c | 16 +++++++---------
src/bin/pg_dump/pg_backup_directory.c | 8 ++++----
src/bin/pg_dump/pg_backup_null.c | 5 ++---
src/bin/pg_dump/pg_backup_tar.c | 14 +++++++-------
src/bin/pg_dump/pg_dump.c | 13 +++++--------
src/bin/pg_dump/pg_dump_sort.c | 3 +--
src/bin/pg_dump/pg_dumpall.c | 7 +++----
src/bin/pg_dump/pg_restore.c | 4 +---
src/bin/pg_resetwal/pg_resetwal.c | 7 +++----
src/bin/pg_rewind/datapagemap.c | 3 +--
src/bin/pg_rewind/fetch.c | 2 +-
src/bin/pg_rewind/filemap.c | 5 ++---
src/bin/pg_rewind/libpq_fetch.c | 7 +++----
src/bin/pg_rewind/parsexlog.c | 6 ++----
src/bin/pg_rewind/pg_rewind.c | 9 ++++-----
src/bin/pg_rewind/timeline.c | 3 +--
src/bin/pg_test_fsync/pg_test_fsync.c | 3 +--
src/bin/pg_upgrade/check.c | 1 -
src/bin/pg_upgrade/controldata.c | 4 ++--
src/bin/pg_upgrade/dump.c | 4 +---
src/bin/pg_upgrade/file.c | 13 ++++++-------
src/bin/pg_upgrade/function.c | 4 +---
src/bin/pg_upgrade/info.c | 4 +---
src/bin/pg_upgrade/option.c | 6 ++----
src/bin/pg_upgrade/parallel.c | 1 -
src/bin/pg_upgrade/pg_upgrade.c | 10 +++++-----
src/bin/pg_upgrade/relfilenode.c | 7 +++----
src/bin/pg_upgrade/server.c | 1 -
src/bin/pg_upgrade/util.c | 5 ++---
src/bin/pg_upgrade/version.c | 5 +----
src/bin/pg_waldump/compat.c | 2 +-
src/bin/pg_waldump/pg_waldump.c | 3 +--
src/bin/pgbench/pgbench.c | 15 ++++++++-------
src/bin/psql/common.c | 10 ++++------
src/bin/psql/copy.c | 10 ++++------
src/bin/psql/crosstabview.c | 3 +--
src/bin/psql/describe.c | 7 ++-----
src/bin/psql/help.c | 3 +--
src/bin/psql/input.c | 5 ++---
src/bin/psql/large_obj.c | 5 ++---
src/bin/psql/mainloop.c | 8 +++-----
src/bin/psql/prompt.c | 3 +--
src/bin/psql/startup.c | 10 +++-------
src/bin/psql/variables.c | 4 +---
src/common/f2s.c | 3 +--
src/fe_utils/print.c | 4 +---
src/fe_utils/recovery_gen.c | 3 +--
src/fe_utils/string_utils.c | 4 +---
src/interfaces/ecpg/compatlib/informix.c | 16 ++++++++--------
src/interfaces/ecpg/ecpglib/connect.c | 4 ++--
src/interfaces/ecpg/ecpglib/data.c | 10 +++++-----
src/interfaces/ecpg/ecpglib/descriptor.c | 5 ++---
src/interfaces/ecpg/ecpglib/error.c | 2 +-
src/interfaces/ecpg/ecpglib/execute.c | 17 ++++++++---------
src/interfaces/ecpg/ecpglib/memory.c | 4 ++--
src/interfaces/ecpg/ecpglib/misc.c | 11 ++++++-----
src/interfaces/ecpg/ecpglib/prepare.c | 4 ++--
src/interfaces/ecpg/ecpglib/sqlda.c | 9 ++++-----
src/interfaces/ecpg/ecpglib/typename.c | 5 ++---
src/interfaces/ecpg/pgtypeslib/common.c | 2 +-
src/interfaces/ecpg/pgtypeslib/datetime.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/dt_common.c | 2 +-
src/interfaces/ecpg/pgtypeslib/interval.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/numeric.c | 5 +++--
src/interfaces/ecpg/pgtypeslib/timestamp.c | 5 ++---
src/interfaces/ecpg/preproc/c_keywords.c | 5 ++---
src/interfaces/ecpg/preproc/ecpg_keywords.c | 5 ++---
src/interfaces/libpq/fe-auth.c | 3 +--
src/interfaces/libpq/fe-connect.c | 10 ++++------
src/interfaces/libpq/fe-exec.c | 9 ++++-----
src/interfaces/libpq/fe-misc.c | 3 +--
src/interfaces/libpq/fe-protocol2.c | 8 +++-----
src/interfaces/libpq/fe-protocol3.c | 10 ++++------
src/interfaces/libpq/fe-secure-gssapi.c | 2 +-
src/interfaces/libpq/fe-secure.c | 8 ++++----
src/pl/plpgsql/src/pl_comp.c | 4 +---
src/pl/plpgsql/src/pl_exec.c | 4 +---
src/pl/plpgsql/src/pl_funcs.c | 4 +---
src/pl/plpgsql/src/pl_handler.c | 4 +---
src/port/pg_crc32c_armv8.c | 4 ++--
src/port/pg_crc32c_sse42.c | 4 ++--
src/port/tar.c | 4 +++-
src/test/isolation/isolationtester.c | 5 ++---
.../modules/test_ginpostinglist/test_ginpostinglist.c | 2 +-
src/test/modules/test_integerset/test_integerset.c | 6 +++---
src/test/modules/test_rls_hooks/test_rls_hooks.c | 7 ++-----
src/test/modules/test_shm_mq/setup.c | 3 +--
src/test/modules/worker_spi/worker_spi.c | 16 +++++++---------
src/test/regress/pg_regress.c | 3 +--
src/test/regress/regress.c | 3 +--
103 files changed, 241 insertions(+), 350 deletions(-)
diff --git a/src/bin/pg_archivecleanup/pg_archivecleanup.c b/src/bin/pg_archivecleanup/pg_archivecleanup.c
index bb4257f..2917d7f 100644
--- a/src/bin/pg_archivecleanup/pg_archivecleanup.c
+++ b/src/bin/pg_archivecleanup/pg_archivecleanup.c
@@ -15,11 +15,9 @@
#include <signal.h>
#include <sys/time.h>
-#include "pg_getopt.h"
-
-#include "common/logging.h"
-
#include "access/xlog_internal.h"
+#include "common/logging.h"
+#include "pg_getopt.h"
const char *progname;
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 55ef139..a9d162a 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -35,9 +35,9 @@
#include "fe_utils/string_utils.h"
#include "getopt_long.h"
#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "pgtar.h"
#include "pgtime.h"
+#include "pqexpbuffer.h"
#include "receivelog.h"
#include "replication/basebackup.h"
#include "streamutil.h"
diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
index f39c133..c0c8747 100644
--- a/src/bin/pg_basebackup/pg_receivewal.c
+++ b/src/bin/pg_basebackup/pg_receivewal.c
@@ -19,16 +19,14 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/xlog_internal.h"
#include "common/file_perm.h"
#include "common/logging.h"
-#include "libpq-fe.h"
-#include "access/xlog_internal.h"
#include "getopt_long.h"
-
+#include "libpq-fe.h"
#include "receivelog.h"
#include "streamutil.h"
-
/* Time to sleep between reconnection attempts */
#define RECONNECT_SLEEP_TIME 5
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index af29dd7..b069d33 100644
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -19,18 +19,16 @@
#include <sys/select.h>
#endif
-/* local includes */
-#include "streamutil.h"
-
#include "access/xlog_internal.h"
-#include "common/file_perm.h"
#include "common/fe_memutils.h"
+#include "common/file_perm.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "libpq/pqsignal.h"
#include "pqexpbuffer.h"
+#include "streamutil.h"
/* Time to sleep between reconnection attempts */
#define RECONNECT_SLEEP_TIME 5
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
index d73f614..82fd9af 100644
--- a/src/bin/pg_basebackup/receivelog.c
+++ b/src/bin/pg_basebackup/receivelog.c
@@ -20,15 +20,12 @@
#include <sys/select.h>
#endif
-/* local includes */
-#include "receivelog.h"
-#include "streamutil.h"
-
-#include "libpq-fe.h"
#include "access/xlog_internal.h"
#include "common/file_utils.h"
#include "common/logging.h"
-
+#include "libpq-fe.h"
+#include "receivelog.h"
+#include "streamutil.h"
/* fd and filename for currently open WAL file */
static Walfile *walfile = NULL;
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
index 8d8ac11..94d1a12 100644
--- a/src/bin/pg_basebackup/streamutil.c
+++ b/src/bin/pg_basebackup/streamutil.c
@@ -17,10 +17,6 @@
#include <sys/time.h>
#include <unistd.h>
-/* local includes */
-#include "receivelog.h"
-#include "streamutil.h"
-
#include "access/xlog_internal.h"
#include "common/fe_memutils.h"
#include "common/file_perm.h"
@@ -29,6 +25,8 @@
#include "fe_utils/connect.h"
#include "port/pg_bswap.h"
#include "pqexpbuffer.h"
+#include "receivelog.h"
+#include "streamutil.h"
#define ERRCODE_DUPLICATE_OBJECT "42710"
diff --git a/src/bin/pg_basebackup/walmethods.c b/src/bin/pg_basebackup/walmethods.c
index 8ec12e6..d4d15b3 100644
--- a/src/bin/pg_basebackup/walmethods.c
+++ b/src/bin/pg_basebackup/walmethods.c
@@ -21,10 +21,9 @@
#include <zlib.h>
#endif
-#include "pgtar.h"
#include "common/file_perm.h"
#include "common/file_utils.h"
-
+#include "pgtar.h"
#include "receivelog.h"
#include "streamutil.h"
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 5279e7f..a1da918 100644
--- a/src/bin/pg_config/pg_config.c
+++ b/src/bin/pg_config/pg_config.c
@@ -24,8 +24,8 @@
#include "postgres_fe.h"
-#include "port.h"
#include "common/config_info.h"
+#include "port.h"
static const char *progname;
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index ff17804..b14767f 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -26,9 +26,8 @@
#include "catalog/pg_control.h"
#include "common/controldata_utils.h"
#include "common/logging.h"
-#include "pg_getopt.h"
#include "getopt_long.h"
-
+#include "pg_getopt.h"
static void
usage(const char *progname)
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 3549f7b..37432a6 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -15,15 +15,13 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_utils.h"
-#include "pg_dump.h"
-
#include <ctype.h>
#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"
-
+#include "pg_backup_archiver.h"
+#include "pg_backup_utils.h"
+#include "pg_dump.h"
/*
* Variables for mapping DumpId to DumpableObject
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index 03479f1..24239fa 100644
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -61,10 +61,9 @@
#include <sys/select.h>
#endif
+#include "fe_utils/string_utils.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-
-#include "fe_utils/string_utils.h"
#include "port/pg_bswap.h"
/* Mnemonic macros for indexing the fd array returned by pipe(2) */
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 6c739ce..d051f26 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -30,14 +30,13 @@
#include <io.h>
#endif
+#include "dumputils.h"
+#include "fe_utils/string_utils.h"
+#include "libpq/libpq-fs.h"
#include "parallel.h"
#include "pg_backup_archiver.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
-#include "dumputils.h"
-#include "fe_utils/string_utils.h"
-
-#include "libpq/libpq-fs.h"
#define TEXT_DUMP_HEADER "--\n-- PostgreSQL database dump\n--\n\n"
#define TEXT_DUMPALL_HEADER "--\n-- PostgreSQL database cluster dump\n--\n\n"
diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index 497b81b..fc742f5 100644
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -25,11 +25,10 @@
*/
#include "postgres_fe.h"
+#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-#include "common/file_utils.h"
-
/*--------
* Routines in the format interface
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index ee822c5..6dba7e1 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -11,21 +11,19 @@
*/
#include "postgres_fe.h"
-#include "fe_utils/connect.h"
-#include "fe_utils/string_utils.h"
-
-#include "dumputils.h"
-#include "parallel.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_db.h"
-#include "pg_backup_utils.h"
-
#include <unistd.h>
#include <ctype.h>
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
+#include "dumputils.h"
+#include "fe_utils/connect.h"
+#include "fe_utils/string_utils.h"
+#include "parallel.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_db.h"
+#include "pg_backup_utils.h"
static void _check_database_version(ArchiveHandle *AH);
static PGconn *_connectDB(ArchiveHandle *AH, const char *newdbname, const char *newUser);
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index e1afecf..aa00bca 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -34,13 +34,13 @@
*/
#include "postgres_fe.h"
+#include <dirent.h>
+#include <sys/stat.h>
+
+#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-#include "common/file_utils.h"
-
-#include <dirent.h>
-#include <sys/stat.h>
typedef struct
{
diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c
index 32c911a..c62f943 100644
--- a/src/bin/pg_dump/pg_backup_null.c
+++ b/src/bin/pg_dump/pg_backup_null.c
@@ -23,11 +23,10 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_utils.h"
#include "fe_utils/string_utils.h"
-
#include "libpq/libpq-fs.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_utils.h"
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
static void _WriteBlobData(ArchiveHandle *AH, const void *data, size_t dLen);
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index dead8fc..fd74835 100644
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -29,18 +29,18 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_tar.h"
-#include "pg_backup_utils.h"
-#include "pgtar.h"
-#include "common/file_utils.h"
-#include "fe_utils/string_utils.h"
-
#include <sys/stat.h>
#include <ctype.h>
#include <limits.h>
#include <unistd.h>
+#include "common/file_utils.h"
+#include "fe_utils/string_utils.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_tar.h"
+#include "pg_backup_utils.h"
+#include "pgtar.h"
+
static void _ArchiveEntry(ArchiveHandle *AH, TocEntry *te);
static void _StartData(ArchiveHandle *AH, TocEntry *te);
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 2a087d7..bf69adc 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -38,8 +38,6 @@
#include <termios.h>
#endif
-#include "getopt_long.h"
-
#include "access/attnum.h"
#include "access/sysattr.h"
#include "access/transam.h"
@@ -54,17 +52,16 @@
#include "catalog/pg_proc_d.h"
#include "catalog/pg_trigger_d.h"
#include "catalog/pg_type_d.h"
-#include "libpq/libpq-fs.h"
-#include "storage/block.h"
-
#include "dumputils.h"
+#include "fe_utils/connect.h"
+#include "fe_utils/string_utils.h"
+#include "getopt_long.h"
+#include "libpq/libpq-fs.h"
#include "parallel.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"
-#include "fe_utils/connect.h"
-#include "fe_utils/string_utils.h"
-
+#include "storage/block.h"
typedef struct
{
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 31fc06a..ad01316 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -15,12 +15,11 @@
*/
#include "postgres_fe.h"
+#include "catalog/pg_class_d.h"
#include "pg_backup_archiver.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"
-#include "catalog/pg_class_d.h"
-
/*
* Sort priority for database object types.
* Objects are sorted by type, and within a type by name.
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 0981efc..1442ea9 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -18,14 +18,13 @@
#include <time.h>
#include <unistd.h>
-#include "getopt_long.h"
-
-#include "dumputils.h"
-#include "pg_backup.h"
#include "common/file_utils.h"
#include "common/logging.h"
+#include "dumputils.h"
#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"
+#include "getopt_long.h"
+#include "pg_backup.h"
/* version string we expect back from pg_dump */
#define PGDUMP_VERSIONSTR "pg_dump (PostgreSQL) " PG_VERSION "\n"
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 40a6b37..d1a36b1 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -45,13 +45,11 @@
#include <termios.h>
#endif
-#include "getopt_long.h"
-
#include "dumputils.h"
+#include "getopt_long.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-
static void usage(const char *progname);
int
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index f85ea2d..c83f865 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -44,9 +44,9 @@
#include <time.h>
#include <unistd.h>
-#include "access/transam.h"
#include "access/heaptoast.h"
#include "access/multixact.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlog_internal.h"
#include "common/controldata_utils.h"
@@ -55,10 +55,9 @@
#include "common/logging.h"
#include "common/restricted_token.h"
#include "common/string.h"
-#include "storage/large_object.h"
-#include "pg_getopt.h"
#include "getopt_long.h"
-
+#include "pg_getopt.h"
+#include "storage/large_object.h"
static ControlFileData ControlFile; /* pg_control values */
static XLogSegNo newXlogSegNo; /* new XLOG segment # */
diff --git a/src/bin/pg_rewind/datapagemap.c b/src/bin/pg_rewind/datapagemap.c
index 93165f6..c903dbb 100644
--- a/src/bin/pg_rewind/datapagemap.c
+++ b/src/bin/pg_rewind/datapagemap.c
@@ -12,9 +12,8 @@
#include "postgres_fe.h"
-#include "datapagemap.h"
-
#include "common/logging.h"
+#include "datapagemap.h"
struct datapagemap_iterator
{
diff --git a/src/bin/pg_rewind/fetch.c b/src/bin/pg_rewind/fetch.c
index 03a5fd6..294c72c 100644
--- a/src/bin/pg_rewind/fetch.c
+++ b/src/bin/pg_rewind/fetch.c
@@ -19,10 +19,10 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "pg_rewind.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
+#include "pg_rewind.h"
void
fetchSourceFileList(void)
diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c
index 601f7e9..21254f3 100644
--- a/src/bin/pg_rewind/filemap.c
+++ b/src/bin/pg_rewind/filemap.c
@@ -13,12 +13,11 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "catalog/pg_tablespace_d.h"
+#include "common/string.h"
#include "datapagemap.h"
#include "filemap.h"
#include "pg_rewind.h"
-
-#include "common/string.h"
-#include "catalog/pg_tablespace_d.h"
#include "storage/fd.h"
filemap_t *filemap = NULL;
diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c
index f4ebf7d..2cc87e8 100644
--- a/src/bin/pg_rewind/libpq_fetch.c
+++ b/src/bin/pg_rewind/libpq_fetch.c
@@ -14,14 +14,13 @@
#include <fcntl.h>
#include <unistd.h>
-#include "pg_rewind.h"
+#include "catalog/pg_type_d.h"
#include "datapagemap.h"
+#include "fe_utils/connect.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
-
-#include "catalog/pg_type_d.h"
-#include "fe_utils/connect.h"
+#include "pg_rewind.h"
#include "port/pg_bswap.h"
PGconn *conn = NULL;
diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c
index 264a8f4..1d03375 100644
--- a/src/bin/pg_rewind/parsexlog.c
+++ b/src/bin/pg_rewind/parsexlog.c
@@ -13,16 +13,14 @@
#include <unistd.h>
-#include "pg_rewind.h"
-#include "filemap.h"
-
#include "access/rmgr.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "catalog/pg_control.h"
#include "catalog/storage_xlog.h"
#include "commands/dbcommands_xlog.h"
-
+#include "filemap.h"
+#include "pg_rewind.h"
/*
* RmgrNames is an array of resource manager names, to make error messages
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 875a43b..e75c7ee 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -14,11 +14,6 @@
#include <time.h>
#include <unistd.h>
-#include "pg_rewind.h"
-#include "fetch.h"
-#include "file_ops.h"
-#include "filemap.h"
-
#include "access/timeline.h"
#include "access/xlog_internal.h"
#include "catalog/catversion.h"
@@ -28,7 +23,11 @@
#include "common/file_utils.h"
#include "common/restricted_token.h"
#include "fe_utils/recovery_gen.h"
+#include "fetch.h"
+#include "file_ops.h"
+#include "filemap.h"
#include "getopt_long.h"
+#include "pg_rewind.h"
#include "storage/bufpage.h"
static void usage(const char *progname);
diff --git a/src/bin/pg_rewind/timeline.c b/src/bin/pg_rewind/timeline.c
index 987452c..a29b56b 100644
--- a/src/bin/pg_rewind/timeline.c
+++ b/src/bin/pg_rewind/timeline.c
@@ -9,10 +9,9 @@
*/
#include "postgres_fe.h"
-#include "pg_rewind.h"
-
#include "access/timeline.h"
#include "access/xlog_internal.h"
+#include "pg_rewind.h"
/*
* This is copy-pasted from the backend readTimeLineHistory, modified to
diff --git a/src/bin/pg_test_fsync/pg_test_fsync.c b/src/bin/pg_test_fsync/pg_test_fsync.c
index 225557e..2ca1608 100644
--- a/src/bin/pg_test_fsync/pg_test_fsync.c
+++ b/src/bin/pg_test_fsync/pg_test_fsync.c
@@ -12,10 +12,9 @@
#include <unistd.h>
#include <signal.h>
-#include "getopt_long.h"
#include "access/xlogdefs.h"
#include "common/logging.h"
-
+#include "getopt_long.h"
/*
* put the temp files in the local directory
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 87b9d32..ff7057d 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -14,7 +14,6 @@
#include "mb/pg_wchar.h"
#include "pg_upgrade.h"
-
static void check_new_cluster_is_empty(void);
static void check_databases_are_compatible(void);
static void check_locale_and_encoding(DbInfo *olddb, DbInfo *newdb);
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 3823641..93f3c34 100644
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -9,10 +9,10 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include <ctype.h>
+#include "pg_upgrade.h"
+
/*
* get_control_data()
*
diff --git a/src/bin/pg_upgrade/dump.c b/src/bin/pg_upgrade/dump.c
index c1429fe..bdb5006 100644
--- a/src/bin/pg_upgrade/dump.c
+++ b/src/bin/pg_upgrade/dump.c
@@ -9,10 +9,8 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "fe_utils/string_utils.h"
-
+#include "pg_upgrade.h"
void
generate_old_dump(void)
diff --git a/src/bin/pg_upgrade/file.c b/src/bin/pg_upgrade/file.c
index c7fed24..ab64d5f 100644
--- a/src/bin/pg_upgrade/file.c
+++ b/src/bin/pg_upgrade/file.c
@@ -9,13 +9,6 @@
#include "postgres_fe.h"
-#include "access/visibilitymap.h"
-#include "common/file_perm.h"
-#include "pg_upgrade.h"
-#include "storage/bufpage.h"
-#include "storage/checksum.h"
-#include "storage/checksum_impl.h"
-
#include <sys/stat.h>
#include <fcntl.h>
#ifdef HAVE_COPYFILE_H
@@ -26,6 +19,12 @@
#include <linux/fs.h>
#endif
+#include "access/visibilitymap.h"
+#include "common/file_perm.h"
+#include "pg_upgrade.h"
+#include "storage/bufpage.h"
+#include "storage/checksum.h"
+#include "storage/checksum_impl.h"
#ifdef WIN32
static int win32_pghardlink(const char *src, const char *dst);
diff --git a/src/bin/pg_upgrade/function.c b/src/bin/pg_upgrade/function.c
index 3cbaab6..ac984db 100644
--- a/src/bin/pg_upgrade/function.c
+++ b/src/bin/pg_upgrade/function.c
@@ -9,11 +9,9 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "access/transam.h"
#include "catalog/pg_language_d.h"
-
+#include "pg_upgrade.h"
/*
* qsort comparator for pointers to library names
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 5c7b433..d67d3a4 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -9,11 +9,9 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "access/transam.h"
#include "catalog/pg_class_d.h"
-
+#include "pg_upgrade.h"
static void create_rel_filename_map(const char *old_data, const char *new_data,
const DbInfo *old_db, const DbInfo *new_db,
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index da9e1da..14351e8 100644
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -14,12 +14,10 @@
#include <io.h>
#endif
-#include "getopt_long.h"
#include "common/string.h"
-#include "utils/pidfile.h"
-
+#include "getopt_long.h"
#include "pg_upgrade.h"
-
+#include "utils/pidfile.h"
static void usage(void);
static void check_required_directory(char **dirpath,
diff --git a/src/bin/pg_upgrade/parallel.c b/src/bin/pg_upgrade/parallel.c
index 80ab1b8..d3d3401 100644
--- a/src/bin/pg_upgrade/parallel.c
+++ b/src/bin/pg_upgrade/parallel.c
@@ -16,7 +16,6 @@
#include "pg_upgrade.h"
-
static int parallel_jobs;
#ifdef WIN32
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index 5b82e0c..5154a71 100644
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -37,16 +37,16 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
#include "catalog/pg_class_d.h"
#include "common/file_perm.h"
#include "common/logging.h"
#include "common/restricted_token.h"
#include "fe_utils/string_utils.h"
-
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
+#include "pg_upgrade.h"
static void prepare_new_cluster(void);
static void prepare_new_globals(void);
diff --git a/src/bin/pg_upgrade/relfilenode.c b/src/bin/pg_upgrade/relfilenode.c
index 0c78073..f9d0812 100644
--- a/src/bin/pg_upgrade/relfilenode.c
+++ b/src/bin/pg_upgrade/relfilenode.c
@@ -9,12 +9,11 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include <sys/stat.h>
-#include "catalog/pg_class_d.h"
-#include "access/transam.h"
+#include "access/transam.h"
+#include "catalog/pg_class_d.h"
+#include "pg_upgrade.h"
static void transfer_single_new_db(FileNameMap *maps, int size, char *old_tablespace);
static void transfer_relfile(FileNameMap *map, const char *suffix, bool vm_must_add_frozenbit);
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index 6ad4b14..30f28bd 100644
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -13,7 +13,6 @@
#include "fe_utils/string_utils.h"
#include "pg_upgrade.h"
-
static PGconn *get_db_conn(ClusterInfo *cluster, const char *db_name);
diff --git a/src/bin/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c
index d867995..46d0bb4 100644
--- a/src/bin/pg_upgrade/util.c
+++ b/src/bin/pg_upgrade/util.c
@@ -9,11 +9,10 @@
#include "postgres_fe.h"
-#include "common/username.h"
-#include "pg_upgrade.h"
-
#include <signal.h>
+#include "common/username.h"
+#include "pg_upgrade.h"
LogOpts log_opts;
diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index b64171d..3e6d6b0 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -9,12 +9,9 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"
-
-
+#include "pg_upgrade.h"
/*
* new_9_0_populate_pg_largeobject_metadata()
diff --git a/src/bin/pg_waldump/compat.c b/src/bin/pg_waldump/compat.c
index 0e0dca7..7b389a2 100644
--- a/src/bin/pg_waldump/compat.c
+++ b/src/bin/pg_waldump/compat.c
@@ -20,8 +20,8 @@
#include <time.h>
-#include "utils/datetime.h"
#include "lib/stringinfo.h"
+#include "utils/datetime.h"
/* copied from timestamp.c */
pg_time_t
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index b79208c..8e54d7f 100644
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -16,16 +16,15 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-#include "access/xlog_internal.h"
#include "access/transam.h"
#include "common/fe_memutils.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "rmgrdesc.h"
-
static const char *progname;
static int WalSegSz;
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index e72ad00..03bcd22 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -32,12 +32,6 @@
#endif
#include "postgres_fe.h"
-#include "common/int.h"
-#include "common/logging.h"
-#include "fe_utils/conditional.h"
-#include "getopt_long.h"
-#include "libpq-fe.h"
-#include "portability/instr_time.h"
#include <ctype.h>
#include <float.h>
@@ -63,11 +57,18 @@
#endif
#endif
+#include "common/int.h"
+#include "common/logging.h"
+#include "fe_utils/conditional.h"
+#include "getopt_long.h"
+#include "libpq-fe.h"
+#include "pgbench.h"
+#include "portability/instr_time.h"
+
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
-#include "pgbench.h"
#define ERRCODE_UNDEFINED_TABLE "42P01"
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 4b26793..90f6380 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -18,18 +18,16 @@
#include <win32.h>
#endif
-#include "common/logging.h"
-#include "fe_utils/mbprint.h"
-#include "fe_utils/string_utils.h"
-#include "portability/instr_time.h"
-
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "copy.h"
#include "crosstabview.h"
+#include "fe_utils/mbprint.h"
+#include "fe_utils/string_utils.h"
+#include "portability/instr_time.h"
#include "settings.h"
-
static bool DescribeQuery(const char *query, double *elapsed_msec);
static bool ExecQueryUsingCursor(const char *query, double *elapsed_msec);
static bool command_no_begin(const char *query);
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index f9e53d6..04e518e 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -6,7 +6,6 @@
* src/bin/psql/copy.c
*/
#include "postgres_fe.h"
-#include "copy.h"
#include <signal.h>
#include <sys/stat.h>
@@ -16,16 +15,15 @@
#include <io.h> /* I think */
#endif
+#include "common.h"
+#include "common/logging.h"
+#include "copy.h"
#include "libpq-fe.h"
#include "pqexpbuffer.h"
-
-#include "settings.h"
-#include "common.h"
#include "prompt.h"
+#include "settings.h"
#include "stringutils.h"
-#include "common/logging.h"
-
/*
* parse_slash_copy
* -- parses \copy command line
diff --git a/src/bin/psql/crosstabview.c b/src/bin/psql/crosstabview.c
index 83789cb..701ef34 100644
--- a/src/bin/psql/crosstabview.c
+++ b/src/bin/psql/crosstabview.c
@@ -8,13 +8,12 @@
#include "postgres_fe.h"
#include "common.h"
+#include "common/logging.h"
#include "crosstabview.h"
#include "pqexpbuffer.h"
#include "psqlscanslash.h"
#include "settings.h"
-#include "common/logging.h"
-
/*
* Value/position from the resultset that goes into the horizontal or vertical
* crosstabview header.
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index d7c0fc0..b3b9313 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -18,18 +18,15 @@
#include "catalog/pg_cast_d.h"
#include "catalog/pg_class_d.h"
#include "catalog/pg_default_acl_d.h"
-
+#include "common.h"
#include "common/logging.h"
+#include "describe.h"
#include "fe_utils/mbprint.h"
#include "fe_utils/print.h"
#include "fe_utils/string_utils.h"
-
-#include "common.h"
-#include "describe.h"
#include "settings.h"
#include "variables.h"
-
static bool describeOneTableDetails(const char *schemaname,
const char *relationname,
const char *oid,
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 59ea8cc..0f58eeb 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -21,10 +21,9 @@
#include <termios.h>
#endif
+#include "common.h"
#include "common/logging.h"
#include "common/username.h"
-
-#include "common.h"
#include "help.h"
#include "input.h"
#include "settings.h"
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 5a18ac9..5798e6e 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -13,12 +13,11 @@
#include <fcntl.h>
#include <limits.h>
+#include "common.h"
+#include "common/logging.h"
#include "input.h"
#include "settings.h"
#include "tab-complete.h"
-#include "common.h"
-
-#include "common/logging.h"
#ifndef WIN32
#define PSQLHISTORY ".psql_history"
diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c
index 2713f15..042403e 100644
--- a/src/bin/psql/large_obj.c
+++ b/src/bin/psql/large_obj.c
@@ -6,12 +6,11 @@
* src/bin/psql/large_obj.c
*/
#include "postgres_fe.h"
-#include "large_obj.h"
-#include "settings.h"
#include "common.h"
-
#include "common/logging.h"
+#include "large_obj.h"
+#include "settings.h"
static void print_lo_result(const char *fmt,...) pg_attribute_printf(1, 2);
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index e386d98..b3a8407 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -6,18 +6,16 @@
* src/bin/psql/mainloop.c
*/
#include "postgres_fe.h"
-#include "mainloop.h"
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "input.h"
+#include "mainloop.h"
+#include "mb/pg_wchar.h"
#include "prompt.h"
#include "settings.h"
-#include "common/logging.h"
-#include "mb/pg_wchar.h"
-
-
/* callback functions for our flex lexer */
const PsqlScanCallbacks psqlscan_callbacks = {
psql_get_variable,
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index 0fcb8c7..195192a 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -18,12 +18,11 @@
#endif
#include "common.h"
+#include "common/string.h"
#include "input.h"
#include "prompt.h"
#include "settings.h"
-#include "common/string.h"
-
/*--------------------------
* get_prompt
*
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index e4c0a7e..0d941ef 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -14,21 +14,17 @@
#include <win32.h>
#endif /* WIN32 */
-#include "getopt_long.h"
-
-#include "common/logging.h"
-#include "fe_utils/print.h"
-
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "describe.h"
+#include "fe_utils/print.h"
+#include "getopt_long.h"
#include "help.h"
#include "input.h"
#include "mainloop.h"
#include "settings.h"
-
-
/*
* Global psql options
*/
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index 1d2a31c..3f7b641 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -8,10 +8,8 @@
#include "postgres_fe.h"
#include "common.h"
-#include "variables.h"
-
#include "common/logging.h"
-
+#include "variables.h"
/*
* Check whether a variable's name is allowed.
diff --git a/src/common/f2s.c b/src/common/f2s.c
index e332557..ea5ca8d 100644
--- a/src/common/f2s.c
+++ b/src/common/f2s.c
@@ -39,9 +39,8 @@
#endif
#include "common/shortest_dec.h"
-
-#include "ryu_common.h"
#include "digit_table.h"
+#include "ryu_common.h"
#define FLOAT_MANTISSA_BITS 23
#define FLOAT_EXPONENT_BITS 8
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index e41f42e..1f8bde8 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -30,11 +30,9 @@
#include <termios.h>
#endif
-#include "fe_utils/print.h"
-
#include "catalog/pg_type_d.h"
#include "fe_utils/mbprint.h"
-
+#include "fe_utils/print.h"
/*
* If the calling program doesn't have any mechanism for setting
diff --git a/src/fe_utils/recovery_gen.c b/src/fe_utils/recovery_gen.c
index 6641f95..aec01c0 100644
--- a/src/fe_utils/recovery_gen.c
+++ b/src/fe_utils/recovery_gen.c
@@ -10,9 +10,8 @@
#include "postgres_fe.h"
#include "common/logging.h"
-#include "fe_utils/string_utils.h"
#include "fe_utils/recovery_gen.h"
-
+#include "fe_utils/string_utils.h"
static char *escape_quotes(const char *src);
diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c
index 8c3a603..b07f142 100644
--- a/src/fe_utils/string_utils.c
+++ b/src/fe_utils/string_utils.c
@@ -17,10 +17,8 @@
#include <ctype.h>
-#include "fe_utils/string_utils.h"
-
#include "common/keywords.h"
-
+#include "fe_utils/string_utils.h"
static PQExpBuffer defaultGetLocalPQExpBuffer(void);
diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
index 6ef1fad..bbaf450 100644
--- a/src/interfaces/ecpg/compatlib/informix.c
+++ b/src/interfaces/ecpg/compatlib/informix.c
@@ -7,14 +7,14 @@
#include <ctype.h>
#include <limits.h>
-#include <ecpgtype.h>
-#include <ecpg_informix.h>
-#include <pgtypes_error.h>
-#include <pgtypes_date.h>
-#include <pgtypes_numeric.h>
-#include <sqltypes.h>
-#include <sqlca.h>
-#include <ecpgerrno.h>
+#include "ecpg_informix.h"
+#include "ecpgerrno.h"
+#include "ecpgtype.h"
+#include "pgtypes_date.h"
+#include "pgtypes_error.h"
+#include "pgtypes_numeric.h"
+#include "sqlca.h"
+#include "sqltypes.h"
/* this is also defined in ecpglib/misc.c, by defining it twice we don't have to export the symbol */
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
index b4f6089..1cb5211 100644
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -4,10 +4,10 @@
#include "postgres_fe.h"
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#ifdef ENABLE_THREAD_SAFETY
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 81f94cc..7d2a78a 100644
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -5,15 +5,15 @@
#include <math.h>
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
+#include "sqlca.h"
/* returns true if character c is a delimiter for the given array type */
static bool
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index ef500a9..ead8778 100644
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -7,12 +7,11 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#include "sqlda.h"
#include "sql3types.h"
diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c
index 9c56991..a4e3c0d 100644
--- a/src/interfaces/ecpg/ecpglib/error.c
+++ b/src/interfaces/ecpg/ecpglib/error.c
@@ -4,9 +4,9 @@
#include "postgres_fe.h"
#include "ecpgerrno.h"
-#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
void
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 7c9cb76..23cc869 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -19,19 +19,18 @@
#include <math.h>
#include "catalog/pg_type_d.h"
-
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "sqlda-native.h"
-#include "sqlda-compat.h"
-#include "sql3types.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
+#include "sql3types.h"
+#include "sqlca.h"
+#include "sqlda-compat.h"
+#include "sqlda-native.h"
/*
* This function returns a newly malloced string that has ' and \
diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c
index 52ca1c5..bd81251 100644
--- a/src/interfaces/ecpg/ecpglib/memory.c
+++ b/src/interfaces/ecpg/ecpglib/memory.c
@@ -4,10 +4,10 @@
#include "postgres_fe.h"
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
void
ecpg_free(void *ptr)
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index 2eec54a..647da14 100644
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -5,17 +5,18 @@
#include <limits.h>
#include <unistd.h>
+
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
#include "pg_config_paths.h"
+#include "sqlca.h"
#ifdef HAVE_LONG_LONG_INT
#ifndef LONG_LONG_MIN
diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c
index 6e7adb9..b9653c0 100644
--- a/src/interfaces/ecpg/ecpglib/prepare.c
+++ b/src/interfaces/ecpg/ecpglib/prepare.c
@@ -5,10 +5,10 @@
#include <ctype.h>
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#define STMTID_SIZE 32
diff --git a/src/interfaces/ecpg/ecpglib/sqlda.c b/src/interfaces/ecpg/ecpglib/sqlda.c
index 3fb0d82..081e326 100644
--- a/src/interfaces/ecpg/ecpglib/sqlda.c
+++ b/src/interfaces/ecpg/ecpglib/sqlda.c
@@ -10,16 +10,15 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
-#include "ecpg-pthread-win32.h"
#include "decimal.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
+#include "ecpg-pthread-win32.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
-#include "sqlda-native.h"
#include "sqlda-compat.h"
+#include "sqlda-native.h"
/*
* Compute the next variable's offset with
diff --git a/src/interfaces/ecpg/ecpglib/typename.c b/src/interfaces/ecpg/ecpglib/typename.c
index 9251450..1d482c4 100644
--- a/src/interfaces/ecpg/ecpglib/typename.c
+++ b/src/interfaces/ecpg/ecpglib/typename.c
@@ -4,12 +4,11 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
-#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqltypes.h"
+#include "ecpgtype.h"
#include "sql3types.h"
+#include "sqltypes.h"
/*
* This function is used to generate the correct type names.
diff --git a/src/interfaces/ecpg/pgtypeslib/common.c b/src/interfaces/ecpg/pgtypeslib/common.c
index abcf7f5..8972229 100644
--- a/src/interfaces/ecpg/pgtypeslib/common.c
+++ b/src/interfaces/ecpg/pgtypeslib/common.c
@@ -2,8 +2,8 @@
#include "postgres_fe.h"
-#include "pgtypeslib_extern.h"
#include "pgtypes.h"
+#include "pgtypeslib_extern.h"
/* Return value is zero-filled. */
char *
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index 9ee460b..71dc1a5 100644
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -6,10 +6,10 @@
#include <ctype.h>
#include <limits.h>
-#include "pgtypeslib_extern.h"
#include "dt.h"
-#include "pgtypes_error.h"
#include "pgtypes_date.h"
+#include "pgtypes_error.h"
+#include "pgtypeslib_extern.h"
date *
PGTYPESdate_new(void)
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index 29c1117..c22f657 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -7,9 +7,9 @@
#include <math.h>
#include "common/string.h"
-#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_timestamp.h"
+#include "pgtypeslib_extern.h"
const int day_tab[2][13] = {
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0},
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index 3ff8a10..5b3c9a7 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -1,6 +1,7 @@
/* src/interfaces/ecpg/pgtypeslib/interval.c */
#include "postgres_fe.h"
+
#include <time.h>
#include <math.h>
#include <limits.h>
@@ -10,11 +11,10 @@
#endif
#include "common/string.h"
-
-#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_error.h"
#include "pgtypes_interval.h"
+#include "pgtypeslib_extern.h"
/* copy&pasted from .../src/backend/utils/adt/datetime.c
* and changesd struct pg_tm to struct tm
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index 22088ba..b6ca2d3 100644
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -1,12 +1,14 @@
/* src/interfaces/ecpg/pgtypeslib/numeric.c */
#include "postgres_fe.h"
+
#include <ctype.h>
#include <float.h>
#include <limits.h>
-#include "pgtypeslib_extern.h"
#include "pgtypes_error.h"
+#include "pgtypes_numeric.h"
+#include "pgtypeslib_extern.h"
#define Max(x, y) ((x) > (y) ? (x) : (y))
#define Min(x, y) ((x) < (y) ? (x) : (y))
@@ -20,7 +22,6 @@
free(buf); \
} while (0)
-#include "pgtypes_numeric.h"
#if 0
/* ----------
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 2be151f..7816e6f 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -11,11 +11,10 @@
#error -ffast-math is known to break this code
#endif
-#include "pgtypeslib_extern.h"
#include "dt.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_date.h"
-
+#include "pgtypes_timestamp.h"
+#include "pgtypeslib_extern.h"
static int64
time2t(const int hour, const int min, const int sec, const fsec_t fsec)
diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c
index 80aa7d5..e51c036 100644
--- a/src/interfaces/ecpg/preproc/c_keywords.c
+++ b/src/interfaces/ecpg/preproc/c_keywords.c
@@ -9,11 +9,10 @@
*/
#include "postgres_fe.h"
-#include "preproc_extern.h"
-#include "preproc.h"
-
/* ScanKeywordList lookup data for C keywords */
#include "c_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"
/* Token codes for C keywords */
#define PG_KEYWORD(kwname, value) value,
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index 4839c37..a2db06f 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -13,11 +13,10 @@
#include <ctype.h>
-#include "preproc_extern.h"
-#include "preproc.h"
-
/* ScanKeywordList lookup data for ECPG keywords */
#include "ecpg_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"
/* Token codes for ECPG keywords */
#define PG_KEYWORD(kwname, value) value,
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index a690f3b..2364dda 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -40,9 +40,8 @@
#include "common/md5.h"
#include "common/scram-common.h"
-#include "libpq-fe.h"
#include "fe-auth.h"
-
+#include "libpq-fe.h"
#ifdef ENABLE_GSS
/*
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index f91f0f2..959082b 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -21,11 +21,6 @@
#include <time.h>
#include <unistd.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-#include "fe-auth.h"
-#include "pg_config_paths.h"
-
#ifdef WIN32
#include "win32.h"
#ifdef _WIN32_IE
@@ -74,10 +69,13 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
#include "common/link-canary.h"
#include "common/scram-common.h"
#include "common/string.h"
+#include "fe-auth.h"
+#include "libpq-fe.h"
+#include "libpq-int.h"
#include "mb/pg_wchar.h"
+#include "pg_config_paths.h"
#include "port/pg_bswap.h"
-
#ifndef WIN32
#define PGPASSFILE ".pgpass"
#else
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index b3c59a0..051f548 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -18,17 +18,16 @@
#include <fcntl.h>
#include <limits.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-
-#include "mb/pg_wchar.h"
-
#ifdef WIN32
#include "win32.h"
#else
#include <unistd.h>
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "mb/pg_wchar.h"
+
/* keep this in same order as ExecStatusType in libpq-fe.h */
char *const pgresStatus[] = {
"PGRES_EMPTY_QUERY",
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 18fec4a..a7c08c5 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -50,9 +50,8 @@
#include "libpq-fe.h"
#include "libpq-int.h"
#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
#include "pg_config_paths.h"
-
+#include "port/pg_bswap.h"
static int pqPutMsgBytes(const void *buf, size_t len, PGconn *conn);
static int pqSendSome(PGconn *conn, int len);
diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c
index 0e36974..e71e25a 100644
--- a/src/interfaces/libpq/fe-protocol2.c
+++ b/src/interfaces/libpq/fe-protocol2.c
@@ -17,11 +17,6 @@
#include <ctype.h>
#include <fcntl.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-#include "port/pg_bswap.h"
-
-
#ifdef WIN32
#include "win32.h"
#else
@@ -31,6 +26,9 @@
#endif
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "port/pg_bswap.h"
static int getRowDescriptions(PGconn *conn);
static int getAnotherTuple(PGconn *conn, bool binary);
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
index b04f7ec..c97841e 100644
--- a/src/interfaces/libpq/fe-protocol3.c
+++ b/src/interfaces/libpq/fe-protocol3.c
@@ -17,12 +17,6 @@
#include <ctype.h>
#include <fcntl.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-
-#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
-
#ifdef WIN32
#include "win32.h"
#else
@@ -32,6 +26,10 @@
#endif
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "mb/pg_wchar.h"
+#include "port/pg_bswap.h"
/*
* This macro lists the backend message types that could be "long" (more
diff --git a/src/interfaces/libpq/fe-secure-gssapi.c b/src/interfaces/libpq/fe-secure-gssapi.c
index 095750d..a1c1d12 100644
--- a/src/interfaces/libpq/fe-secure-gssapi.c
+++ b/src/interfaces/libpq/fe-secure-gssapi.c
@@ -13,9 +13,9 @@
#include "postgres_fe.h"
+#include "fe-gssapi-common.h"
#include "libpq-fe.h"
#include "libpq-int.h"
-#include "fe-gssapi-common.h"
#include "port/pg_bswap.h"
/*
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index b8191b4..e55b375 100644
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -28,10 +28,6 @@
#include <fcntl.h>
#include <ctype.h>
-#include "libpq-fe.h"
-#include "fe-auth.h"
-#include "libpq-int.h"
-
#ifdef WIN32
#include "win32.h"
#else
@@ -55,6 +51,10 @@
#endif
#endif
+#include "fe-auth.h"
+#include "libpq-fe.h"
+#include "libpq-int.h"
+
/*
* Macros to handle disabling and then restoring the state of SIGPIPE handling.
* On Windows, these are all no-ops since there's no SIGPIPEs.
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 0c24ba6..3fb8fc7 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -24,6 +24,7 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "parser/parse_type.h"
+#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
@@ -33,9 +34,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "plpgsql.h"
-
-
/* ----------
* Our own local and global variables
* ----------
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 345065e..fd799b7 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -34,6 +34,7 @@
#include "parser/parse_coerce.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
+#include "plpgsql.h"
#include "storage/proc.h"
#include "tcop/tcopprot.h"
#include "tcop/utility.h"
@@ -48,9 +49,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "plpgsql.h"
-
-
typedef struct
{
int nargs; /* number of arguments */
diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
index 053f83d..2d4616c 100644
--- a/src/pl/plpgsql/src/pl_funcs.c
+++ b/src/pl/plpgsql/src/pl_funcs.c
@@ -15,10 +15,8 @@
#include "postgres.h"
-#include "utils/memutils.h"
-
#include "plpgsql.h"
-
+#include "utils/memutils.h"
/* ----------
* Local variables for namespace handling
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index ce03f1e..e92deb3 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -20,15 +20,13 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/varlena.h"
-#include "plpgsql.h"
-
-
static bool plpgsql_extra_checks_check_hook(char **newvalue, void **extra, GucSource source);
static void plpgsql_extra_warnings_assign_hook(const char *newvalue, void *extra);
static void plpgsql_extra_errors_assign_hook(const char *newvalue, void *extra);
diff --git a/src/port/pg_crc32c_armv8.c b/src/port/pg_crc32c_armv8.c
index ebe449e..de725d3 100644
--- a/src/port/pg_crc32c_armv8.c
+++ b/src/port/pg_crc32c_armv8.c
@@ -14,10 +14,10 @@
*/
#include "c.h"
-#include "port/pg_crc32c.h"
-
#include <arm_acle.h>
+#include "port/pg_crc32c.h"
+
pg_crc32c
pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t len)
{
diff --git a/src/port/pg_crc32c_sse42.c b/src/port/pg_crc32c_sse42.c
index ef56cff..a81718b 100644
--- a/src/port/pg_crc32c_sse42.c
+++ b/src/port/pg_crc32c_sse42.c
@@ -14,10 +14,10 @@
*/
#include "c.h"
-#include "port/pg_crc32c.h"
-
#include <nmmintrin.h>
+#include "port/pg_crc32c.h"
+
pg_crc32c
pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len)
{
diff --git a/src/port/tar.c b/src/port/tar.c
index f1da959..4afe9f2 100644
--- a/src/port/tar.c
+++ b/src/port/tar.c
@@ -1,7 +1,9 @@
#include "c.h"
-#include "pgtar.h"
+
#include <sys/stat.h>
+#include "pgtar.h"
+
/*
* Print a numeric field in a tar header. The field starts at *s and is of
* length len; val is the value to be written.
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
index 556b46d..b50c189 100644
--- a/src/test/isolation/isolationtester.c
+++ b/src/test/isolation/isolationtester.c
@@ -13,11 +13,10 @@
#endif
#include "datatype/timestamp.h"
+#include "isolationtester.h"
#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "pg_getopt.h"
-
-#include "isolationtester.h"
+#include "pqexpbuffer.h"
#define PREP_WAITING "isolationtester_waiting"
diff --git a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
index bab073b..7e9d7de 100644
--- a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
+++ b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
@@ -12,10 +12,10 @@
*/
#include "postgres.h"
-#include "fmgr.h"
#include "access/ginblock.h"
#include "access/gin_private.h"
#include "access/htup_details.h"
+#include "fmgr.h"
PG_MODULE_MAGIC;
diff --git a/src/test/modules/test_integerset/test_integerset.c b/src/test/modules/test_integerset/test_integerset.c
index e3925a1..82d8563 100644
--- a/src/test/modules/test_integerset/test_integerset.c
+++ b/src/test/modules/test_integerset/test_integerset.c
@@ -14,12 +14,12 @@
#include "fmgr.h"
#include "lib/integerset.h"
+#include "miscadmin.h"
#include "nodes/bitmapset.h"
-#include "utils/memutils.h"
-#include "utils/timestamp.h"
#include "storage/block.h"
#include "storage/itemptr.h"
-#include "miscadmin.h"
+#include "utils/memutils.h"
+#include "utils/timestamp.h"
/*
* If you enable this, the "pattern" tests will print information about
diff --git a/src/test/modules/test_rls_hooks/test_rls_hooks.c b/src/test/modules/test_rls_hooks/test_rls_hooks.c
index 10379bc..f576ecb 100644
--- a/src/test/modules/test_rls_hooks/test_rls_hooks.c
+++ b/src/test/modules/test_rls_hooks/test_rls_hooks.c
@@ -13,19 +13,16 @@
#include "postgres.h"
+#include "catalog/pg_type.h"
#include "fmgr.h"
#include "miscadmin.h"
-
-#include "test_rls_hooks.h"
-
-#include "catalog/pg_type.h"
-#include "nodes/makefuncs.h"
#include "nodes/makefuncs.h"
#include "parser/parse_clause.h"
#include "parser/parse_collate.h"
#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "rewrite/rowsecurity.h"
+#include "test_rls_hooks.h"
#include "utils/acl.h"
#include "utils/rel.h"
#include "utils/relcache.h"
diff --git a/src/test/modules/test_shm_mq/setup.c b/src/test/modules/test_shm_mq/setup.c
index a318168..c1a0fa4 100644
--- a/src/test/modules/test_shm_mq/setup.c
+++ b/src/test/modules/test_shm_mq/setup.c
@@ -20,9 +20,8 @@
#include "postmaster/bgworker.h"
#include "storage/procsignal.h"
#include "storage/shm_toc.h"
-#include "utils/memutils.h"
-
#include "test_shm_mq.h"
+#include "utils/memutils.h"
typedef struct
{
diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c
index bc9ef64..70ae3cb 100644
--- a/src/test/modules/worker_spi/worker_spi.c
+++ b/src/test/modules/worker_spi/worker_spi.c
@@ -22,24 +22,22 @@
*/
#include "postgres.h"
-/* These are always necessary for a bgworker */
+/* these headers are used by this particular worker's code */
+#include "access/xact.h"
+#include "executor/spi.h"
+#include "fmgr.h"
+#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "pgstat.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 "access/xact.h"
-#include "executor/spi.h"
-#include "fmgr.h"
-#include "lib/stringinfo.h"
-#include "pgstat.h"
+#include "tcop/utility.h"
#include "utils/builtins.h"
#include "utils/snapmgr.h"
-#include "tcop/utility.h"
PG_MODULE_MAGIC;
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 3a39472..6554ce2 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -29,14 +29,13 @@
#include <sys/resource.h>
#endif
-#include "pg_regress.h"
-
#include "common/logging.h"
#include "common/restricted_token.h"
#include "common/username.h"
#include "getopt_long.h"
#include "libpq/pqcomm.h" /* needed for UNIXSOCK_PATH() */
#include "pg_config_paths.h"
+#include "pg_regress.h"
#include "portability/instr_time.h"
/* for resultmap we need a list of pairs of strings */
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index cb8ef53..2f66d76 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -36,10 +36,9 @@
#include "port/atomics.h"
#include "utils/builtins.h"
#include "utils/geo_decls.h"
+#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/typcache.h"
-#include "utils/memutils.h"
-
#define EXPECT_TRUE(expr) \
do { \
--
1.8.3.1
Re: Ordering of header file inclusion
On Mon, Oct 21, 2019 at 11:04 PM vignesh C <vignesh21@gmail.com> wrote:
On Mon, Oct 21, 2019 at 8:47 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
Thanks for the suggestions.
Updated patch contains the fix based on Tom Lane's Suggestion.
Let me know your thoughts for further revision if required.
Few comments on 0001-Ordering-of-header-files-in-contrib-dir-oct21.patch
-----------------------------------------------------------------------------------------------------------
1.
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -15,9 +15,9 @@
#include "postgres.h" #include "fmgr.h"
+#include "isn.h"
#include "utils/builtins.h"
-#include "isn.h"
#include "EAN13.h"
#include "ISBN.h"
#include "ISMN.h"
Why only "isn.h" is moved and not others?
2.
+++ b/contrib/pgcrypto/px-crypt.c
@@ -31,9 +31,8 @@#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
-
+#include "px.h"I think such ordering was fine. Forex. see, hash.c (hash.h was
included first and then hash_xlog.h).
3.
+#include "_int.h"
#include "access/gist.h"
#include "access/stratnum.h"
-#include "_int.h"
-
Do we need to give preference to '_'? Is it being done somewhere
else? It is not that this is wrong, just that I am not sure about
this.
4.
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -8,6 +8,7 @@
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "hstore.h"
#include "lib/stringinfo.h"
#include "libpq/pqformat.h"
#include "utils/builtins.h"
@@ -18,7 +19,6 @@
#include "utils/memutils.h"
#include "utils/typcache.h"-#include "hstore.h"
PG_MODULE_MAGIC;
This created an extra white line.
5.
While reviewing, I noticed that in contrib/intarray/_int_op.c, there
is an extra white line between postgres.h and its first include. I
think we can make that as well consistent.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Tue, Oct 22, 2019 at 12:56 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Mon, Oct 21, 2019 at 11:04 PM vignesh C <vignesh21@gmail.com> wrote:
On Mon, Oct 21, 2019 at 8:47 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
Thanks for the suggestions.
Updated patch contains the fix based on Tom Lane's Suggestion.
Let me know your thoughts for further revision if required.
This patch series has broadly changed the code to organize the header
includes in alphabetic order. It also makes sure that all files first
includes 'postgres.h'/'postgres_fe.h', system header includes and then
Postgres header includes.
It also has a change where it seems that for local header includes, we
have used '<>' whereas quotes ("") should have been used. See,
ecpg/compatlib/informix.c.
I am planning to commit this as multiple commits (a. contrib modules,
b. non-backend changes and c. backend changes) as there is some risk
of buildfarm break. From my side, I will ensure that everything is
passing on windows and centos. Any objections to this plan?
Review for 0003-Ordering-of-header-files-remaining-dir-oct21
-----------------------------------------------------------------------------------------
1.
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -19,18 +19,16 @@
#include <sys/select.h>
#endif-/* local
includes */
-#include "streamutil.h"
-
#include "access/xlog_internal.h"
-#include "common/file_perm.h"
#include "common/fe_memutils.h"
+#include
"common/file_perm.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "libpq/pqsignal.h"
#include "pqexpbuffer.h"
+#include "streamutil.h"
Extra space before streamutil.h include.
2.
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -21,11 +21,6 @@
#include <time.h>
#include <unistd.h>-#include
"libpq-fe.h"
-#include "libpq-int.h"
-#include "fe-auth.h"
-#include "pg_config_paths.h"
-
#ifdef WIN32
#include "win32.h"
#ifdef _WIN32_IE
@@ -74,10
+69,13 @@ static int ldapServiceLookup(const char *purl,
PQconninfoOption *options,
#include "common/link-canary.h"
#include "common/scram-
common.h"
#include "common/string.h"
+#include "fe-auth.h"
+#include "libpq-fe.h"
+#include "libpq-int.h"
#include "mb/pg_wchar.h"
+#include
"pg_config_paths.h"After this change, the Windows build is failing for me. You forgot to
move the below code:
#ifdef USE_LDAP
#ifdef WIN32
#include <winldap.h>
#else
/* OpenLDAP deprecates RFC 1823, but we want standard conformance */
#define LDAP_DEPRECATED 1
#include <ldap.h>
typedef struct timeval LDAP_TIMEVAL;
#endif
static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
PQExpBuffer errorMessage);
#endif
All this needs to be moved after all the includes.
3.
/* ScanKeywordList lookup data for ECPG keywords */
#include "ecpg_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"
I think preproc.h include should be before preproc_extern.h due to the
reason mentioned earlier.
4.
--- a/src/test/modules/worker_spi/worker_spi.c
+++ b/src/test/modules/worker_spi/worker_spi.c
@@ -22,24 +22,22 @@
*/
#include "postgres.h"-/* These are always necessary for a bgworker */
+/* these headers are used by this particular worker's code */
+#include "access/xact.h"
+#include "executor/spi.h"
+#include "fmgr.h"
+#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "pgstat.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 "access/xact.h"
-#include "executor/spi.h"I am skeptical of this change as it is very clearly written in
comments the reason why header includes are separated.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Tue, Oct 22, 2019 at 12:56 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
Few comments on 0001-Ordering-of-header-files-in-contrib-dir-oct21.patch ----------------------------------------------------------------------------------------------------------- 1. --- a/contrib/isn/isn.c +++ b/contrib/isn/isn.c @@ -15,9 +15,9 @@ #include "postgres.h"#include "fmgr.h"
+#include "isn.h"
#include "utils/builtins.h"-#include "isn.h"
#include "EAN13.h"
#include "ISBN.h"
#include "ISMN.h"Why only "isn.h" is moved and not others?
Fixed.
Order is based on ascii table. Upper case letters will come before
lower case letters.
2. +++ b/contrib/pgcrypto/px-crypt.c @@ -31,9 +31,8 @@#include "postgres.h"
-#include "px.h" #include "px-crypt.h" - +#include "px.h"I think such ordering was fine. Forex. see, hash.c (hash.h was
included first and then hash_xlog.h).
Order is based on ascii table.
Ascii value for "." is 46, Ascii value for "-" is 45.
Hence have placed like:
#include "px-crypt.h"
#include "px.h"
Not make any changes for this. If still required I can modify.
3.
+#include "_int.h"
#include "access/gist.h"
#include "access/stratnum.h"-#include "_int.h"
-Do we need to give preference to '_'? Is it being done somewhere
else? It is not that this is wrong, just that I am not sure about
this.
The changes are done based on ascii table.
Ascii value of "_" is 95.
Ascii value of "a" is 97.
Hence _int.h is place before access/gist.h.
I have not made any changes for this. If still required I can modify.
4. --- a/contrib/hstore/hstore_io.c +++ b/contrib/hstore/hstore_io.c @@ -8,6 +8,7 @@ #include "access/htup_details.h" #include "catalog/pg_type.h" #include "funcapi.h" +#include "hstore.h" #include "lib/stringinfo.h" #include "libpq/pqformat.h" #include "utils/builtins.h" @@ -18,7 +19,6 @@ #include "utils/memutils.h" #include "utils/typcache.h"-#include "hstore.h"
PG_MODULE_MAGIC;
This created an extra white line.
Fixed.
5.
While reviewing, I noticed that in contrib/intarray/_int_op.c, there
is an extra white line between postgres.h and its first include. I
think we can make that as well consistent.
Fixed.
Thanks for the comments.
Attached patch has the updated changes.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Attachments:
0001-Ordering-of-header-files-in-contrib-dir-oct22.patchapplication/octet-stream; name=0001-Ordering-of-header-files-in-contrib-dir-oct22.patchDownload
From 34109f6ab73c1f8cbff37e5d0b18c04402425940 Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Tue, 22 Oct 2019 21:57:36 +0530
Subject: [PATCH 1/2] Ordering of header files in contrib dir.
Ordering of header files that is included in source code in contrib dir.
---
contrib/bloom/blcost.c | 3 +--
contrib/bloom/blinsert.c | 3 +--
contrib/bloom/blscan.c | 5 ++---
contrib/bloom/blutils.c | 10 ++++------
contrib/bloom/blvalidate.c | 3 +--
contrib/btree_gin/btree_gin.c | 2 +-
contrib/btree_gist/btree_enum.c | 4 ++--
contrib/btree_gist/btree_inet.c | 2 +-
contrib/btree_gist/btree_numeric.c | 3 +--
contrib/btree_gist/btree_utils_var.c | 5 ++---
contrib/cube/cube.c | 3 +--
contrib/dblink/dblink.c | 3 +--
contrib/hstore/hstore_gist.c | 3 +--
contrib/hstore/hstore_io.c | 3 +--
contrib/hstore/hstore_op.c | 3 +--
contrib/hstore_plpython/hstore_plpython.c | 4 ++--
contrib/intarray/_int_bool.c | 3 +--
contrib/intarray/_int_gin.c | 3 +--
contrib/intarray/_int_gist.c | 3 +--
contrib/intarray/_int_op.c | 1 -
contrib/intarray/_int_selfuncs.c | 6 +++---
contrib/intarray/_int_tool.c | 4 +---
contrib/intarray/_intbig_gist.c | 3 +--
contrib/isn/isn.c | 7 +++----
contrib/jsonb_plperl/jsonb_plperl.c | 2 +-
contrib/jsonb_plpython/jsonb_plpython.c | 4 ++--
contrib/ltree/_ltree_gist.c | 4 +---
contrib/ltree/crc32.c | 2 +-
contrib/ltree/lquery_op.c | 2 +-
contrib/ltree/ltree_io.c | 2 +-
contrib/ltree/ltree_op.c | 2 +-
contrib/ltree_plpython/ltree_plpython.c | 2 +-
contrib/oid2name/oid2name.c | 4 +---
contrib/pageinspect/brinfuncs.c | 8 +++-----
contrib/pageinspect/btreefuncs.c | 4 +---
contrib/pageinspect/fsmfuncs.c | 3 +--
contrib/pageinspect/ginfuncs.c | 3 +--
contrib/pageinspect/hashfuncs.c | 5 ++---
contrib/pageinspect/heapfuncs.c | 5 ++---
contrib/pageinspect/rawpage.c | 3 +--
contrib/passwordcheck/passwordcheck.c | 2 +-
contrib/pg_standby/pg_standby.c | 3 +--
contrib/pg_trgm/trgm_gin.c | 4 +---
contrib/pg_trgm/trgm_gist.c | 4 +---
contrib/pg_trgm/trgm_op.c | 3 +--
contrib/pg_trgm/trgm_regexp.c | 4 +---
contrib/pgcrypto/crypt-md5.c | 2 +-
contrib/pgcrypto/internal.c | 6 +++---
contrib/pgcrypto/mbuf.c | 2 +-
contrib/pgcrypto/openssl.c | 3 +--
contrib/pgcrypto/pgcrypto.c | 7 +++----
contrib/pgcrypto/pgp-armor.c | 2 +-
contrib/pgcrypto/pgp-cfb.c | 2 +-
contrib/pgcrypto/pgp-compress.c | 3 +--
contrib/pgcrypto/pgp-decrypt.c | 2 +-
contrib/pgcrypto/pgp-encrypt.c | 3 +--
contrib/pgcrypto/pgp-info.c | 2 +-
contrib/pgcrypto/pgp-mpi-internal.c | 3 +--
contrib/pgcrypto/pgp-mpi-openssl.c | 2 +-
contrib/pgcrypto/pgp-mpi.c | 2 +-
contrib/pgcrypto/pgp-pgsql.c | 11 +++++------
contrib/pgcrypto/pgp-pubdec.c | 2 +-
contrib/pgcrypto/pgp-pubenc.c | 2 +-
contrib/pgcrypto/pgp-pubkey.c | 2 +-
contrib/pgcrypto/pgp-s2k.c | 3 +--
contrib/pgcrypto/pgp.c | 2 +-
contrib/pgcrypto/px-crypt.c | 3 +--
contrib/pgstattuple/pgstatapprox.c | 6 +++---
contrib/postgres_fdw/connection.c | 4 +---
contrib/postgres_fdw/deparse.c | 4 +---
contrib/postgres_fdw/option.c | 4 +---
contrib/postgres_fdw/postgres_fdw.c | 3 +--
contrib/postgres_fdw/shippable.c | 4 +---
contrib/sepgsql/database.c | 4 ++--
contrib/sepgsql/dml.c | 5 ++---
contrib/sepgsql/hooks.c | 3 +--
contrib/sepgsql/label.c | 5 ++---
contrib/sepgsql/proc.c | 3 +--
contrib/sepgsql/relation.c | 7 +++----
contrib/sepgsql/schema.c | 3 +--
contrib/sepgsql/uavc.c | 3 +--
contrib/spi/moddatetime.c | 2 +-
contrib/tablefunc/tablefunc.c | 3 +--
contrib/tcn/tcn.c | 2 +-
contrib/vacuumlo/vacuumlo.c | 3 +--
85 files changed, 115 insertions(+), 183 deletions(-)
diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c
index f9fe57f..b2cd649 100644
--- a/contrib/bloom/blcost.c
+++ b/contrib/bloom/blcost.c
@@ -12,11 +12,10 @@
*/
#include "postgres.h"
+#include "bloom.h"
#include "fmgr.h"
#include "utils/selfuncs.h"
-#include "bloom.h"
-
/*
* Estimate cost of bloom index scan.
*/
diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c
index 4b2186b..30d17f5 100644
--- a/contrib/bloom/blinsert.c
+++ b/contrib/bloom/blinsert.c
@@ -15,6 +15,7 @@
#include "access/genam.h"
#include "access/generic_xlog.h"
#include "access/tableam.h"
+#include "bloom.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
@@ -23,8 +24,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "bloom.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c
index 49e364a..30fa206 100644
--- a/contrib/bloom/blscan.c
+++ b/contrib/bloom/blscan.c
@@ -13,15 +13,14 @@
#include "postgres.h"
#include "access/relscan.h"
-#include "pgstat.h"
+#include "bloom.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "bloom.h"
-
/*
* Begin scan of bloom index.
*/
diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c
index dbb24cb..3d44616 100644
--- a/contrib/bloom/blutils.c
+++ b/contrib/bloom/blutils.c
@@ -15,17 +15,15 @@
#include "access/amapi.h"
#include "access/generic_xlog.h"
+#include "access/reloptions.h"
+#include "bloom.h"
#include "catalog/index.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/indexfsm.h"
-#include "utils/memutils.h"
-#include "access/reloptions.h"
#include "storage/freespace.h"
#include "storage/indexfsm.h"
-
-#include "bloom.h"
+#include "storage/lmgr.h"
+#include "utils/memutils.h"
/* Signature dealing macros - note i is assumed to be of type int */
#define GETWORD(x,i) ( *( (BloomSignatureWord *)(x) + ( (i) / SIGNWORDBITS ) ) )
diff --git a/contrib/bloom/blvalidate.c b/contrib/bloom/blvalidate.c
index e9bd1b4..b3dfe03 100644
--- a/contrib/bloom/blvalidate.c
+++ b/contrib/bloom/blvalidate.c
@@ -14,6 +14,7 @@
#include "access/amvalidate.h"
#include "access/htup_details.h"
+#include "bloom.h"
#include "catalog/pg_amop.h"
#include "catalog/pg_amproc.h"
#include "catalog/pg_opclass.h"
@@ -24,8 +25,6 @@
#include "utils/regproc.h"
#include "utils/syscache.h"
-#include "bloom.h"
-
/*
* Validator for a bloom opclass.
*/
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c
index 2ecf7a2..0ed3d58 100644
--- a/contrib/btree_gin/btree_gin.c
+++ b/contrib/btree_gin/btree_gin.c
@@ -14,8 +14,8 @@
#include "utils/inet.h"
#include "utils/numeric.h"
#include "utils/timestamp.h"
-#include "utils/varbit.h"
#include "utils/uuid.h"
+#include "utils/varbit.h"
PG_MODULE_MAGIC;
diff --git a/contrib/btree_gist/btree_enum.c b/contrib/btree_gist/btree_enum.c
index 0ec7d8b..b563012 100644
--- a/contrib/btree_gist/btree_enum.c
+++ b/contrib/btree_gist/btree_enum.c
@@ -2,11 +2,11 @@
* contrib/btree_gist/btree_enum.c
*/
#include "postgres.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
#include "btree_gist.h"
#include "btree_utils_num.h"
+#include "fmgr.h"
+#include "utils/builtins.h"
/* enums are really Oids, so we just use the same structure */
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 34308cc..a3b4301 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -5,9 +5,9 @@
#include "btree_gist.h"
#include "btree_utils_num.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/inet.h"
-#include "catalog/pg_type.h"
typedef struct inetkey
{
diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c
index b72060c..d43612a 100644
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -3,11 +3,10 @@
*/
#include "postgres.h"
-#include "btree_gist.h"
-
#include <math.h>
#include <float.h>
+#include "btree_gist.h"
#include "btree_utils_var.h"
#include "utils/builtins.h"
#include "utils/numeric.h"
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 670c879..452241f 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -3,15 +3,14 @@
*/
#include "postgres.h"
-#include "btree_gist.h"
-
#include <math.h>
#include <limits.h>
#include <float.h>
+#include "btree_gist.h"
#include "btree_utils_var.h"
-#include "utils/pg_locale.h"
#include "utils/builtins.h"
+#include "utils/pg_locale.h"
#include "utils/rel.h"
/* used for key sorting */
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index b720366..b98118e 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -12,11 +12,10 @@
#include "access/gist.h"
#include "access/stratnum.h"
+#include "cubedata.h"
#include "utils/array.h"
#include "utils/float.h"
-#include "cubedata.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index e432457..54b7bf9 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -34,8 +34,6 @@
#include <limits.h>
-#include "libpq-fe.h"
-
#include "access/htup_details.h"
#include "access/relation.h"
#include "access/reloptions.h"
@@ -50,6 +48,7 @@
#include "foreign/foreign.h"
#include "funcapi.h"
#include "lib/stringinfo.h"
+#include "libpq-fe.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "parser/scansup.h"
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index 6a885f2..e860f1e 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -6,9 +6,8 @@
#include "access/gist.h"
#include "access/stratnum.h"
#include "catalog/pg_type.h"
-#include "utils/pg_crc.h"
-
#include "hstore.h"
+#include "utils/pg_crc.h"
/* bigint defines */
#define BITBYTE 8
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
index 745497c..be3cce4 100644
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -8,6 +8,7 @@
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "hstore.h"
#include "lib/stringinfo.h"
#include "libpq/pqformat.h"
#include "utils/builtins.h"
@@ -18,8 +19,6 @@
#include "utils/memutils.h"
#include "utils/typcache.h"
-#include "hstore.h"
-
PG_MODULE_MAGIC;
/* old names for C functions */
diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index a3a8a91..c54071b 100644
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -6,12 +6,11 @@
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "hstore.h"
#include "utils/builtins.h"
#include "utils/hashutils.h"
#include "utils/memutils.h"
-#include "hstore.h"
-
/* old names for C functions */
HSTORE_POLLUTE(hstore_fetchval, fetchval);
HSTORE_POLLUTE(hstore_exists, exists);
diff --git a/contrib/hstore_plpython/hstore_plpython.c b/contrib/hstore_plpython/hstore_plpython.c
index 93705f0..4dee569 100644
--- a/contrib/hstore_plpython/hstore_plpython.c
+++ b/contrib/hstore_plpython/hstore_plpython.c
@@ -1,9 +1,9 @@
#include "postgres.h"
#include "fmgr.h"
-#include "plpython.h"
-#include "plpy_typeio.h"
#include "hstore/hstore.h"
+#include "plpy_typeio.h"
+#include "plpython.h"
PG_MODULE_MAGIC;
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 91e2a80..fd97690 100644
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -3,11 +3,10 @@
*/
#include "postgres.h"
+#include "_int.h"
#include "miscadmin.h"
#include "utils/builtins.h"
-#include "_int.h"
-
PG_FUNCTION_INFO_V1(bqarr_in);
PG_FUNCTION_INFO_V1(bqarr_out);
PG_FUNCTION_INFO_V1(boolop);
diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c
index 7aebfec..b7958d8 100644
--- a/contrib/intarray/_int_gin.c
+++ b/contrib/intarray/_int_gin.c
@@ -3,11 +3,10 @@
*/
#include "postgres.h"
+#include "_int.h"
#include "access/gin.h"
#include "access/stratnum.h"
-#include "_int.h"
-
PG_FUNCTION_INFO_V1(ginint4_queryextract);
Datum
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
index e5a8011..50effc3 100644
--- a/contrib/intarray/_int_gist.c
+++ b/contrib/intarray/_int_gist.c
@@ -5,11 +5,10 @@
#include <limits.h>
+#include "_int.h"
#include "access/gist.h"
#include "access/stratnum.h"
-#include "_int.h"
-
#define GETENTRY(vec,pos) ((ArrayType *) DatumGetPointer((vec)->vector[(pos)].key))
/*
diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c
index fe7fcc4..0e3dcb4 100644
--- a/contrib/intarray/_int_op.c
+++ b/contrib/intarray/_int_op.c
@@ -3,7 +3,6 @@
*/
#include "postgres.h"
-
#include "_int.h"
PG_MODULE_MAGIC;
diff --git a/contrib/intarray/_int_selfuncs.c b/contrib/intarray/_int_selfuncs.c
index aebffae..8fb05d1 100644
--- a/contrib/intarray/_int_selfuncs.c
+++ b/contrib/intarray/_int_selfuncs.c
@@ -13,17 +13,17 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "_int.h"
+#include "_int.h"
#include "access/htup_details.h"
#include "catalog/pg_operator.h"
#include "catalog/pg_statistic.h"
#include "catalog/pg_type.h"
+#include "miscadmin.h"
#include "utils/builtins.h"
+#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
#include "utils/syscache.h"
-#include "utils/lsyscache.h"
-#include "miscadmin.h"
PG_FUNCTION_INFO_V1(_int_overlap_sel);
PG_FUNCTION_INFO_V1(_int_contains_sel);
diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c
index fde8d15..efff81d 100644
--- a/contrib/intarray/_int_tool.c
+++ b/contrib/intarray/_int_tool.c
@@ -5,10 +5,8 @@
#include <limits.h>
-#include "catalog/pg_type.h"
-
#include "_int.h"
-
+#include "catalog/pg_type.h"
/* arguments are assumed sorted & unique-ified */
bool
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index 2a20abe..be51dac 100644
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -3,12 +3,11 @@
*/
#include "postgres.h"
+#include "_int.h"
#include "access/gist.h"
#include "access/stratnum.h"
#include "port/pg_bitutils.h"
-#include "_int.h"
-
#define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer((vec)->vector[(pos)].key))
/*
** _intbig methods
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 0c2cac7..f4d933c 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -14,15 +14,14 @@
#include "postgres.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
-
-#include "isn.h"
#include "EAN13.h"
#include "ISBN.h"
#include "ISMN.h"
#include "ISSN.h"
#include "UPC.h"
+#include "fmgr.h"
+#include "isn.h"
+#include "utils/builtins.h"
PG_MODULE_MAGIC;
diff --git a/contrib/jsonb_plperl/jsonb_plperl.c b/contrib/jsonb_plperl/jsonb_plperl.c
index 04b04df..4ae1353 100644
--- a/contrib/jsonb_plperl/jsonb_plperl.c
+++ b/contrib/jsonb_plperl/jsonb_plperl.c
@@ -5,8 +5,8 @@
#include "fmgr.h"
#include "plperl.h"
#include "plperl_helpers.h"
-#include "utils/jsonb.h"
#include "utils/fmgrprotos.h"
+#include "utils/jsonb.h"
PG_MODULE_MAGIC;
diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c
index 776cf7c..ecaa4c6 100644
--- a/contrib/jsonb_plpython/jsonb_plpython.c
+++ b/contrib/jsonb_plpython/jsonb_plpython.c
@@ -1,10 +1,10 @@
#include "postgres.h"
-#include "plpython.h"
#include "plpy_elog.h"
#include "plpy_typeio.h"
-#include "utils/jsonb.h"
+#include "plpython.h"
#include "utils/fmgrprotos.h"
+#include "utils/jsonb.h"
#include "utils/numeric.h"
PG_MODULE_MAGIC;
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index c33ac4e..6b14ed5 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -9,11 +9,9 @@
#include "access/gist.h"
#include "access/stratnum.h"
-#include "port/pg_bitutils.h"
-
#include "crc32.h"
#include "ltree.h"
-
+#include "port/pg_bitutils.h"
PG_FUNCTION_INFO_V1(_ltree_compress);
PG_FUNCTION_INFO_V1(_ltree_same);
diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c
index 447e4b2..0c3e459 100644
--- a/contrib/ltree/crc32.c
+++ b/contrib/ltree/crc32.c
@@ -16,8 +16,8 @@
#define TOLOWER(x) (x)
#endif
-#include "utils/pg_crc.h"
#include "crc32.h"
+#include "utils/pg_crc.h"
unsigned int
ltree_crc32_sz(char *buf, int size)
diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c
index 62172d5..fa47710 100644
--- a/contrib/ltree/lquery_op.c
+++ b/contrib/ltree/lquery_op.c
@@ -8,8 +8,8 @@
#include <ctype.h>
#include "catalog/pg_collation.h"
-#include "utils/formatting.h"
#include "ltree.h"
+#include "utils/formatting.h"
PG_FUNCTION_INFO_V1(ltq_regex);
PG_FUNCTION_INFO_V1(ltq_rregex);
diff --git a/contrib/ltree/ltree_io.c b/contrib/ltree/ltree_io.c
index f54f037..900a46a 100644
--- a/contrib/ltree/ltree_io.c
+++ b/contrib/ltree/ltree_io.c
@@ -7,9 +7,9 @@
#include <ctype.h>
+#include "crc32.h"
#include "ltree.h"
#include "utils/memutils.h"
-#include "crc32.h"
PG_FUNCTION_INFO_V1(ltree_in);
PG_FUNCTION_INFO_V1(ltree_out);
diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c
index df61c63..070868f 100644
--- a/contrib/ltree/ltree_op.c
+++ b/contrib/ltree/ltree_op.c
@@ -9,10 +9,10 @@
#include "access/htup_details.h"
#include "catalog/pg_statistic.h"
+#include "ltree.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
-#include "ltree.h"
PG_MODULE_MAGIC;
diff --git a/contrib/ltree_plpython/ltree_plpython.c b/contrib/ltree_plpython/ltree_plpython.c
index b254aa5..1570e77 100644
--- a/contrib/ltree_plpython/ltree_plpython.c
+++ b/contrib/ltree_plpython/ltree_plpython.c
@@ -1,8 +1,8 @@
#include "postgres.h"
#include "fmgr.h"
-#include "plpython.h"
#include "ltree/ltree.h"
+#include "plpython.h"
PG_MODULE_MAGIC;
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index fa1e795..9a3eac2 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -10,13 +10,11 @@
#include "postgres_fe.h"
#include "catalog/pg_class_d.h"
-
#include "common/logging.h"
#include "fe_utils/connect.h"
+#include "getopt_long.h"
#include "libpq-fe.h"
#include "pg_getopt.h"
-#include "getopt_long.h"
-
/* an extensible array to keep track of elements to show */
typedef struct
diff --git a/contrib/pageinspect/brinfuncs.c b/contrib/pageinspect/brinfuncs.c
index 04140ec..d0a12f1 100644
--- a/contrib/pageinspect/brinfuncs.c
+++ b/contrib/pageinspect/brinfuncs.c
@@ -9,24 +9,22 @@
*/
#include "postgres.h"
-#include "pageinspect.h"
-
-#include "access/htup_details.h"
#include "access/brin.h"
#include "access/brin_internal.h"
#include "access/brin_page.h"
#include "access/brin_revmap.h"
#include "access/brin_tuple.h"
+#include "access/htup_details.h"
#include "catalog/index.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "lib/stringinfo.h"
+#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
-#include "miscadmin.h"
-
PG_FUNCTION_INFO_V1(brin_page_type);
PG_FUNCTION_INFO_V1(brin_page_items);
diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
index 8d27c9b..78cdc69 100644
--- a/contrib/pageinspect/btreefuncs.c
+++ b/contrib/pageinspect/btreefuncs.c
@@ -27,19 +27,17 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/nbtree.h"
#include "access/relation.h"
#include "catalog/namespace.h"
#include "catalog/pg_am.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/builtins.h"
#include "utils/rel.h"
#include "utils/varlena.h"
-
PG_FUNCTION_INFO_V1(bt_metap);
PG_FUNCTION_INFO_V1(bt_page_items);
PG_FUNCTION_INFO_V1(bt_page_items_bytea);
diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c
index 4b3c596..8567a38 100644
--- a/contrib/pageinspect/fsmfuncs.c
+++ b/contrib/pageinspect/fsmfuncs.c
@@ -19,11 +19,10 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "funcapi.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "storage/fsm_internals.h"
#include "utils/builtins.h"
diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c
index 229f9f9..a2cd9ed 100644
--- a/contrib/pageinspect/ginfuncs.c
+++ b/contrib/pageinspect/ginfuncs.c
@@ -9,8 +9,6 @@
*/
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/gin.h"
#include "access/gin_private.h"
#include "access/htup_details.h"
@@ -18,6 +16,7 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/pageinspect/hashfuncs.c b/contrib/pageinspect/hashfuncs.c
index 9374c4a..bcc39a8 100644
--- a/contrib/pageinspect/hashfuncs.c
+++ b/contrib/pageinspect/hashfuncs.c
@@ -10,14 +10,13 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/hash.h"
#include "access/htup_details.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_am.h"
+#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
index 02e2ab9..8e69cb3 100644
--- a/contrib/pageinspect/heapfuncs.c
+++ b/contrib/pageinspect/heapfuncs.c
@@ -25,14 +25,13 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/htup_details.h"
#include "access/relation.h"
-#include "funcapi.h"
#include "catalog/pg_am_d.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "port/pg_bitutils.h"
#include "utils/array.h"
#include "utils/builtins.h"
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index f08f62f..ffb4418 100644
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -15,14 +15,13 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/htup_details.h"
#include "access/relation.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "storage/bufmgr.h"
#include "storage/checksum.h"
#include "utils/builtins.h"
diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c
index c3fb5a9..6810cab 100644
--- a/contrib/passwordcheck/passwordcheck.c
+++ b/contrib/passwordcheck/passwordcheck.c
@@ -21,8 +21,8 @@
#endif
#include "commands/user.h"
-#include "libpq/crypt.h"
#include "fmgr.h"
+#include "libpq/crypt.h"
PG_MODULE_MAGIC;
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index 9fae146..c6beea7 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -30,9 +30,8 @@
#include <signal.h>
#include <sys/time.h>
-#include "pg_getopt.h"
-
#include "access/xlog_internal.h"
+#include "pg_getopt.h"
const char *progname;
diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c
index 1b9809b..4dbf0ff 100644
--- a/contrib/pg_trgm/trgm_gin.c
+++ b/contrib/pg_trgm/trgm_gin.c
@@ -3,12 +3,10 @@
*/
#include "postgres.h"
-#include "trgm.h"
-
#include "access/gin.h"
#include "access/stratnum.h"
#include "fmgr.h"
-
+#include "trgm.h"
PG_FUNCTION_INFO_V1(gin_extract_trgm);
PG_FUNCTION_INFO_V1(gin_extract_value_trgm);
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
index e79db8a..e022d0b 100644
--- a/contrib/pg_trgm/trgm_gist.c
+++ b/contrib/pg_trgm/trgm_gist.c
@@ -3,12 +3,10 @@
*/
#include "postgres.h"
-#include "trgm.h"
-
#include "access/stratnum.h"
#include "fmgr.h"
#include "port/pg_bitutils.h"
-
+#include "trgm.h"
typedef struct
{
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
index 0d4614e..4679efe 100644
--- a/contrib/pg_trgm/trgm_op.c
+++ b/contrib/pg_trgm/trgm_op.c
@@ -5,9 +5,8 @@
#include <ctype.h>
-#include "trgm.h"
-
#include "catalog/pg_type.h"
+#include "trgm.h"
#include "tsearch/ts_locale.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
diff --git a/contrib/pg_trgm/trgm_regexp.c b/contrib/pg_trgm/trgm_regexp.c
index 3ad5731..7965a29 100644
--- a/contrib/pg_trgm/trgm_regexp.c
+++ b/contrib/pg_trgm/trgm_regexp.c
@@ -191,14 +191,12 @@
*/
#include "postgres.h"
-#include "trgm.h"
-
#include "regex/regexport.h"
+#include "trgm.h"
#include "tsearch/ts_locale.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-
/*
* Uncomment (or use -DTRGM_REGEXP_DEBUG) to print debug info,
* for exploring and debugging the algorithm implementation.
diff --git a/contrib/pgcrypto/crypt-md5.c b/contrib/pgcrypto/crypt-md5.c
index 6a09d76..b6466d3 100644
--- a/contrib/pgcrypto/crypt-md5.c
+++ b/contrib/pgcrypto/crypt-md5.c
@@ -8,8 +8,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
+#include "px.h"
#define MD5_SIZE 16
diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
index db58408..a12d7b4 100644
--- a/contrib/pgcrypto/internal.c
+++ b/contrib/pgcrypto/internal.c
@@ -33,11 +33,11 @@
#include <time.h>
-#include "px.h"
-#include "md5.h"
-#include "sha1.h"
#include "blf.h"
+#include "md5.h"
+#include "px.h"
#include "rijndael.h"
+#include "sha1.h"
#ifndef MD5_DIGEST_LENGTH
#define MD5_DIGEST_LENGTH 16
diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c
index 73dbfbd..0467212 100644
--- a/contrib/pgcrypto/mbuf.c
+++ b/contrib/pgcrypto/mbuf.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
+#include "px.h"
#define STEP (16*1024)
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
index 7d686f3..3057afb 100644
--- a/contrib/pgcrypto/openssl.c
+++ b/contrib/pgcrypto/openssl.c
@@ -31,12 +31,11 @@
#include "postgres.h"
-#include "px.h"
-
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/rand.h>
+#include "px.h"
#include "utils/memutils.h"
#include "utils/resowner.h"
diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index f69ae10..f0ac625 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -34,13 +34,12 @@
#include <ctype.h>
#include "parser/scansup.h"
+#include "pgcrypto.h"
+#include "px-crypt.h"
+#include "px.h"
#include "utils/builtins.h"
#include "utils/uuid.h"
-#include "px.h"
-#include "px-crypt.h"
-#include "pgcrypto.h"
-
PG_MODULE_MAGIC;
/* private stuff */
diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c
index aa5b563..679779a 100644
--- a/contrib/pgcrypto/pgp-armor.c
+++ b/contrib/pgcrypto/pgp-armor.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* BASE64 - duplicated :(
diff --git a/contrib/pgcrypto/pgp-cfb.c b/contrib/pgcrypto/pgp-cfb.c
index 1d99915..8ae7c86 100644
--- a/contrib/pgcrypto/pgp-cfb.c
+++ b/contrib/pgcrypto/pgp-cfb.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
typedef int (*mix_data_t) (PGP_CFB *ctx, const uint8 *data, int len, uint8 *dst);
diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c
index 2adaf2c..0505bde 100644
--- a/contrib/pgcrypto/pgp-compress.c
+++ b/contrib/pgcrypto/pgp-compress.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
/*
* Compressed pkt writer
diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c
index 4c43eb7..3ecbf9c 100644
--- a/contrib/pgcrypto/pgp-decrypt.c
+++ b/contrib/pgcrypto/pgp-decrypt.c
@@ -31,9 +31,9 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
#define NO_CTX_SIZE 0
#define ALLOW_CTX_SIZE 1
diff --git a/contrib/pgcrypto/pgp-encrypt.c b/contrib/pgcrypto/pgp-encrypt.c
index 2938b4b..4651894 100644
--- a/contrib/pgcrypto/pgp-encrypt.c
+++ b/contrib/pgcrypto/pgp-encrypt.c
@@ -34,9 +34,8 @@
#include <time.h>
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
#define MDC_DIGEST_LEN 20
#define STREAM_ID 0xE0
diff --git a/contrib/pgcrypto/pgp-info.c b/contrib/pgcrypto/pgp-info.c
index 9bfbbe6..b2300ea 100644
--- a/contrib/pgcrypto/pgp-info.c
+++ b/contrib/pgcrypto/pgp-info.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
static int
read_pubkey_keyid(PullFilter *pkt, uint8 *keyid_buf)
diff --git a/contrib/pgcrypto/pgp-mpi-internal.c b/contrib/pgcrypto/pgp-mpi-internal.c
index c73f086..2353a48 100644
--- a/contrib/pgcrypto/pgp-mpi-internal.c
+++ b/contrib/pgcrypto/pgp-mpi-internal.c
@@ -31,9 +31,8 @@
#include "postgres.h"
#include "imath.h"
-
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static mpz_t *
mp_new()
diff --git a/contrib/pgcrypto/pgp-mpi-openssl.c b/contrib/pgcrypto/pgp-mpi-openssl.c
index afece26..75e4c8b 100644
--- a/contrib/pgcrypto/pgp-mpi-openssl.c
+++ b/contrib/pgcrypto/pgp-mpi-openssl.c
@@ -32,8 +32,8 @@
#include <openssl/bn.h>
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static BIGNUM *
mpi_to_bn(PGP_MPI *n)
diff --git a/contrib/pgcrypto/pgp-mpi.c b/contrib/pgcrypto/pgp-mpi.c
index 1da52ac..36a6d36 100644
--- a/contrib/pgcrypto/pgp-mpi.c
+++ b/contrib/pgcrypto/pgp-mpi.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
int
pgp_mpi_alloc(int bits, PGP_MPI **mpi)
diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c
index 3feadf7..8be895d 100644
--- a/contrib/pgcrypto/pgp-pgsql.c
+++ b/contrib/pgcrypto/pgp-pgsql.c
@@ -31,16 +31,15 @@
#include "postgres.h"
-#include "lib/stringinfo.h"
#include "catalog/pg_type.h"
-#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
-#include "utils/array.h"
#include "funcapi.h"
-
+#include "lib/stringinfo.h"
+#include "mb/pg_wchar.h"
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
/*
* public functions
diff --git a/contrib/pgcrypto/pgp-pubdec.c b/contrib/pgcrypto/pgp-pubdec.c
index b925ff8..a0a5738 100644
--- a/contrib/pgcrypto/pgp-pubdec.c
+++ b/contrib/pgcrypto/pgp-pubdec.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg = 02 || PS || 00 || M
diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c
index 08599f0..9fdcf7c 100644
--- a/contrib/pgcrypto/pgp-pubenc.c
+++ b/contrib/pgcrypto/pgp-pubenc.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg: 02 || non-zero pad bytes || 00 || msg
diff --git a/contrib/pgcrypto/pgp-pubkey.c b/contrib/pgcrypto/pgp-pubkey.c
index f898d72..d447e5f 100644
--- a/contrib/pgcrypto/pgp-pubkey.c
+++ b/contrib/pgcrypto/pgp-pubkey.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
int
pgp_key_alloc(PGP_PubKey **pk_p)
diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c
index 3f2f442..81ca1f0 100644
--- a/contrib/pgcrypto/pgp-s2k.c
+++ b/contrib/pgcrypto/pgp-s2k.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
static int
calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key,
diff --git a/contrib/pgcrypto/pgp.c b/contrib/pgcrypto/pgp.c
index dd8dae1..9b245fe 100644
--- a/contrib/pgcrypto/pgp.c
+++ b/contrib/pgcrypto/pgp.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* Defaults.
diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c
index 51be0b7..0913ff2 100644
--- a/contrib/pgcrypto/px-crypt.c
+++ b/contrib/pgcrypto/px-crypt.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
-
+#include "px.h"
static char *
run_crypt_des(const char *psw, const char *salt,
diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c
index 636c8d4..c17f244 100644
--- a/contrib/pgstattuple/pgstatapprox.c
+++ b/contrib/pgstattuple/pgstatapprox.c
@@ -13,12 +13,12 @@
#include "postgres.h"
#include "access/heapam.h"
+#include "access/htup_details.h"
+#include "access/multixact.h"
#include "access/relation.h"
#include "access/transam.h"
#include "access/visibilitymap.h"
#include "access/xact.h"
-#include "access/multixact.h"
-#include "access/htup_details.h"
#include "catalog/namespace.h"
#include "catalog/pg_am_d.h"
#include "commands/vacuum.h"
@@ -26,8 +26,8 @@
#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "storage/freespace.h"
-#include "storage/procarray.h"
#include "storage/lmgr.h"
+#include "storage/procarray.h"
#include "utils/builtins.h"
PG_FUNCTION_INFO_V1(pgstattuple_approx);
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index 57ed5f4..12f9dd3 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -12,21 +12,19 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/htup_details.h"
#include "access/xact.h"
#include "catalog/pg_user_mapping.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "postgres_fdw.h"
#include "storage/latch.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
-
/*
* Connection cache hash table entry
*
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c
index 431c34a..e803997 100644
--- a/contrib/postgres_fdw/deparse.c
+++ b/contrib/postgres_fdw/deparse.c
@@ -33,8 +33,6 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
@@ -52,13 +50,13 @@
#include "optimizer/prep.h"
#include "optimizer/tlist.h"
#include "parser/parsetree.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
-
/*
* Global context for foreign_expr_walker's search of an expression tree.
*/
diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
index 7ea68c3..da175a6 100644
--- a/contrib/postgres_fdw/option.c
+++ b/contrib/postgres_fdw/option.c
@@ -12,18 +12,16 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/reloptions.h"
#include "catalog/pg_foreign_server.h"
#include "catalog/pg_foreign_table.h"
#include "catalog/pg_user_mapping.h"
#include "commands/defrem.h"
#include "commands/extension.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/varlena.h"
-
/*
* Describes the valid options for objects that this wrapper uses.
*/
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 82d8140..3236664 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -12,8 +12,6 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
@@ -35,6 +33,7 @@
#include "optimizer/restrictinfo.h"
#include "optimizer/tlist.h"
#include "parser/parsetree.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/float.h"
#include "utils/guc.h"
diff --git a/contrib/postgres_fdw/shippable.c b/contrib/postgres_fdw/shippable.c
index 2b55a40..14d6d09 100644
--- a/contrib/postgres_fdw/shippable.c
+++ b/contrib/postgres_fdw/shippable.c
@@ -23,15 +23,13 @@
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/transam.h"
#include "catalog/dependency.h"
+#include "postgres_fdw.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/syscache.h"
-
/* Hash table for caching the results of shippability lookups */
static HTAB *ShippableCacheHash = NULL;
diff --git a/contrib/sepgsql/database.c b/contrib/sepgsql/database.c
index 8edd3df..0190d38 100644
--- a/contrib/sepgsql/database.c
+++ b/contrib/sepgsql/database.c
@@ -15,14 +15,14 @@
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/dependency.h"
-#include "catalog/pg_database.h"
#include "catalog/indexing.h"
+#include "catalog/pg_database.h"
#include "commands/dbcommands.h"
#include "commands/seclabel.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/snapmgr.h"
-#include "sepgsql.h"
/*
* sepgsql_database_post_create
diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c
index 2892346..1419879 100644
--- a/contrib/sepgsql/dml.c
+++ b/contrib/sepgsql/dml.c
@@ -14,8 +14,8 @@
#include "access/sysattr.h"
#include "access/tupdesc.h"
#include "catalog/catalog.h"
-#include "catalog/heap.h"
#include "catalog/dependency.h"
+#include "catalog/heap.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_class.h"
#include "catalog/pg_inherits.h"
@@ -23,11 +23,10 @@
#include "commands/tablecmds.h"
#include "executor/executor.h"
#include "nodes/bitmapset.h"
+#include "sepgsql.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
/*
* fixup_whole_row_references
*
diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c
index ebfa441..992c70e 100644
--- a/contrib/sepgsql/hooks.c
+++ b/contrib/sepgsql/hooks.c
@@ -20,12 +20,11 @@
#include "executor/executor.h"
#include "fmgr.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "tcop/utility.h"
#include "utils/guc.h"
#include "utils/queryenvironment.h"
-#include "sepgsql.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c
index 63a2dd5..d2505f7 100644
--- a/contrib/sepgsql/label.c
+++ b/contrib/sepgsql/label.c
@@ -12,8 +12,8 @@
#include <selinux/label.h>
-#include "access/htup_details.h"
#include "access/genam.h"
+#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
#include "catalog/catalog.h"
@@ -29,6 +29,7 @@
#include "libpq/auth.h"
#include "libpq/libpq-be.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/guc.h"
@@ -36,8 +37,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "sepgsql.h"
-
/*
* Saved hook entries (if stacked)
*/
diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c
index aa12dbe..345a4c2 100644
--- a/contrib/sepgsql/proc.c
+++ b/contrib/sepgsql/proc.c
@@ -21,14 +21,13 @@
#include "catalog/pg_type.h"
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
/*
* sepgsql_proc_post_create
*
diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c
index 0615275..714cffe 100644
--- a/contrib/sepgsql/relation.c
+++ b/contrib/sepgsql/relation.c
@@ -14,23 +14,22 @@
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
-#include "catalog/indexing.h"
#include "catalog/dependency.h"
+#include "catalog/indexing.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_class.h"
#include "catalog/pg_namespace.h"
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
-#include "utils/fmgroids.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
static void sepgsql_index_modify(Oid indexOid);
/*
diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c
index 4c4a90f..92ef156 100644
--- a/contrib/sepgsql/schema.c
+++ b/contrib/sepgsql/schema.c
@@ -21,13 +21,12 @@
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/snapmgr.h"
-#include "sepgsql.h"
-
/*
* sepgsql_schema_post_create
*
diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c
index 60fcf99..8ce0bc6 100644
--- a/contrib/sepgsql/uavc.c
+++ b/contrib/sepgsql/uavc.c
@@ -14,13 +14,12 @@
#include "catalog/pg_proc.h"
#include "commands/seclabel.h"
+#include "sepgsql.h"
#include "storage/ipc.h"
#include "utils/guc.h"
#include "utils/hashutils.h"
#include "utils/memutils.h"
-#include "sepgsql.h"
-
/*
* avc_cache
*
diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c
index 70476f7..3eb7004 100644
--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@@ -17,8 +17,8 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com>
#include "access/htup_details.h"
#include "catalog/pg_type.h"
-#include "executor/spi.h"
#include "commands/trigger.h"
+#include "executor/spi.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index e31be80..256d52f 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -40,9 +40,8 @@
#include "funcapi.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
-#include "utils/builtins.h"
-
#include "tablefunc.h"
+#include "utils/builtins.h"
PG_MODULE_MAGIC;
diff --git a/contrib/tcn/tcn.c b/contrib/tcn/tcn.c
index 5355a64..4568768 100644
--- a/contrib/tcn/tcn.c
+++ b/contrib/tcn/tcn.c
@@ -16,9 +16,9 @@
#include "postgres.h"
#include "access/htup_details.h"
-#include "executor/spi.h"
#include "commands/async.h"
#include "commands/trigger.h"
+#include "executor/spi.h"
#include "lib/stringinfo.h"
#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index 533e2ce..55b42e3 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -22,12 +22,11 @@
#endif
#include "catalog/pg_class_d.h"
-
#include "common/logging.h"
#include "fe_utils/connect.h"
+#include "getopt_long.h"
#include "libpq-fe.h"
#include "pg_getopt.h"
-#include "getopt_long.h"
#define BUFSIZE 1024
--
1.8.3.1
Re: Ordering of header file inclusion
On Tue, Oct 22, 2019 at 3:42 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
Review for 0003-Ordering-of-header-files-remaining-dir-oct21 ----------------------------------------------------------------------------------------- 1. --- a/src/bin/pg_basebackup/pg_recvlogical.c +++ b/src/bin/pg_basebackup/pg_recvlogical.c @@ -19,18 +19,16 @@ #include <sys/select.h> #endif-/* local
includes */
-#include "streamutil.h"
-
#include "access/xlog_internal.h"
-#include "common/file_perm.h"
#include "common/fe_memutils.h"
+#include
"common/file_perm.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "libpq/pqsignal.h"
#include "pqexpbuffer.h"+#include "streamutil.h"
Extra space before streamutil.h include.
Fixed.
2. --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -21,11 +21,6 @@ #include <time.h> #include <unistd.h>-#include "libpq-fe.h" -#include "libpq-int.h" -#include "fe-auth.h" -#include "pg_config_paths.h" - #ifdef WIN32 #include "win32.h" #ifdef _WIN32_IE @@ -74,10 +69,13 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options, #include "common/link-canary.h" #include "common/scram- common.h" #include "common/string.h" +#include "fe-auth.h" +#include "libpq-fe.h" +#include "libpq-int.h" #include "mb/pg_wchar.h" +#include "pg_config_paths.h"After this change, the Windows build is failing for me. You forgot to
move the below code:
#ifdef USE_LDAP
#ifdef WIN32
#include <winldap.h>
#else
/* OpenLDAP deprecates RFC 1823, but we want standard conformance */
#define LDAP_DEPRECATED 1
#include <ldap.h>
typedef struct timeval LDAP_TIMEVAL;
#endif
static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
PQExpBuffer errorMessage);
#endifAll this needs to be moved after all the includes.
Fixed. I don't have windows environment, let me know if you still face
some issue.
3.
/* ScanKeywordList lookup data for ECPG keywords */
#include "ecpg_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"I think preproc.h include should be before preproc_extern.h due to the
reason mentioned earlier.
For this file the earlier order was also like that.
As per the ordering preproc_extern.h should be before prepr.h.
But the preproc.h has some dependency on preproc_extern.h.
Not made any changes for this.
Same is the case in c_keywords.c also.
4. --- a/src/test/modules/worker_spi/worker_spi.c +++ b/src/test/modules/worker_spi/worker_spi.c @@ -22,24 +22,22 @@ */ #include "postgres.h"-/* These are always necessary for a bgworker */ +/* these headers are used by this particular worker's code */ +#include "access/xact.h" +#include "executor/spi.h" +#include "fmgr.h" +#include "lib/stringinfo.h" #include "miscadmin.h" +#include "pgstat.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 "access/xact.h" -#include "executor/spi.h"I am skeptical of this change as it is very clearly written in
comments the reason why header includes are separated.
Fixed. Have reverted this change.
Attached patch has the updated changes.
Show quoted text
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Attachments:
0002-Ordering-of-header-files-remaining-dir-oct22.patchapplication/octet-stream; name=0002-Ordering-of-header-files-remaining-dir-oct22.patchDownload
From 2d1c1991ea0c40e549863f240ccba0a4ad343b63 Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Tue, 22 Oct 2019 22:36:21 +0530
Subject: [PATCH 2/2] Ordering of header files.
Ordering of header files that is included in source code.
---
src/bin/pg_archivecleanup/pg_archivecleanup.c | 6 ++----
src/bin/pg_basebackup/pg_basebackup.c | 2 +-
src/bin/pg_basebackup/pg_receivewal.c | 6 ++----
src/bin/pg_basebackup/pg_recvlogical.c | 7 ++-----
src/bin/pg_basebackup/receivelog.c | 9 +++------
src/bin/pg_basebackup/streamutil.c | 6 ++----
src/bin/pg_basebackup/walmethods.c | 3 +--
src/bin/pg_config/pg_config.c | 2 +-
src/bin/pg_controldata/pg_controldata.c | 3 +--
src/bin/pg_dump/common.c | 8 +++-----
src/bin/pg_dump/parallel.c | 3 +--
src/bin/pg_dump/pg_backup_archiver.c | 7 +++----
src/bin/pg_dump/pg_backup_custom.c | 3 +--
src/bin/pg_dump/pg_backup_db.c | 16 +++++++---------
src/bin/pg_dump/pg_backup_directory.c | 8 ++++----
src/bin/pg_dump/pg_backup_null.c | 5 ++---
src/bin/pg_dump/pg_backup_tar.c | 14 +++++++-------
src/bin/pg_dump/pg_dump.c | 13 +++++--------
src/bin/pg_dump/pg_dump_sort.c | 3 +--
src/bin/pg_dump/pg_dumpall.c | 7 +++----
src/bin/pg_dump/pg_restore.c | 4 +---
src/bin/pg_resetwal/pg_resetwal.c | 7 +++----
src/bin/pg_rewind/datapagemap.c | 3 +--
src/bin/pg_rewind/fetch.c | 2 +-
src/bin/pg_rewind/filemap.c | 5 ++---
src/bin/pg_rewind/libpq_fetch.c | 7 +++----
src/bin/pg_rewind/parsexlog.c | 6 ++----
src/bin/pg_rewind/pg_rewind.c | 9 ++++-----
src/bin/pg_rewind/timeline.c | 3 +--
src/bin/pg_test_fsync/pg_test_fsync.c | 3 +--
src/bin/pg_upgrade/check.c | 1 -
src/bin/pg_upgrade/controldata.c | 4 ++--
src/bin/pg_upgrade/dump.c | 4 +---
src/bin/pg_upgrade/file.c | 13 ++++++-------
src/bin/pg_upgrade/function.c | 4 +---
src/bin/pg_upgrade/info.c | 4 +---
src/bin/pg_upgrade/option.c | 6 ++----
src/bin/pg_upgrade/parallel.c | 1 -
src/bin/pg_upgrade/pg_upgrade.c | 10 +++++-----
src/bin/pg_upgrade/relfilenode.c | 7 +++----
src/bin/pg_upgrade/server.c | 1 -
src/bin/pg_upgrade/util.c | 5 ++---
src/bin/pg_upgrade/version.c | 5 +----
src/bin/pg_waldump/compat.c | 2 +-
src/bin/pg_waldump/pg_waldump.c | 3 +--
src/bin/pgbench/pgbench.c | 15 ++++++++-------
src/bin/psql/common.c | 10 ++++------
src/bin/psql/copy.c | 10 ++++------
src/bin/psql/crosstabview.c | 3 +--
src/bin/psql/describe.c | 7 ++-----
src/bin/psql/help.c | 3 +--
src/bin/psql/input.c | 5 ++---
src/bin/psql/large_obj.c | 5 ++---
src/bin/psql/mainloop.c | 8 +++-----
src/bin/psql/prompt.c | 3 +--
src/bin/psql/startup.c | 10 +++-------
src/bin/psql/variables.c | 4 +---
src/common/f2s.c | 3 +--
src/fe_utils/print.c | 4 +---
src/fe_utils/recovery_gen.c | 3 +--
src/fe_utils/string_utils.c | 4 +---
src/interfaces/ecpg/compatlib/informix.c | 16 ++++++++--------
src/interfaces/ecpg/ecpglib/connect.c | 4 ++--
src/interfaces/ecpg/ecpglib/data.c | 10 +++++-----
src/interfaces/ecpg/ecpglib/descriptor.c | 5 ++---
src/interfaces/ecpg/ecpglib/error.c | 2 +-
src/interfaces/ecpg/ecpglib/execute.c | 17 ++++++++---------
src/interfaces/ecpg/ecpglib/memory.c | 4 ++--
src/interfaces/ecpg/ecpglib/misc.c | 11 ++++++-----
src/interfaces/ecpg/ecpglib/prepare.c | 4 ++--
src/interfaces/ecpg/ecpglib/sqlda.c | 9 ++++-----
src/interfaces/ecpg/ecpglib/typename.c | 5 ++---
src/interfaces/ecpg/pgtypeslib/common.c | 2 +-
src/interfaces/ecpg/pgtypeslib/datetime.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/dt_common.c | 2 +-
src/interfaces/ecpg/pgtypeslib/interval.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/numeric.c | 5 +++--
src/interfaces/ecpg/pgtypeslib/timestamp.c | 5 ++---
src/interfaces/ecpg/preproc/c_keywords.c | 5 ++---
src/interfaces/ecpg/preproc/ecpg_keywords.c | 5 ++---
src/interfaces/libpq/fe-auth.c | 3 +--
src/interfaces/libpq/fe-connect.c | 16 +++++++---------
src/interfaces/libpq/fe-exec.c | 9 ++++-----
src/interfaces/libpq/fe-misc.c | 3 +--
src/interfaces/libpq/fe-protocol2.c | 8 +++-----
src/interfaces/libpq/fe-protocol3.c | 10 ++++------
src/interfaces/libpq/fe-secure-gssapi.c | 2 +-
src/interfaces/libpq/fe-secure.c | 8 ++++----
src/pl/plpgsql/src/pl_comp.c | 4 +---
src/pl/plpgsql/src/pl_exec.c | 4 +---
src/pl/plpgsql/src/pl_funcs.c | 4 +---
src/pl/plpgsql/src/pl_handler.c | 4 +---
src/port/pg_crc32c_armv8.c | 4 ++--
src/port/pg_crc32c_sse42.c | 4 ++--
src/port/tar.c | 4 +++-
src/test/isolation/isolationtester.c | 5 ++---
.../modules/test_ginpostinglist/test_ginpostinglist.c | 2 +-
src/test/modules/test_integerset/test_integerset.c | 6 +++---
src/test/modules/test_rls_hooks/test_rls_hooks.c | 7 ++-----
src/test/modules/test_shm_mq/setup.c | 3 +--
src/test/regress/pg_regress.c | 3 +--
src/test/regress/regress.c | 3 +--
102 files changed, 237 insertions(+), 345 deletions(-)
diff --git a/src/bin/pg_archivecleanup/pg_archivecleanup.c b/src/bin/pg_archivecleanup/pg_archivecleanup.c
index bb4257f..2917d7f 100644
--- a/src/bin/pg_archivecleanup/pg_archivecleanup.c
+++ b/src/bin/pg_archivecleanup/pg_archivecleanup.c
@@ -15,11 +15,9 @@
#include <signal.h>
#include <sys/time.h>
-#include "pg_getopt.h"
-
-#include "common/logging.h"
-
#include "access/xlog_internal.h"
+#include "common/logging.h"
+#include "pg_getopt.h"
const char *progname;
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 55ef139..a9d162a 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -35,9 +35,9 @@
#include "fe_utils/string_utils.h"
#include "getopt_long.h"
#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "pgtar.h"
#include "pgtime.h"
+#include "pqexpbuffer.h"
#include "receivelog.h"
#include "replication/basebackup.h"
#include "streamutil.h"
diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
index f39c133..c0c8747 100644
--- a/src/bin/pg_basebackup/pg_receivewal.c
+++ b/src/bin/pg_basebackup/pg_receivewal.c
@@ -19,16 +19,14 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/xlog_internal.h"
#include "common/file_perm.h"
#include "common/logging.h"
-#include "libpq-fe.h"
-#include "access/xlog_internal.h"
#include "getopt_long.h"
-
+#include "libpq-fe.h"
#include "receivelog.h"
#include "streamutil.h"
-
/* Time to sleep between reconnection attempts */
#define RECONNECT_SLEEP_TIME 5
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index af29dd7..12a3505 100644
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -19,18 +19,15 @@
#include <sys/select.h>
#endif
-/* local includes */
-#include "streamutil.h"
-
#include "access/xlog_internal.h"
-#include "common/file_perm.h"
#include "common/fe_memutils.h"
+#include "common/file_perm.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "libpq/pqsignal.h"
#include "pqexpbuffer.h"
-
+#include "streamutil.h"
/* Time to sleep between reconnection attempts */
#define RECONNECT_SLEEP_TIME 5
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
index d73f614..82fd9af 100644
--- a/src/bin/pg_basebackup/receivelog.c
+++ b/src/bin/pg_basebackup/receivelog.c
@@ -20,15 +20,12 @@
#include <sys/select.h>
#endif
-/* local includes */
-#include "receivelog.h"
-#include "streamutil.h"
-
-#include "libpq-fe.h"
#include "access/xlog_internal.h"
#include "common/file_utils.h"
#include "common/logging.h"
-
+#include "libpq-fe.h"
+#include "receivelog.h"
+#include "streamutil.h"
/* fd and filename for currently open WAL file */
static Walfile *walfile = NULL;
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
index 8d8ac11..94d1a12 100644
--- a/src/bin/pg_basebackup/streamutil.c
+++ b/src/bin/pg_basebackup/streamutil.c
@@ -17,10 +17,6 @@
#include <sys/time.h>
#include <unistd.h>
-/* local includes */
-#include "receivelog.h"
-#include "streamutil.h"
-
#include "access/xlog_internal.h"
#include "common/fe_memutils.h"
#include "common/file_perm.h"
@@ -29,6 +25,8 @@
#include "fe_utils/connect.h"
#include "port/pg_bswap.h"
#include "pqexpbuffer.h"
+#include "receivelog.h"
+#include "streamutil.h"
#define ERRCODE_DUPLICATE_OBJECT "42710"
diff --git a/src/bin/pg_basebackup/walmethods.c b/src/bin/pg_basebackup/walmethods.c
index 8ec12e6..d4d15b3 100644
--- a/src/bin/pg_basebackup/walmethods.c
+++ b/src/bin/pg_basebackup/walmethods.c
@@ -21,10 +21,9 @@
#include <zlib.h>
#endif
-#include "pgtar.h"
#include "common/file_perm.h"
#include "common/file_utils.h"
-
+#include "pgtar.h"
#include "receivelog.h"
#include "streamutil.h"
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 5279e7f..a1da918 100644
--- a/src/bin/pg_config/pg_config.c
+++ b/src/bin/pg_config/pg_config.c
@@ -24,8 +24,8 @@
#include "postgres_fe.h"
-#include "port.h"
#include "common/config_info.h"
+#include "port.h"
static const char *progname;
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index ff17804..b14767f 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -26,9 +26,8 @@
#include "catalog/pg_control.h"
#include "common/controldata_utils.h"
#include "common/logging.h"
-#include "pg_getopt.h"
#include "getopt_long.h"
-
+#include "pg_getopt.h"
static void
usage(const char *progname)
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 3549f7b..37432a6 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -15,15 +15,13 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_utils.h"
-#include "pg_dump.h"
-
#include <ctype.h>
#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"
-
+#include "pg_backup_archiver.h"
+#include "pg_backup_utils.h"
+#include "pg_dump.h"
/*
* Variables for mapping DumpId to DumpableObject
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index 03479f1..24239fa 100644
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -61,10 +61,9 @@
#include <sys/select.h>
#endif
+#include "fe_utils/string_utils.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-
-#include "fe_utils/string_utils.h"
#include "port/pg_bswap.h"
/* Mnemonic macros for indexing the fd array returned by pipe(2) */
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 6c739ce..d051f26 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -30,14 +30,13 @@
#include <io.h>
#endif
+#include "dumputils.h"
+#include "fe_utils/string_utils.h"
+#include "libpq/libpq-fs.h"
#include "parallel.h"
#include "pg_backup_archiver.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
-#include "dumputils.h"
-#include "fe_utils/string_utils.h"
-
-#include "libpq/libpq-fs.h"
#define TEXT_DUMP_HEADER "--\n-- PostgreSQL database dump\n--\n\n"
#define TEXT_DUMPALL_HEADER "--\n-- PostgreSQL database cluster dump\n--\n\n"
diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index 497b81b..fc742f5 100644
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -25,11 +25,10 @@
*/
#include "postgres_fe.h"
+#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-#include "common/file_utils.h"
-
/*--------
* Routines in the format interface
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index ee822c5..6dba7e1 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -11,21 +11,19 @@
*/
#include "postgres_fe.h"
-#include "fe_utils/connect.h"
-#include "fe_utils/string_utils.h"
-
-#include "dumputils.h"
-#include "parallel.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_db.h"
-#include "pg_backup_utils.h"
-
#include <unistd.h>
#include <ctype.h>
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
+#include "dumputils.h"
+#include "fe_utils/connect.h"
+#include "fe_utils/string_utils.h"
+#include "parallel.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_db.h"
+#include "pg_backup_utils.h"
static void _check_database_version(ArchiveHandle *AH);
static PGconn *_connectDB(ArchiveHandle *AH, const char *newdbname, const char *newUser);
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index e1afecf..aa00bca 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -34,13 +34,13 @@
*/
#include "postgres_fe.h"
+#include <dirent.h>
+#include <sys/stat.h>
+
+#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-#include "common/file_utils.h"
-
-#include <dirent.h>
-#include <sys/stat.h>
typedef struct
{
diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c
index 32c911a..c62f943 100644
--- a/src/bin/pg_dump/pg_backup_null.c
+++ b/src/bin/pg_dump/pg_backup_null.c
@@ -23,11 +23,10 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_utils.h"
#include "fe_utils/string_utils.h"
-
#include "libpq/libpq-fs.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_utils.h"
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
static void _WriteBlobData(ArchiveHandle *AH, const void *data, size_t dLen);
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index dead8fc..fd74835 100644
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -29,18 +29,18 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_tar.h"
-#include "pg_backup_utils.h"
-#include "pgtar.h"
-#include "common/file_utils.h"
-#include "fe_utils/string_utils.h"
-
#include <sys/stat.h>
#include <ctype.h>
#include <limits.h>
#include <unistd.h>
+#include "common/file_utils.h"
+#include "fe_utils/string_utils.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_tar.h"
+#include "pg_backup_utils.h"
+#include "pgtar.h"
+
static void _ArchiveEntry(ArchiveHandle *AH, TocEntry *te);
static void _StartData(ArchiveHandle *AH, TocEntry *te);
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 2a087d7..bf69adc 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -38,8 +38,6 @@
#include <termios.h>
#endif
-#include "getopt_long.h"
-
#include "access/attnum.h"
#include "access/sysattr.h"
#include "access/transam.h"
@@ -54,17 +52,16 @@
#include "catalog/pg_proc_d.h"
#include "catalog/pg_trigger_d.h"
#include "catalog/pg_type_d.h"
-#include "libpq/libpq-fs.h"
-#include "storage/block.h"
-
#include "dumputils.h"
+#include "fe_utils/connect.h"
+#include "fe_utils/string_utils.h"
+#include "getopt_long.h"
+#include "libpq/libpq-fs.h"
#include "parallel.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"
-#include "fe_utils/connect.h"
-#include "fe_utils/string_utils.h"
-
+#include "storage/block.h"
typedef struct
{
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 31fc06a..ad01316 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -15,12 +15,11 @@
*/
#include "postgres_fe.h"
+#include "catalog/pg_class_d.h"
#include "pg_backup_archiver.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"
-#include "catalog/pg_class_d.h"
-
/*
* Sort priority for database object types.
* Objects are sorted by type, and within a type by name.
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 0981efc..1442ea9 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -18,14 +18,13 @@
#include <time.h>
#include <unistd.h>
-#include "getopt_long.h"
-
-#include "dumputils.h"
-#include "pg_backup.h"
#include "common/file_utils.h"
#include "common/logging.h"
+#include "dumputils.h"
#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"
+#include "getopt_long.h"
+#include "pg_backup.h"
/* version string we expect back from pg_dump */
#define PGDUMP_VERSIONSTR "pg_dump (PostgreSQL) " PG_VERSION "\n"
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 40a6b37..d1a36b1 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -45,13 +45,11 @@
#include <termios.h>
#endif
-#include "getopt_long.h"
-
#include "dumputils.h"
+#include "getopt_long.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-
static void usage(const char *progname);
int
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index f85ea2d..c83f865 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -44,9 +44,9 @@
#include <time.h>
#include <unistd.h>
-#include "access/transam.h"
#include "access/heaptoast.h"
#include "access/multixact.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlog_internal.h"
#include "common/controldata_utils.h"
@@ -55,10 +55,9 @@
#include "common/logging.h"
#include "common/restricted_token.h"
#include "common/string.h"
-#include "storage/large_object.h"
-#include "pg_getopt.h"
#include "getopt_long.h"
-
+#include "pg_getopt.h"
+#include "storage/large_object.h"
static ControlFileData ControlFile; /* pg_control values */
static XLogSegNo newXlogSegNo; /* new XLOG segment # */
diff --git a/src/bin/pg_rewind/datapagemap.c b/src/bin/pg_rewind/datapagemap.c
index 93165f6..c903dbb 100644
--- a/src/bin/pg_rewind/datapagemap.c
+++ b/src/bin/pg_rewind/datapagemap.c
@@ -12,9 +12,8 @@
#include "postgres_fe.h"
-#include "datapagemap.h"
-
#include "common/logging.h"
+#include "datapagemap.h"
struct datapagemap_iterator
{
diff --git a/src/bin/pg_rewind/fetch.c b/src/bin/pg_rewind/fetch.c
index 03a5fd6..294c72c 100644
--- a/src/bin/pg_rewind/fetch.c
+++ b/src/bin/pg_rewind/fetch.c
@@ -19,10 +19,10 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "pg_rewind.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
+#include "pg_rewind.h"
void
fetchSourceFileList(void)
diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c
index 601f7e9..21254f3 100644
--- a/src/bin/pg_rewind/filemap.c
+++ b/src/bin/pg_rewind/filemap.c
@@ -13,12 +13,11 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "catalog/pg_tablespace_d.h"
+#include "common/string.h"
#include "datapagemap.h"
#include "filemap.h"
#include "pg_rewind.h"
-
-#include "common/string.h"
-#include "catalog/pg_tablespace_d.h"
#include "storage/fd.h"
filemap_t *filemap = NULL;
diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c
index f4ebf7d..2cc87e8 100644
--- a/src/bin/pg_rewind/libpq_fetch.c
+++ b/src/bin/pg_rewind/libpq_fetch.c
@@ -14,14 +14,13 @@
#include <fcntl.h>
#include <unistd.h>
-#include "pg_rewind.h"
+#include "catalog/pg_type_d.h"
#include "datapagemap.h"
+#include "fe_utils/connect.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
-
-#include "catalog/pg_type_d.h"
-#include "fe_utils/connect.h"
+#include "pg_rewind.h"
#include "port/pg_bswap.h"
PGconn *conn = NULL;
diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c
index 264a8f4..1d03375 100644
--- a/src/bin/pg_rewind/parsexlog.c
+++ b/src/bin/pg_rewind/parsexlog.c
@@ -13,16 +13,14 @@
#include <unistd.h>
-#include "pg_rewind.h"
-#include "filemap.h"
-
#include "access/rmgr.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "catalog/pg_control.h"
#include "catalog/storage_xlog.h"
#include "commands/dbcommands_xlog.h"
-
+#include "filemap.h"
+#include "pg_rewind.h"
/*
* RmgrNames is an array of resource manager names, to make error messages
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 875a43b..e75c7ee 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -14,11 +14,6 @@
#include <time.h>
#include <unistd.h>
-#include "pg_rewind.h"
-#include "fetch.h"
-#include "file_ops.h"
-#include "filemap.h"
-
#include "access/timeline.h"
#include "access/xlog_internal.h"
#include "catalog/catversion.h"
@@ -28,7 +23,11 @@
#include "common/file_utils.h"
#include "common/restricted_token.h"
#include "fe_utils/recovery_gen.h"
+#include "fetch.h"
+#include "file_ops.h"
+#include "filemap.h"
#include "getopt_long.h"
+#include "pg_rewind.h"
#include "storage/bufpage.h"
static void usage(const char *progname);
diff --git a/src/bin/pg_rewind/timeline.c b/src/bin/pg_rewind/timeline.c
index 987452c..a29b56b 100644
--- a/src/bin/pg_rewind/timeline.c
+++ b/src/bin/pg_rewind/timeline.c
@@ -9,10 +9,9 @@
*/
#include "postgres_fe.h"
-#include "pg_rewind.h"
-
#include "access/timeline.h"
#include "access/xlog_internal.h"
+#include "pg_rewind.h"
/*
* This is copy-pasted from the backend readTimeLineHistory, modified to
diff --git a/src/bin/pg_test_fsync/pg_test_fsync.c b/src/bin/pg_test_fsync/pg_test_fsync.c
index 225557e..2ca1608 100644
--- a/src/bin/pg_test_fsync/pg_test_fsync.c
+++ b/src/bin/pg_test_fsync/pg_test_fsync.c
@@ -12,10 +12,9 @@
#include <unistd.h>
#include <signal.h>
-#include "getopt_long.h"
#include "access/xlogdefs.h"
#include "common/logging.h"
-
+#include "getopt_long.h"
/*
* put the temp files in the local directory
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 87b9d32..ff7057d 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -14,7 +14,6 @@
#include "mb/pg_wchar.h"
#include "pg_upgrade.h"
-
static void check_new_cluster_is_empty(void);
static void check_databases_are_compatible(void);
static void check_locale_and_encoding(DbInfo *olddb, DbInfo *newdb);
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 3823641..93f3c34 100644
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -9,10 +9,10 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include <ctype.h>
+#include "pg_upgrade.h"
+
/*
* get_control_data()
*
diff --git a/src/bin/pg_upgrade/dump.c b/src/bin/pg_upgrade/dump.c
index c1429fe..bdb5006 100644
--- a/src/bin/pg_upgrade/dump.c
+++ b/src/bin/pg_upgrade/dump.c
@@ -9,10 +9,8 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "fe_utils/string_utils.h"
-
+#include "pg_upgrade.h"
void
generate_old_dump(void)
diff --git a/src/bin/pg_upgrade/file.c b/src/bin/pg_upgrade/file.c
index c7fed24..ab64d5f 100644
--- a/src/bin/pg_upgrade/file.c
+++ b/src/bin/pg_upgrade/file.c
@@ -9,13 +9,6 @@
#include "postgres_fe.h"
-#include "access/visibilitymap.h"
-#include "common/file_perm.h"
-#include "pg_upgrade.h"
-#include "storage/bufpage.h"
-#include "storage/checksum.h"
-#include "storage/checksum_impl.h"
-
#include <sys/stat.h>
#include <fcntl.h>
#ifdef HAVE_COPYFILE_H
@@ -26,6 +19,12 @@
#include <linux/fs.h>
#endif
+#include "access/visibilitymap.h"
+#include "common/file_perm.h"
+#include "pg_upgrade.h"
+#include "storage/bufpage.h"
+#include "storage/checksum.h"
+#include "storage/checksum_impl.h"
#ifdef WIN32
static int win32_pghardlink(const char *src, const char *dst);
diff --git a/src/bin/pg_upgrade/function.c b/src/bin/pg_upgrade/function.c
index 3cbaab6..ac984db 100644
--- a/src/bin/pg_upgrade/function.c
+++ b/src/bin/pg_upgrade/function.c
@@ -9,11 +9,9 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "access/transam.h"
#include "catalog/pg_language_d.h"
-
+#include "pg_upgrade.h"
/*
* qsort comparator for pointers to library names
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 5c7b433..d67d3a4 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -9,11 +9,9 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "access/transam.h"
#include "catalog/pg_class_d.h"
-
+#include "pg_upgrade.h"
static void create_rel_filename_map(const char *old_data, const char *new_data,
const DbInfo *old_db, const DbInfo *new_db,
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index da9e1da..14351e8 100644
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -14,12 +14,10 @@
#include <io.h>
#endif
-#include "getopt_long.h"
#include "common/string.h"
-#include "utils/pidfile.h"
-
+#include "getopt_long.h"
#include "pg_upgrade.h"
-
+#include "utils/pidfile.h"
static void usage(void);
static void check_required_directory(char **dirpath,
diff --git a/src/bin/pg_upgrade/parallel.c b/src/bin/pg_upgrade/parallel.c
index 80ab1b8..d3d3401 100644
--- a/src/bin/pg_upgrade/parallel.c
+++ b/src/bin/pg_upgrade/parallel.c
@@ -16,7 +16,6 @@
#include "pg_upgrade.h"
-
static int parallel_jobs;
#ifdef WIN32
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index 5b82e0c..5154a71 100644
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -37,16 +37,16 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
#include "catalog/pg_class_d.h"
#include "common/file_perm.h"
#include "common/logging.h"
#include "common/restricted_token.h"
#include "fe_utils/string_utils.h"
-
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
+#include "pg_upgrade.h"
static void prepare_new_cluster(void);
static void prepare_new_globals(void);
diff --git a/src/bin/pg_upgrade/relfilenode.c b/src/bin/pg_upgrade/relfilenode.c
index 0c78073..f9d0812 100644
--- a/src/bin/pg_upgrade/relfilenode.c
+++ b/src/bin/pg_upgrade/relfilenode.c
@@ -9,12 +9,11 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include <sys/stat.h>
-#include "catalog/pg_class_d.h"
-#include "access/transam.h"
+#include "access/transam.h"
+#include "catalog/pg_class_d.h"
+#include "pg_upgrade.h"
static void transfer_single_new_db(FileNameMap *maps, int size, char *old_tablespace);
static void transfer_relfile(FileNameMap *map, const char *suffix, bool vm_must_add_frozenbit);
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index 6ad4b14..30f28bd 100644
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -13,7 +13,6 @@
#include "fe_utils/string_utils.h"
#include "pg_upgrade.h"
-
static PGconn *get_db_conn(ClusterInfo *cluster, const char *db_name);
diff --git a/src/bin/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c
index d867995..46d0bb4 100644
--- a/src/bin/pg_upgrade/util.c
+++ b/src/bin/pg_upgrade/util.c
@@ -9,11 +9,10 @@
#include "postgres_fe.h"
-#include "common/username.h"
-#include "pg_upgrade.h"
-
#include <signal.h>
+#include "common/username.h"
+#include "pg_upgrade.h"
LogOpts log_opts;
diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index b64171d..3e6d6b0 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -9,12 +9,9 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"
-
-
+#include "pg_upgrade.h"
/*
* new_9_0_populate_pg_largeobject_metadata()
diff --git a/src/bin/pg_waldump/compat.c b/src/bin/pg_waldump/compat.c
index 0e0dca7..7b389a2 100644
--- a/src/bin/pg_waldump/compat.c
+++ b/src/bin/pg_waldump/compat.c
@@ -20,8 +20,8 @@
#include <time.h>
-#include "utils/datetime.h"
#include "lib/stringinfo.h"
+#include "utils/datetime.h"
/* copied from timestamp.c */
pg_time_t
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index b79208c..8e54d7f 100644
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -16,16 +16,15 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-#include "access/xlog_internal.h"
#include "access/transam.h"
#include "common/fe_memutils.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "rmgrdesc.h"
-
static const char *progname;
static int WalSegSz;
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index e72ad00..03bcd22 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -32,12 +32,6 @@
#endif
#include "postgres_fe.h"
-#include "common/int.h"
-#include "common/logging.h"
-#include "fe_utils/conditional.h"
-#include "getopt_long.h"
-#include "libpq-fe.h"
-#include "portability/instr_time.h"
#include <ctype.h>
#include <float.h>
@@ -63,11 +57,18 @@
#endif
#endif
+#include "common/int.h"
+#include "common/logging.h"
+#include "fe_utils/conditional.h"
+#include "getopt_long.h"
+#include "libpq-fe.h"
+#include "pgbench.h"
+#include "portability/instr_time.h"
+
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
-#include "pgbench.h"
#define ERRCODE_UNDEFINED_TABLE "42P01"
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 4b26793..90f6380 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -18,18 +18,16 @@
#include <win32.h>
#endif
-#include "common/logging.h"
-#include "fe_utils/mbprint.h"
-#include "fe_utils/string_utils.h"
-#include "portability/instr_time.h"
-
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "copy.h"
#include "crosstabview.h"
+#include "fe_utils/mbprint.h"
+#include "fe_utils/string_utils.h"
+#include "portability/instr_time.h"
#include "settings.h"
-
static bool DescribeQuery(const char *query, double *elapsed_msec);
static bool ExecQueryUsingCursor(const char *query, double *elapsed_msec);
static bool command_no_begin(const char *query);
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index f9e53d6..04e518e 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -6,7 +6,6 @@
* src/bin/psql/copy.c
*/
#include "postgres_fe.h"
-#include "copy.h"
#include <signal.h>
#include <sys/stat.h>
@@ -16,16 +15,15 @@
#include <io.h> /* I think */
#endif
+#include "common.h"
+#include "common/logging.h"
+#include "copy.h"
#include "libpq-fe.h"
#include "pqexpbuffer.h"
-
-#include "settings.h"
-#include "common.h"
#include "prompt.h"
+#include "settings.h"
#include "stringutils.h"
-#include "common/logging.h"
-
/*
* parse_slash_copy
* -- parses \copy command line
diff --git a/src/bin/psql/crosstabview.c b/src/bin/psql/crosstabview.c
index 83789cb..701ef34 100644
--- a/src/bin/psql/crosstabview.c
+++ b/src/bin/psql/crosstabview.c
@@ -8,13 +8,12 @@
#include "postgres_fe.h"
#include "common.h"
+#include "common/logging.h"
#include "crosstabview.h"
#include "pqexpbuffer.h"
#include "psqlscanslash.h"
#include "settings.h"
-#include "common/logging.h"
-
/*
* Value/position from the resultset that goes into the horizontal or vertical
* crosstabview header.
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index d7c0fc0..b3b9313 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -18,18 +18,15 @@
#include "catalog/pg_cast_d.h"
#include "catalog/pg_class_d.h"
#include "catalog/pg_default_acl_d.h"
-
+#include "common.h"
#include "common/logging.h"
+#include "describe.h"
#include "fe_utils/mbprint.h"
#include "fe_utils/print.h"
#include "fe_utils/string_utils.h"
-
-#include "common.h"
-#include "describe.h"
#include "settings.h"
#include "variables.h"
-
static bool describeOneTableDetails(const char *schemaname,
const char *relationname,
const char *oid,
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 59ea8cc..0f58eeb 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -21,10 +21,9 @@
#include <termios.h>
#endif
+#include "common.h"
#include "common/logging.h"
#include "common/username.h"
-
-#include "common.h"
#include "help.h"
#include "input.h"
#include "settings.h"
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 5a18ac9..5798e6e 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -13,12 +13,11 @@
#include <fcntl.h>
#include <limits.h>
+#include "common.h"
+#include "common/logging.h"
#include "input.h"
#include "settings.h"
#include "tab-complete.h"
-#include "common.h"
-
-#include "common/logging.h"
#ifndef WIN32
#define PSQLHISTORY ".psql_history"
diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c
index 2713f15..042403e 100644
--- a/src/bin/psql/large_obj.c
+++ b/src/bin/psql/large_obj.c
@@ -6,12 +6,11 @@
* src/bin/psql/large_obj.c
*/
#include "postgres_fe.h"
-#include "large_obj.h"
-#include "settings.h"
#include "common.h"
-
#include "common/logging.h"
+#include "large_obj.h"
+#include "settings.h"
static void print_lo_result(const char *fmt,...) pg_attribute_printf(1, 2);
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index e386d98..b3a8407 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -6,18 +6,16 @@
* src/bin/psql/mainloop.c
*/
#include "postgres_fe.h"
-#include "mainloop.h"
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "input.h"
+#include "mainloop.h"
+#include "mb/pg_wchar.h"
#include "prompt.h"
#include "settings.h"
-#include "common/logging.h"
-#include "mb/pg_wchar.h"
-
-
/* callback functions for our flex lexer */
const PsqlScanCallbacks psqlscan_callbacks = {
psql_get_variable,
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index 0fcb8c7..195192a 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -18,12 +18,11 @@
#endif
#include "common.h"
+#include "common/string.h"
#include "input.h"
#include "prompt.h"
#include "settings.h"
-#include "common/string.h"
-
/*--------------------------
* get_prompt
*
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index e4c0a7e..0d941ef 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -14,21 +14,17 @@
#include <win32.h>
#endif /* WIN32 */
-#include "getopt_long.h"
-
-#include "common/logging.h"
-#include "fe_utils/print.h"
-
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "describe.h"
+#include "fe_utils/print.h"
+#include "getopt_long.h"
#include "help.h"
#include "input.h"
#include "mainloop.h"
#include "settings.h"
-
-
/*
* Global psql options
*/
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index 1d2a31c..3f7b641 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -8,10 +8,8 @@
#include "postgres_fe.h"
#include "common.h"
-#include "variables.h"
-
#include "common/logging.h"
-
+#include "variables.h"
/*
* Check whether a variable's name is allowed.
diff --git a/src/common/f2s.c b/src/common/f2s.c
index e332557..ea5ca8d 100644
--- a/src/common/f2s.c
+++ b/src/common/f2s.c
@@ -39,9 +39,8 @@
#endif
#include "common/shortest_dec.h"
-
-#include "ryu_common.h"
#include "digit_table.h"
+#include "ryu_common.h"
#define FLOAT_MANTISSA_BITS 23
#define FLOAT_EXPONENT_BITS 8
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index e41f42e..1f8bde8 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -30,11 +30,9 @@
#include <termios.h>
#endif
-#include "fe_utils/print.h"
-
#include "catalog/pg_type_d.h"
#include "fe_utils/mbprint.h"
-
+#include "fe_utils/print.h"
/*
* If the calling program doesn't have any mechanism for setting
diff --git a/src/fe_utils/recovery_gen.c b/src/fe_utils/recovery_gen.c
index 6641f95..aec01c0 100644
--- a/src/fe_utils/recovery_gen.c
+++ b/src/fe_utils/recovery_gen.c
@@ -10,9 +10,8 @@
#include "postgres_fe.h"
#include "common/logging.h"
-#include "fe_utils/string_utils.h"
#include "fe_utils/recovery_gen.h"
-
+#include "fe_utils/string_utils.h"
static char *escape_quotes(const char *src);
diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c
index 8c3a603..b07f142 100644
--- a/src/fe_utils/string_utils.c
+++ b/src/fe_utils/string_utils.c
@@ -17,10 +17,8 @@
#include <ctype.h>
-#include "fe_utils/string_utils.h"
-
#include "common/keywords.h"
-
+#include "fe_utils/string_utils.h"
static PQExpBuffer defaultGetLocalPQExpBuffer(void);
diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
index 6ef1fad..bbaf450 100644
--- a/src/interfaces/ecpg/compatlib/informix.c
+++ b/src/interfaces/ecpg/compatlib/informix.c
@@ -7,14 +7,14 @@
#include <ctype.h>
#include <limits.h>
-#include <ecpgtype.h>
-#include <ecpg_informix.h>
-#include <pgtypes_error.h>
-#include <pgtypes_date.h>
-#include <pgtypes_numeric.h>
-#include <sqltypes.h>
-#include <sqlca.h>
-#include <ecpgerrno.h>
+#include "ecpg_informix.h"
+#include "ecpgerrno.h"
+#include "ecpgtype.h"
+#include "pgtypes_date.h"
+#include "pgtypes_error.h"
+#include "pgtypes_numeric.h"
+#include "sqlca.h"
+#include "sqltypes.h"
/* this is also defined in ecpglib/misc.c, by defining it twice we don't have to export the symbol */
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
index b4f6089..1cb5211 100644
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -4,10 +4,10 @@
#include "postgres_fe.h"
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#ifdef ENABLE_THREAD_SAFETY
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 81f94cc..7d2a78a 100644
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -5,15 +5,15 @@
#include <math.h>
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
+#include "sqlca.h"
/* returns true if character c is a delimiter for the given array type */
static bool
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index ef500a9..ead8778 100644
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -7,12 +7,11 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#include "sqlda.h"
#include "sql3types.h"
diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c
index 9c56991..a4e3c0d 100644
--- a/src/interfaces/ecpg/ecpglib/error.c
+++ b/src/interfaces/ecpg/ecpglib/error.c
@@ -4,9 +4,9 @@
#include "postgres_fe.h"
#include "ecpgerrno.h"
-#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
void
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 7c9cb76..23cc869 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -19,19 +19,18 @@
#include <math.h>
#include "catalog/pg_type_d.h"
-
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "sqlda-native.h"
-#include "sqlda-compat.h"
-#include "sql3types.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
+#include "sql3types.h"
+#include "sqlca.h"
+#include "sqlda-compat.h"
+#include "sqlda-native.h"
/*
* This function returns a newly malloced string that has ' and \
diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c
index 52ca1c5..bd81251 100644
--- a/src/interfaces/ecpg/ecpglib/memory.c
+++ b/src/interfaces/ecpg/ecpglib/memory.c
@@ -4,10 +4,10 @@
#include "postgres_fe.h"
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
void
ecpg_free(void *ptr)
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index 2eec54a..647da14 100644
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -5,17 +5,18 @@
#include <limits.h>
#include <unistd.h>
+
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
#include "pg_config_paths.h"
+#include "sqlca.h"
#ifdef HAVE_LONG_LONG_INT
#ifndef LONG_LONG_MIN
diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c
index 6e7adb9..b9653c0 100644
--- a/src/interfaces/ecpg/ecpglib/prepare.c
+++ b/src/interfaces/ecpg/ecpglib/prepare.c
@@ -5,10 +5,10 @@
#include <ctype.h>
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#define STMTID_SIZE 32
diff --git a/src/interfaces/ecpg/ecpglib/sqlda.c b/src/interfaces/ecpg/ecpglib/sqlda.c
index 3fb0d82..081e326 100644
--- a/src/interfaces/ecpg/ecpglib/sqlda.c
+++ b/src/interfaces/ecpg/ecpglib/sqlda.c
@@ -10,16 +10,15 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
-#include "ecpg-pthread-win32.h"
#include "decimal.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
+#include "ecpg-pthread-win32.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
-#include "sqlda-native.h"
#include "sqlda-compat.h"
+#include "sqlda-native.h"
/*
* Compute the next variable's offset with
diff --git a/src/interfaces/ecpg/ecpglib/typename.c b/src/interfaces/ecpg/ecpglib/typename.c
index 9251450..1d482c4 100644
--- a/src/interfaces/ecpg/ecpglib/typename.c
+++ b/src/interfaces/ecpg/ecpglib/typename.c
@@ -4,12 +4,11 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
-#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqltypes.h"
+#include "ecpgtype.h"
#include "sql3types.h"
+#include "sqltypes.h"
/*
* This function is used to generate the correct type names.
diff --git a/src/interfaces/ecpg/pgtypeslib/common.c b/src/interfaces/ecpg/pgtypeslib/common.c
index abcf7f5..8972229 100644
--- a/src/interfaces/ecpg/pgtypeslib/common.c
+++ b/src/interfaces/ecpg/pgtypeslib/common.c
@@ -2,8 +2,8 @@
#include "postgres_fe.h"
-#include "pgtypeslib_extern.h"
#include "pgtypes.h"
+#include "pgtypeslib_extern.h"
/* Return value is zero-filled. */
char *
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index 9ee460b..71dc1a5 100644
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -6,10 +6,10 @@
#include <ctype.h>
#include <limits.h>
-#include "pgtypeslib_extern.h"
#include "dt.h"
-#include "pgtypes_error.h"
#include "pgtypes_date.h"
+#include "pgtypes_error.h"
+#include "pgtypeslib_extern.h"
date *
PGTYPESdate_new(void)
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index 29c1117..c22f657 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -7,9 +7,9 @@
#include <math.h>
#include "common/string.h"
-#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_timestamp.h"
+#include "pgtypeslib_extern.h"
const int day_tab[2][13] = {
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0},
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index 3ff8a10..5b3c9a7 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -1,6 +1,7 @@
/* src/interfaces/ecpg/pgtypeslib/interval.c */
#include "postgres_fe.h"
+
#include <time.h>
#include <math.h>
#include <limits.h>
@@ -10,11 +11,10 @@
#endif
#include "common/string.h"
-
-#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_error.h"
#include "pgtypes_interval.h"
+#include "pgtypeslib_extern.h"
/* copy&pasted from .../src/backend/utils/adt/datetime.c
* and changesd struct pg_tm to struct tm
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index 22088ba..b6ca2d3 100644
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -1,12 +1,14 @@
/* src/interfaces/ecpg/pgtypeslib/numeric.c */
#include "postgres_fe.h"
+
#include <ctype.h>
#include <float.h>
#include <limits.h>
-#include "pgtypeslib_extern.h"
#include "pgtypes_error.h"
+#include "pgtypes_numeric.h"
+#include "pgtypeslib_extern.h"
#define Max(x, y) ((x) > (y) ? (x) : (y))
#define Min(x, y) ((x) < (y) ? (x) : (y))
@@ -20,7 +22,6 @@
free(buf); \
} while (0)
-#include "pgtypes_numeric.h"
#if 0
/* ----------
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 2be151f..7816e6f 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -11,11 +11,10 @@
#error -ffast-math is known to break this code
#endif
-#include "pgtypeslib_extern.h"
#include "dt.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_date.h"
-
+#include "pgtypes_timestamp.h"
+#include "pgtypeslib_extern.h"
static int64
time2t(const int hour, const int min, const int sec, const fsec_t fsec)
diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c
index 80aa7d5..e51c036 100644
--- a/src/interfaces/ecpg/preproc/c_keywords.c
+++ b/src/interfaces/ecpg/preproc/c_keywords.c
@@ -9,11 +9,10 @@
*/
#include "postgres_fe.h"
-#include "preproc_extern.h"
-#include "preproc.h"
-
/* ScanKeywordList lookup data for C keywords */
#include "c_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"
/* Token codes for C keywords */
#define PG_KEYWORD(kwname, value) value,
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index 4839c37..a2db06f 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -13,11 +13,10 @@
#include <ctype.h>
-#include "preproc_extern.h"
-#include "preproc.h"
-
/* ScanKeywordList lookup data for ECPG keywords */
#include "ecpg_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"
/* Token codes for ECPG keywords */
#define PG_KEYWORD(kwname, value) value,
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index a690f3b..2364dda 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -40,9 +40,8 @@
#include "common/md5.h"
#include "common/scram-common.h"
-#include "libpq-fe.h"
#include "fe-auth.h"
-
+#include "libpq-fe.h"
#ifdef ENABLE_GSS
/*
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 9af8303..be4fc03 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -21,10 +21,16 @@
#include <time.h>
#include <unistd.h>
+#include "common/ip.h"
+#include "common/link-canary.h"
+#include "common/scram-common.h"
+#include "common/string.h"
+#include "fe-auth.h"
#include "libpq-fe.h"
#include "libpq-int.h"
-#include "fe-auth.h"
+#include "mb/pg_wchar.h"
#include "pg_config_paths.h"
+#include "port/pg_bswap.h"
#ifdef WIN32
#include "win32.h"
@@ -70,14 +76,6 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
PQExpBuffer errorMessage);
#endif
-#include "common/ip.h"
-#include "common/link-canary.h"
-#include "common/scram-common.h"
-#include "common/string.h"
-#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
-
-
#ifndef WIN32
#define PGPASSFILE ".pgpass"
#else
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index b3c59a0..051f548 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -18,17 +18,16 @@
#include <fcntl.h>
#include <limits.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-
-#include "mb/pg_wchar.h"
-
#ifdef WIN32
#include "win32.h"
#else
#include <unistd.h>
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "mb/pg_wchar.h"
+
/* keep this in same order as ExecStatusType in libpq-fe.h */
char *const pgresStatus[] = {
"PGRES_EMPTY_QUERY",
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 18fec4a..a7c08c5 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -50,9 +50,8 @@
#include "libpq-fe.h"
#include "libpq-int.h"
#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
#include "pg_config_paths.h"
-
+#include "port/pg_bswap.h"
static int pqPutMsgBytes(const void *buf, size_t len, PGconn *conn);
static int pqSendSome(PGconn *conn, int len);
diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c
index 0e36974..e71e25a 100644
--- a/src/interfaces/libpq/fe-protocol2.c
+++ b/src/interfaces/libpq/fe-protocol2.c
@@ -17,11 +17,6 @@
#include <ctype.h>
#include <fcntl.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-#include "port/pg_bswap.h"
-
-
#ifdef WIN32
#include "win32.h"
#else
@@ -31,6 +26,9 @@
#endif
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "port/pg_bswap.h"
static int getRowDescriptions(PGconn *conn);
static int getAnotherTuple(PGconn *conn, bool binary);
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
index b04f7ec..c97841e 100644
--- a/src/interfaces/libpq/fe-protocol3.c
+++ b/src/interfaces/libpq/fe-protocol3.c
@@ -17,12 +17,6 @@
#include <ctype.h>
#include <fcntl.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-
-#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
-
#ifdef WIN32
#include "win32.h"
#else
@@ -32,6 +26,10 @@
#endif
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "mb/pg_wchar.h"
+#include "port/pg_bswap.h"
/*
* This macro lists the backend message types that could be "long" (more
diff --git a/src/interfaces/libpq/fe-secure-gssapi.c b/src/interfaces/libpq/fe-secure-gssapi.c
index 095750d..a1c1d12 100644
--- a/src/interfaces/libpq/fe-secure-gssapi.c
+++ b/src/interfaces/libpq/fe-secure-gssapi.c
@@ -13,9 +13,9 @@
#include "postgres_fe.h"
+#include "fe-gssapi-common.h"
#include "libpq-fe.h"
#include "libpq-int.h"
-#include "fe-gssapi-common.h"
#include "port/pg_bswap.h"
/*
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index b8191b4..e55b375 100644
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -28,10 +28,6 @@
#include <fcntl.h>
#include <ctype.h>
-#include "libpq-fe.h"
-#include "fe-auth.h"
-#include "libpq-int.h"
-
#ifdef WIN32
#include "win32.h"
#else
@@ -55,6 +51,10 @@
#endif
#endif
+#include "fe-auth.h"
+#include "libpq-fe.h"
+#include "libpq-int.h"
+
/*
* Macros to handle disabling and then restoring the state of SIGPIPE handling.
* On Windows, these are all no-ops since there's no SIGPIPEs.
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 0c24ba6..3fb8fc7 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -24,6 +24,7 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "parser/parse_type.h"
+#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
@@ -33,9 +34,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "plpgsql.h"
-
-
/* ----------
* Our own local and global variables
* ----------
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 345065e..fd799b7 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -34,6 +34,7 @@
#include "parser/parse_coerce.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
+#include "plpgsql.h"
#include "storage/proc.h"
#include "tcop/tcopprot.h"
#include "tcop/utility.h"
@@ -48,9 +49,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "plpgsql.h"
-
-
typedef struct
{
int nargs; /* number of arguments */
diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
index 053f83d..2d4616c 100644
--- a/src/pl/plpgsql/src/pl_funcs.c
+++ b/src/pl/plpgsql/src/pl_funcs.c
@@ -15,10 +15,8 @@
#include "postgres.h"
-#include "utils/memutils.h"
-
#include "plpgsql.h"
-
+#include "utils/memutils.h"
/* ----------
* Local variables for namespace handling
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index ce03f1e..e92deb3 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -20,15 +20,13 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/varlena.h"
-#include "plpgsql.h"
-
-
static bool plpgsql_extra_checks_check_hook(char **newvalue, void **extra, GucSource source);
static void plpgsql_extra_warnings_assign_hook(const char *newvalue, void *extra);
static void plpgsql_extra_errors_assign_hook(const char *newvalue, void *extra);
diff --git a/src/port/pg_crc32c_armv8.c b/src/port/pg_crc32c_armv8.c
index ebe449e..de725d3 100644
--- a/src/port/pg_crc32c_armv8.c
+++ b/src/port/pg_crc32c_armv8.c
@@ -14,10 +14,10 @@
*/
#include "c.h"
-#include "port/pg_crc32c.h"
-
#include <arm_acle.h>
+#include "port/pg_crc32c.h"
+
pg_crc32c
pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t len)
{
diff --git a/src/port/pg_crc32c_sse42.c b/src/port/pg_crc32c_sse42.c
index ef56cff..a81718b 100644
--- a/src/port/pg_crc32c_sse42.c
+++ b/src/port/pg_crc32c_sse42.c
@@ -14,10 +14,10 @@
*/
#include "c.h"
-#include "port/pg_crc32c.h"
-
#include <nmmintrin.h>
+#include "port/pg_crc32c.h"
+
pg_crc32c
pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len)
{
diff --git a/src/port/tar.c b/src/port/tar.c
index f1da959..4afe9f2 100644
--- a/src/port/tar.c
+++ b/src/port/tar.c
@@ -1,7 +1,9 @@
#include "c.h"
-#include "pgtar.h"
+
#include <sys/stat.h>
+#include "pgtar.h"
+
/*
* Print a numeric field in a tar header. The field starts at *s and is of
* length len; val is the value to be written.
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
index 556b46d..b50c189 100644
--- a/src/test/isolation/isolationtester.c
+++ b/src/test/isolation/isolationtester.c
@@ -13,11 +13,10 @@
#endif
#include "datatype/timestamp.h"
+#include "isolationtester.h"
#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "pg_getopt.h"
-
-#include "isolationtester.h"
+#include "pqexpbuffer.h"
#define PREP_WAITING "isolationtester_waiting"
diff --git a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
index bab073b..7e9d7de 100644
--- a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
+++ b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
@@ -12,10 +12,10 @@
*/
#include "postgres.h"
-#include "fmgr.h"
#include "access/ginblock.h"
#include "access/gin_private.h"
#include "access/htup_details.h"
+#include "fmgr.h"
PG_MODULE_MAGIC;
diff --git a/src/test/modules/test_integerset/test_integerset.c b/src/test/modules/test_integerset/test_integerset.c
index e3925a1..82d8563 100644
--- a/src/test/modules/test_integerset/test_integerset.c
+++ b/src/test/modules/test_integerset/test_integerset.c
@@ -14,12 +14,12 @@
#include "fmgr.h"
#include "lib/integerset.h"
+#include "miscadmin.h"
#include "nodes/bitmapset.h"
-#include "utils/memutils.h"
-#include "utils/timestamp.h"
#include "storage/block.h"
#include "storage/itemptr.h"
-#include "miscadmin.h"
+#include "utils/memutils.h"
+#include "utils/timestamp.h"
/*
* If you enable this, the "pattern" tests will print information about
diff --git a/src/test/modules/test_rls_hooks/test_rls_hooks.c b/src/test/modules/test_rls_hooks/test_rls_hooks.c
index 10379bc..f576ecb 100644
--- a/src/test/modules/test_rls_hooks/test_rls_hooks.c
+++ b/src/test/modules/test_rls_hooks/test_rls_hooks.c
@@ -13,19 +13,16 @@
#include "postgres.h"
+#include "catalog/pg_type.h"
#include "fmgr.h"
#include "miscadmin.h"
-
-#include "test_rls_hooks.h"
-
-#include "catalog/pg_type.h"
-#include "nodes/makefuncs.h"
#include "nodes/makefuncs.h"
#include "parser/parse_clause.h"
#include "parser/parse_collate.h"
#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "rewrite/rowsecurity.h"
+#include "test_rls_hooks.h"
#include "utils/acl.h"
#include "utils/rel.h"
#include "utils/relcache.h"
diff --git a/src/test/modules/test_shm_mq/setup.c b/src/test/modules/test_shm_mq/setup.c
index a318168..c1a0fa4 100644
--- a/src/test/modules/test_shm_mq/setup.c
+++ b/src/test/modules/test_shm_mq/setup.c
@@ -20,9 +20,8 @@
#include "postmaster/bgworker.h"
#include "storage/procsignal.h"
#include "storage/shm_toc.h"
-#include "utils/memutils.h"
-
#include "test_shm_mq.h"
+#include "utils/memutils.h"
typedef struct
{
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 3a39472..6554ce2 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -29,14 +29,13 @@
#include <sys/resource.h>
#endif
-#include "pg_regress.h"
-
#include "common/logging.h"
#include "common/restricted_token.h"
#include "common/username.h"
#include "getopt_long.h"
#include "libpq/pqcomm.h" /* needed for UNIXSOCK_PATH() */
#include "pg_config_paths.h"
+#include "pg_regress.h"
#include "portability/instr_time.h"
/* for resultmap we need a list of pairs of strings */
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index cb8ef53..2f66d76 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -36,10 +36,9 @@
#include "port/atomics.h"
#include "utils/builtins.h"
#include "utils/geo_decls.h"
+#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/typcache.h"
-#include "utils/memutils.h"
-
#define EXPECT_TRUE(expr) \
do { \
--
1.8.3.1
Re: Ordering of header file inclusion
On Tue, Oct 22, 2019 at 11:05 PM vignesh C <vignesh21@gmail.com> wrote:
On Tue, Oct 22, 2019 at 3:42 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
Review for 0003-Ordering-of-header-files-remaining-dir-oct21 ----------------------------------------------------------------------------------------- 1. --- a/src/bin/pg_basebackup/pg_recvlogical.c +++ b/src/bin/pg_basebackup/pg_recvlogical.c @@ -19,18 +19,16 @@
I have compiled and verified make check & make check-world in the following:
CentOS Linux release 7.7.1908
Red Hat Enterprise Linux Server release 7.1
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Tue, Oct 22, 2019 at 3:41 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Tue, Oct 22, 2019 at 12:56 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Mon, Oct 21, 2019 at 11:04 PM vignesh C <vignesh21@gmail.com> wrote:
On Mon, Oct 21, 2019 at 8:47 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
This patch series has broadly changed the code to organize the header
includes in alphabetic order. It also makes sure that all files first
includes 'postgres.h'/'postgres_fe.h', system header includes and then
Postgres header includes.It also has a change where it seems that for local header includes, we
have used '<>' whereas quotes ("") should have been used. See,
ecpg/compatlib/informix.c.I am planning to commit this as multiple commits (a. contrib modules,
b. non-backend changes and c. backend changes) as there is some risk
of buildfarm break. From my side, I will ensure that everything is
passing on windows and centos. Any objections to this plan?
Attached are patches for (a) and (b) after another round of review and
fixes by Vignesh. I am planning to commit the first one (a) tomorrow
morning and then if everything is fine on buildfarm, I will commit the
second one (b) and once both are good, I will look into the third one
(c). Another pair of eyes on these patches would be good.
Just to be clear, the basic rule we follow here is to always first
include 'postgres.h' or 'postgres_fe.h' whichever is applicable, then
system header includes and then Postgres header includes. In this, we
also follow that all the Postgres header includes are in order based
on their ASCII value. We generally follow these rules, but the code
has deviated in many places. These commits make these rules
consistent for the entire code.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Attachments:
0001-Make-the-order-of-the-header-file-includes-consisten.patchapplication/octet-stream; name=0001-Make-the-order-of-the-header-file-includes-consisten.patchDownload
From 40b5b4db92c3d2a832fbf88ddce112b907b63612 Mon Sep 17 00:00:00 2001
From: Amit Kapila <akapila@postgresql.org>
Date: Wed, 23 Oct 2019 09:26:22 +0530
Subject: [PATCH] Make the order of the header file includes consistent in
contrib modules.
The basic rule we follow here is to always first include 'postgres.h' or
'postgres_fe.h' whichever is applicable, then system header includes and
then Postgres header includes. In this, we also follow that all the
Postgres header includes are in order based on their ASCII value. We
generally follow these rules, but the code has deviated in many places.
This commit makes it consistent just for contrib modules. The later
commits will enforce similar rules in other parts of code.
Author: Vignesh C
Reviewed-by: Amit Kapila
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
---
contrib/bloom/blcost.c | 3 +--
contrib/bloom/blinsert.c | 3 +--
contrib/bloom/blscan.c | 5 ++---
contrib/bloom/blutils.c | 10 ++++------
contrib/bloom/blvalidate.c | 3 +--
contrib/btree_gin/btree_gin.c | 2 +-
contrib/btree_gist/btree_enum.c | 4 ++--
contrib/btree_gist/btree_inet.c | 2 +-
contrib/btree_gist/btree_numeric.c | 3 +--
contrib/btree_gist/btree_utils_var.c | 5 ++---
contrib/cube/cube.c | 3 +--
contrib/dblink/dblink.c | 3 +--
contrib/hstore/hstore_gist.c | 3 +--
contrib/hstore/hstore_io.c | 3 +--
contrib/hstore/hstore_op.c | 3 +--
contrib/hstore_plpython/hstore_plpython.c | 4 ++--
contrib/intarray/_int_bool.c | 3 +--
contrib/intarray/_int_gin.c | 3 +--
contrib/intarray/_int_gist.c | 3 +--
contrib/intarray/_int_op.c | 1 -
contrib/intarray/_int_selfuncs.c | 6 +++---
contrib/intarray/_int_tool.c | 4 +---
contrib/intarray/_intbig_gist.c | 3 +--
contrib/isn/isn.c | 7 +++----
contrib/jsonb_plperl/jsonb_plperl.c | 2 +-
contrib/jsonb_plpython/jsonb_plpython.c | 4 ++--
contrib/ltree/_ltree_gist.c | 4 +---
contrib/ltree/crc32.c | 2 +-
contrib/ltree/lquery_op.c | 2 +-
contrib/ltree/ltree_io.c | 2 +-
contrib/ltree/ltree_op.c | 2 +-
contrib/ltree_plpython/ltree_plpython.c | 2 +-
contrib/oid2name/oid2name.c | 4 +---
contrib/pageinspect/brinfuncs.c | 8 +++-----
contrib/pageinspect/btreefuncs.c | 4 +---
contrib/pageinspect/fsmfuncs.c | 3 +--
contrib/pageinspect/ginfuncs.c | 3 +--
contrib/pageinspect/hashfuncs.c | 5 ++---
contrib/pageinspect/heapfuncs.c | 5 ++---
contrib/pageinspect/rawpage.c | 3 +--
contrib/passwordcheck/passwordcheck.c | 2 +-
contrib/pg_standby/pg_standby.c | 3 +--
contrib/pg_trgm/trgm_gin.c | 4 +---
contrib/pg_trgm/trgm_gist.c | 4 +---
contrib/pg_trgm/trgm_op.c | 3 +--
contrib/pg_trgm/trgm_regexp.c | 4 +---
contrib/pgcrypto/crypt-md5.c | 2 +-
contrib/pgcrypto/internal.c | 6 +++---
contrib/pgcrypto/mbuf.c | 2 +-
contrib/pgcrypto/openssl.c | 3 +--
contrib/pgcrypto/pgcrypto.c | 7 +++----
contrib/pgcrypto/pgp-armor.c | 2 +-
contrib/pgcrypto/pgp-cfb.c | 2 +-
contrib/pgcrypto/pgp-compress.c | 3 +--
contrib/pgcrypto/pgp-decrypt.c | 2 +-
contrib/pgcrypto/pgp-encrypt.c | 3 +--
contrib/pgcrypto/pgp-info.c | 2 +-
contrib/pgcrypto/pgp-mpi-internal.c | 3 +--
contrib/pgcrypto/pgp-mpi-openssl.c | 2 +-
contrib/pgcrypto/pgp-mpi.c | 2 +-
contrib/pgcrypto/pgp-pgsql.c | 11 +++++------
contrib/pgcrypto/pgp-pubdec.c | 2 +-
contrib/pgcrypto/pgp-pubenc.c | 2 +-
contrib/pgcrypto/pgp-pubkey.c | 2 +-
contrib/pgcrypto/pgp-s2k.c | 3 +--
contrib/pgcrypto/pgp.c | 2 +-
contrib/pgcrypto/px-crypt.c | 3 +--
contrib/pgstattuple/pgstatapprox.c | 6 +++---
contrib/postgres_fdw/connection.c | 4 +---
contrib/postgres_fdw/deparse.c | 4 +---
contrib/postgres_fdw/option.c | 4 +---
contrib/postgres_fdw/postgres_fdw.c | 3 +--
contrib/postgres_fdw/shippable.c | 4 +---
contrib/sepgsql/database.c | 4 ++--
contrib/sepgsql/dml.c | 5 ++---
contrib/sepgsql/hooks.c | 3 +--
contrib/sepgsql/label.c | 5 ++---
contrib/sepgsql/proc.c | 3 +--
contrib/sepgsql/relation.c | 7 +++----
contrib/sepgsql/schema.c | 3 +--
contrib/sepgsql/uavc.c | 3 +--
contrib/spi/moddatetime.c | 2 +-
contrib/tablefunc/tablefunc.c | 3 +--
contrib/tcn/tcn.c | 2 +-
contrib/vacuumlo/vacuumlo.c | 3 +--
85 files changed, 115 insertions(+), 183 deletions(-)
diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c
index f9fe57f..b2cd649 100644
--- a/contrib/bloom/blcost.c
+++ b/contrib/bloom/blcost.c
@@ -12,11 +12,10 @@
*/
#include "postgres.h"
+#include "bloom.h"
#include "fmgr.h"
#include "utils/selfuncs.h"
-#include "bloom.h"
-
/*
* Estimate cost of bloom index scan.
*/
diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c
index 4b2186b..30d17f5 100644
--- a/contrib/bloom/blinsert.c
+++ b/contrib/bloom/blinsert.c
@@ -15,6 +15,7 @@
#include "access/genam.h"
#include "access/generic_xlog.h"
#include "access/tableam.h"
+#include "bloom.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
@@ -23,8 +24,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "bloom.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c
index 49e364a..30fa206 100644
--- a/contrib/bloom/blscan.c
+++ b/contrib/bloom/blscan.c
@@ -13,15 +13,14 @@
#include "postgres.h"
#include "access/relscan.h"
-#include "pgstat.h"
+#include "bloom.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "bloom.h"
-
/*
* Begin scan of bloom index.
*/
diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c
index dbb24cb..3d44616 100644
--- a/contrib/bloom/blutils.c
+++ b/contrib/bloom/blutils.c
@@ -15,17 +15,15 @@
#include "access/amapi.h"
#include "access/generic_xlog.h"
+#include "access/reloptions.h"
+#include "bloom.h"
#include "catalog/index.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/indexfsm.h"
-#include "utils/memutils.h"
-#include "access/reloptions.h"
#include "storage/freespace.h"
#include "storage/indexfsm.h"
-
-#include "bloom.h"
+#include "storage/lmgr.h"
+#include "utils/memutils.h"
/* Signature dealing macros - note i is assumed to be of type int */
#define GETWORD(x,i) ( *( (BloomSignatureWord *)(x) + ( (i) / SIGNWORDBITS ) ) )
diff --git a/contrib/bloom/blvalidate.c b/contrib/bloom/blvalidate.c
index e9bd1b4..b3dfe03 100644
--- a/contrib/bloom/blvalidate.c
+++ b/contrib/bloom/blvalidate.c
@@ -14,6 +14,7 @@
#include "access/amvalidate.h"
#include "access/htup_details.h"
+#include "bloom.h"
#include "catalog/pg_amop.h"
#include "catalog/pg_amproc.h"
#include "catalog/pg_opclass.h"
@@ -24,8 +25,6 @@
#include "utils/regproc.h"
#include "utils/syscache.h"
-#include "bloom.h"
-
/*
* Validator for a bloom opclass.
*/
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c
index 2ecf7a2..0ed3d58 100644
--- a/contrib/btree_gin/btree_gin.c
+++ b/contrib/btree_gin/btree_gin.c
@@ -14,8 +14,8 @@
#include "utils/inet.h"
#include "utils/numeric.h"
#include "utils/timestamp.h"
-#include "utils/varbit.h"
#include "utils/uuid.h"
+#include "utils/varbit.h"
PG_MODULE_MAGIC;
diff --git a/contrib/btree_gist/btree_enum.c b/contrib/btree_gist/btree_enum.c
index 0ec7d8b..b563012 100644
--- a/contrib/btree_gist/btree_enum.c
+++ b/contrib/btree_gist/btree_enum.c
@@ -2,11 +2,11 @@
* contrib/btree_gist/btree_enum.c
*/
#include "postgres.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
#include "btree_gist.h"
#include "btree_utils_num.h"
+#include "fmgr.h"
+#include "utils/builtins.h"
/* enums are really Oids, so we just use the same structure */
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 34308cc..a3b4301 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -5,9 +5,9 @@
#include "btree_gist.h"
#include "btree_utils_num.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/inet.h"
-#include "catalog/pg_type.h"
typedef struct inetkey
{
diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c
index b72060c..d43612a 100644
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -3,11 +3,10 @@
*/
#include "postgres.h"
-#include "btree_gist.h"
-
#include <math.h>
#include <float.h>
+#include "btree_gist.h"
#include "btree_utils_var.h"
#include "utils/builtins.h"
#include "utils/numeric.h"
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 670c879..452241f 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -3,15 +3,14 @@
*/
#include "postgres.h"
-#include "btree_gist.h"
-
#include <math.h>
#include <limits.h>
#include <float.h>
+#include "btree_gist.h"
#include "btree_utils_var.h"
-#include "utils/pg_locale.h"
#include "utils/builtins.h"
+#include "utils/pg_locale.h"
#include "utils/rel.h"
/* used for key sorting */
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index b720366..b98118e 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -12,11 +12,10 @@
#include "access/gist.h"
#include "access/stratnum.h"
+#include "cubedata.h"
#include "utils/array.h"
#include "utils/float.h"
-#include "cubedata.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index e432457..54b7bf9 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -34,8 +34,6 @@
#include <limits.h>
-#include "libpq-fe.h"
-
#include "access/htup_details.h"
#include "access/relation.h"
#include "access/reloptions.h"
@@ -50,6 +48,7 @@
#include "foreign/foreign.h"
#include "funcapi.h"
#include "lib/stringinfo.h"
+#include "libpq-fe.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "parser/scansup.h"
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index 6a885f2..e860f1e 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -6,9 +6,8 @@
#include "access/gist.h"
#include "access/stratnum.h"
#include "catalog/pg_type.h"
-#include "utils/pg_crc.h"
-
#include "hstore.h"
+#include "utils/pg_crc.h"
/* bigint defines */
#define BITBYTE 8
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
index 745497c..be3cce4 100644
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -8,6 +8,7 @@
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "hstore.h"
#include "lib/stringinfo.h"
#include "libpq/pqformat.h"
#include "utils/builtins.h"
@@ -18,8 +19,6 @@
#include "utils/memutils.h"
#include "utils/typcache.h"
-#include "hstore.h"
-
PG_MODULE_MAGIC;
/* old names for C functions */
diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index a3a8a91..c54071b 100644
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -6,12 +6,11 @@
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "hstore.h"
#include "utils/builtins.h"
#include "utils/hashutils.h"
#include "utils/memutils.h"
-#include "hstore.h"
-
/* old names for C functions */
HSTORE_POLLUTE(hstore_fetchval, fetchval);
HSTORE_POLLUTE(hstore_exists, exists);
diff --git a/contrib/hstore_plpython/hstore_plpython.c b/contrib/hstore_plpython/hstore_plpython.c
index 93705f0..4dee569 100644
--- a/contrib/hstore_plpython/hstore_plpython.c
+++ b/contrib/hstore_plpython/hstore_plpython.c
@@ -1,9 +1,9 @@
#include "postgres.h"
#include "fmgr.h"
-#include "plpython.h"
-#include "plpy_typeio.h"
#include "hstore/hstore.h"
+#include "plpy_typeio.h"
+#include "plpython.h"
PG_MODULE_MAGIC;
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 91e2a80..fd97690 100644
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -3,11 +3,10 @@
*/
#include "postgres.h"
+#include "_int.h"
#include "miscadmin.h"
#include "utils/builtins.h"
-#include "_int.h"
-
PG_FUNCTION_INFO_V1(bqarr_in);
PG_FUNCTION_INFO_V1(bqarr_out);
PG_FUNCTION_INFO_V1(boolop);
diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c
index 7aebfec..b7958d8 100644
--- a/contrib/intarray/_int_gin.c
+++ b/contrib/intarray/_int_gin.c
@@ -3,11 +3,10 @@
*/
#include "postgres.h"
+#include "_int.h"
#include "access/gin.h"
#include "access/stratnum.h"
-#include "_int.h"
-
PG_FUNCTION_INFO_V1(ginint4_queryextract);
Datum
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
index e5a8011..50effc3 100644
--- a/contrib/intarray/_int_gist.c
+++ b/contrib/intarray/_int_gist.c
@@ -5,11 +5,10 @@
#include <limits.h>
+#include "_int.h"
#include "access/gist.h"
#include "access/stratnum.h"
-#include "_int.h"
-
#define GETENTRY(vec,pos) ((ArrayType *) DatumGetPointer((vec)->vector[(pos)].key))
/*
diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c
index fe7fcc4..0e3dcb4 100644
--- a/contrib/intarray/_int_op.c
+++ b/contrib/intarray/_int_op.c
@@ -3,7 +3,6 @@
*/
#include "postgres.h"
-
#include "_int.h"
PG_MODULE_MAGIC;
diff --git a/contrib/intarray/_int_selfuncs.c b/contrib/intarray/_int_selfuncs.c
index aebffae..8fb05d1 100644
--- a/contrib/intarray/_int_selfuncs.c
+++ b/contrib/intarray/_int_selfuncs.c
@@ -13,17 +13,17 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "_int.h"
+#include "_int.h"
#include "access/htup_details.h"
#include "catalog/pg_operator.h"
#include "catalog/pg_statistic.h"
#include "catalog/pg_type.h"
+#include "miscadmin.h"
#include "utils/builtins.h"
+#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
#include "utils/syscache.h"
-#include "utils/lsyscache.h"
-#include "miscadmin.h"
PG_FUNCTION_INFO_V1(_int_overlap_sel);
PG_FUNCTION_INFO_V1(_int_contains_sel);
diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c
index fde8d15..efff81d 100644
--- a/contrib/intarray/_int_tool.c
+++ b/contrib/intarray/_int_tool.c
@@ -5,10 +5,8 @@
#include <limits.h>
-#include "catalog/pg_type.h"
-
#include "_int.h"
-
+#include "catalog/pg_type.h"
/* arguments are assumed sorted & unique-ified */
bool
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index 2a20abe..be51dac 100644
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -3,12 +3,11 @@
*/
#include "postgres.h"
+#include "_int.h"
#include "access/gist.h"
#include "access/stratnum.h"
#include "port/pg_bitutils.h"
-#include "_int.h"
-
#define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer((vec)->vector[(pos)].key))
/*
** _intbig methods
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 0c2cac7..f4d933c 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -14,15 +14,14 @@
#include "postgres.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
-
-#include "isn.h"
#include "EAN13.h"
#include "ISBN.h"
#include "ISMN.h"
#include "ISSN.h"
#include "UPC.h"
+#include "fmgr.h"
+#include "isn.h"
+#include "utils/builtins.h"
PG_MODULE_MAGIC;
diff --git a/contrib/jsonb_plperl/jsonb_plperl.c b/contrib/jsonb_plperl/jsonb_plperl.c
index 04b04df..4ae1353 100644
--- a/contrib/jsonb_plperl/jsonb_plperl.c
+++ b/contrib/jsonb_plperl/jsonb_plperl.c
@@ -5,8 +5,8 @@
#include "fmgr.h"
#include "plperl.h"
#include "plperl_helpers.h"
-#include "utils/jsonb.h"
#include "utils/fmgrprotos.h"
+#include "utils/jsonb.h"
PG_MODULE_MAGIC;
diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c
index 776cf7c..ecaa4c6 100644
--- a/contrib/jsonb_plpython/jsonb_plpython.c
+++ b/contrib/jsonb_plpython/jsonb_plpython.c
@@ -1,10 +1,10 @@
#include "postgres.h"
-#include "plpython.h"
#include "plpy_elog.h"
#include "plpy_typeio.h"
-#include "utils/jsonb.h"
+#include "plpython.h"
#include "utils/fmgrprotos.h"
+#include "utils/jsonb.h"
#include "utils/numeric.h"
PG_MODULE_MAGIC;
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index c33ac4e..6b14ed5 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -9,11 +9,9 @@
#include "access/gist.h"
#include "access/stratnum.h"
-#include "port/pg_bitutils.h"
-
#include "crc32.h"
#include "ltree.h"
-
+#include "port/pg_bitutils.h"
PG_FUNCTION_INFO_V1(_ltree_compress);
PG_FUNCTION_INFO_V1(_ltree_same);
diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c
index 447e4b2..0c3e459 100644
--- a/contrib/ltree/crc32.c
+++ b/contrib/ltree/crc32.c
@@ -16,8 +16,8 @@
#define TOLOWER(x) (x)
#endif
-#include "utils/pg_crc.h"
#include "crc32.h"
+#include "utils/pg_crc.h"
unsigned int
ltree_crc32_sz(char *buf, int size)
diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c
index 62172d5..fa47710 100644
--- a/contrib/ltree/lquery_op.c
+++ b/contrib/ltree/lquery_op.c
@@ -8,8 +8,8 @@
#include <ctype.h>
#include "catalog/pg_collation.h"
-#include "utils/formatting.h"
#include "ltree.h"
+#include "utils/formatting.h"
PG_FUNCTION_INFO_V1(ltq_regex);
PG_FUNCTION_INFO_V1(ltq_rregex);
diff --git a/contrib/ltree/ltree_io.c b/contrib/ltree/ltree_io.c
index f54f037..900a46a 100644
--- a/contrib/ltree/ltree_io.c
+++ b/contrib/ltree/ltree_io.c
@@ -7,9 +7,9 @@
#include <ctype.h>
+#include "crc32.h"
#include "ltree.h"
#include "utils/memutils.h"
-#include "crc32.h"
PG_FUNCTION_INFO_V1(ltree_in);
PG_FUNCTION_INFO_V1(ltree_out);
diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c
index df61c63..070868f 100644
--- a/contrib/ltree/ltree_op.c
+++ b/contrib/ltree/ltree_op.c
@@ -9,10 +9,10 @@
#include "access/htup_details.h"
#include "catalog/pg_statistic.h"
+#include "ltree.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
-#include "ltree.h"
PG_MODULE_MAGIC;
diff --git a/contrib/ltree_plpython/ltree_plpython.c b/contrib/ltree_plpython/ltree_plpython.c
index b254aa5..1570e77 100644
--- a/contrib/ltree_plpython/ltree_plpython.c
+++ b/contrib/ltree_plpython/ltree_plpython.c
@@ -1,8 +1,8 @@
#include "postgres.h"
#include "fmgr.h"
-#include "plpython.h"
#include "ltree/ltree.h"
+#include "plpython.h"
PG_MODULE_MAGIC;
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index fa1e795..9a3eac2 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -10,13 +10,11 @@
#include "postgres_fe.h"
#include "catalog/pg_class_d.h"
-
#include "common/logging.h"
#include "fe_utils/connect.h"
+#include "getopt_long.h"
#include "libpq-fe.h"
#include "pg_getopt.h"
-#include "getopt_long.h"
-
/* an extensible array to keep track of elements to show */
typedef struct
diff --git a/contrib/pageinspect/brinfuncs.c b/contrib/pageinspect/brinfuncs.c
index 04140ec..d0a12f1 100644
--- a/contrib/pageinspect/brinfuncs.c
+++ b/contrib/pageinspect/brinfuncs.c
@@ -9,24 +9,22 @@
*/
#include "postgres.h"
-#include "pageinspect.h"
-
-#include "access/htup_details.h"
#include "access/brin.h"
#include "access/brin_internal.h"
#include "access/brin_page.h"
#include "access/brin_revmap.h"
#include "access/brin_tuple.h"
+#include "access/htup_details.h"
#include "catalog/index.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "lib/stringinfo.h"
+#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
-#include "miscadmin.h"
-
PG_FUNCTION_INFO_V1(brin_page_type);
PG_FUNCTION_INFO_V1(brin_page_items);
diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
index 8d27c9b..78cdc69 100644
--- a/contrib/pageinspect/btreefuncs.c
+++ b/contrib/pageinspect/btreefuncs.c
@@ -27,19 +27,17 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/nbtree.h"
#include "access/relation.h"
#include "catalog/namespace.h"
#include "catalog/pg_am.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/builtins.h"
#include "utils/rel.h"
#include "utils/varlena.h"
-
PG_FUNCTION_INFO_V1(bt_metap);
PG_FUNCTION_INFO_V1(bt_page_items);
PG_FUNCTION_INFO_V1(bt_page_items_bytea);
diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c
index 4b3c596..8567a38 100644
--- a/contrib/pageinspect/fsmfuncs.c
+++ b/contrib/pageinspect/fsmfuncs.c
@@ -19,11 +19,10 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "funcapi.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "storage/fsm_internals.h"
#include "utils/builtins.h"
diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c
index 229f9f9..a2cd9ed 100644
--- a/contrib/pageinspect/ginfuncs.c
+++ b/contrib/pageinspect/ginfuncs.c
@@ -9,8 +9,6 @@
*/
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/gin.h"
#include "access/gin_private.h"
#include "access/htup_details.h"
@@ -18,6 +16,7 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/pageinspect/hashfuncs.c b/contrib/pageinspect/hashfuncs.c
index 9374c4a..bcc39a8 100644
--- a/contrib/pageinspect/hashfuncs.c
+++ b/contrib/pageinspect/hashfuncs.c
@@ -10,14 +10,13 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/hash.h"
#include "access/htup_details.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_am.h"
+#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
index 02e2ab9..8e69cb3 100644
--- a/contrib/pageinspect/heapfuncs.c
+++ b/contrib/pageinspect/heapfuncs.c
@@ -25,14 +25,13 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/htup_details.h"
#include "access/relation.h"
-#include "funcapi.h"
#include "catalog/pg_am_d.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "port/pg_bitutils.h"
#include "utils/array.h"
#include "utils/builtins.h"
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index f08f62f..ffb4418 100644
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -15,14 +15,13 @@
#include "postgres.h"
-#include "pageinspect.h"
-
#include "access/htup_details.h"
#include "access/relation.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "pageinspect.h"
#include "storage/bufmgr.h"
#include "storage/checksum.h"
#include "utils/builtins.h"
diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c
index c3fb5a9..6810cab 100644
--- a/contrib/passwordcheck/passwordcheck.c
+++ b/contrib/passwordcheck/passwordcheck.c
@@ -21,8 +21,8 @@
#endif
#include "commands/user.h"
-#include "libpq/crypt.h"
#include "fmgr.h"
+#include "libpq/crypt.h"
PG_MODULE_MAGIC;
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index 9fae146..c6beea7 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -30,9 +30,8 @@
#include <signal.h>
#include <sys/time.h>
-#include "pg_getopt.h"
-
#include "access/xlog_internal.h"
+#include "pg_getopt.h"
const char *progname;
diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c
index 1b9809b..4dbf0ff 100644
--- a/contrib/pg_trgm/trgm_gin.c
+++ b/contrib/pg_trgm/trgm_gin.c
@@ -3,12 +3,10 @@
*/
#include "postgres.h"
-#include "trgm.h"
-
#include "access/gin.h"
#include "access/stratnum.h"
#include "fmgr.h"
-
+#include "trgm.h"
PG_FUNCTION_INFO_V1(gin_extract_trgm);
PG_FUNCTION_INFO_V1(gin_extract_value_trgm);
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
index e79db8a..e022d0b 100644
--- a/contrib/pg_trgm/trgm_gist.c
+++ b/contrib/pg_trgm/trgm_gist.c
@@ -3,12 +3,10 @@
*/
#include "postgres.h"
-#include "trgm.h"
-
#include "access/stratnum.h"
#include "fmgr.h"
#include "port/pg_bitutils.h"
-
+#include "trgm.h"
typedef struct
{
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
index 0d4614e..4679efe 100644
--- a/contrib/pg_trgm/trgm_op.c
+++ b/contrib/pg_trgm/trgm_op.c
@@ -5,9 +5,8 @@
#include <ctype.h>
-#include "trgm.h"
-
#include "catalog/pg_type.h"
+#include "trgm.h"
#include "tsearch/ts_locale.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
diff --git a/contrib/pg_trgm/trgm_regexp.c b/contrib/pg_trgm/trgm_regexp.c
index 3ad5731..7965a29 100644
--- a/contrib/pg_trgm/trgm_regexp.c
+++ b/contrib/pg_trgm/trgm_regexp.c
@@ -191,14 +191,12 @@
*/
#include "postgres.h"
-#include "trgm.h"
-
#include "regex/regexport.h"
+#include "trgm.h"
#include "tsearch/ts_locale.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-
/*
* Uncomment (or use -DTRGM_REGEXP_DEBUG) to print debug info,
* for exploring and debugging the algorithm implementation.
diff --git a/contrib/pgcrypto/crypt-md5.c b/contrib/pgcrypto/crypt-md5.c
index 6a09d76..b6466d3 100644
--- a/contrib/pgcrypto/crypt-md5.c
+++ b/contrib/pgcrypto/crypt-md5.c
@@ -8,8 +8,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
+#include "px.h"
#define MD5_SIZE 16
diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
index db58408..a12d7b4 100644
--- a/contrib/pgcrypto/internal.c
+++ b/contrib/pgcrypto/internal.c
@@ -33,11 +33,11 @@
#include <time.h>
-#include "px.h"
-#include "md5.h"
-#include "sha1.h"
#include "blf.h"
+#include "md5.h"
+#include "px.h"
#include "rijndael.h"
+#include "sha1.h"
#ifndef MD5_DIGEST_LENGTH
#define MD5_DIGEST_LENGTH 16
diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c
index 73dbfbd..0467212 100644
--- a/contrib/pgcrypto/mbuf.c
+++ b/contrib/pgcrypto/mbuf.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
+#include "px.h"
#define STEP (16*1024)
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
index 7d686f3..3057afb 100644
--- a/contrib/pgcrypto/openssl.c
+++ b/contrib/pgcrypto/openssl.c
@@ -31,12 +31,11 @@
#include "postgres.h"
-#include "px.h"
-
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/rand.h>
+#include "px.h"
#include "utils/memutils.h"
#include "utils/resowner.h"
diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index f69ae10..f0ac625 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -34,13 +34,12 @@
#include <ctype.h>
#include "parser/scansup.h"
+#include "pgcrypto.h"
+#include "px-crypt.h"
+#include "px.h"
#include "utils/builtins.h"
#include "utils/uuid.h"
-#include "px.h"
-#include "px-crypt.h"
-#include "pgcrypto.h"
-
PG_MODULE_MAGIC;
/* private stuff */
diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c
index aa5b563..679779a 100644
--- a/contrib/pgcrypto/pgp-armor.c
+++ b/contrib/pgcrypto/pgp-armor.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* BASE64 - duplicated :(
diff --git a/contrib/pgcrypto/pgp-cfb.c b/contrib/pgcrypto/pgp-cfb.c
index 1d99915..8ae7c86 100644
--- a/contrib/pgcrypto/pgp-cfb.c
+++ b/contrib/pgcrypto/pgp-cfb.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
typedef int (*mix_data_t) (PGP_CFB *ctx, const uint8 *data, int len, uint8 *dst);
diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c
index 2adaf2c..0505bde 100644
--- a/contrib/pgcrypto/pgp-compress.c
+++ b/contrib/pgcrypto/pgp-compress.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
/*
* Compressed pkt writer
diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c
index 4c43eb7..3ecbf9c 100644
--- a/contrib/pgcrypto/pgp-decrypt.c
+++ b/contrib/pgcrypto/pgp-decrypt.c
@@ -31,9 +31,9 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
#define NO_CTX_SIZE 0
#define ALLOW_CTX_SIZE 1
diff --git a/contrib/pgcrypto/pgp-encrypt.c b/contrib/pgcrypto/pgp-encrypt.c
index 2938b4b..4651894 100644
--- a/contrib/pgcrypto/pgp-encrypt.c
+++ b/contrib/pgcrypto/pgp-encrypt.c
@@ -34,9 +34,8 @@
#include <time.h>
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
#define MDC_DIGEST_LEN 20
#define STREAM_ID 0xE0
diff --git a/contrib/pgcrypto/pgp-info.c b/contrib/pgcrypto/pgp-info.c
index 9bfbbe6..b2300ea 100644
--- a/contrib/pgcrypto/pgp-info.c
+++ b/contrib/pgcrypto/pgp-info.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
static int
read_pubkey_keyid(PullFilter *pkt, uint8 *keyid_buf)
diff --git a/contrib/pgcrypto/pgp-mpi-internal.c b/contrib/pgcrypto/pgp-mpi-internal.c
index c73f086..2353a48 100644
--- a/contrib/pgcrypto/pgp-mpi-internal.c
+++ b/contrib/pgcrypto/pgp-mpi-internal.c
@@ -31,9 +31,8 @@
#include "postgres.h"
#include "imath.h"
-
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static mpz_t *
mp_new()
diff --git a/contrib/pgcrypto/pgp-mpi-openssl.c b/contrib/pgcrypto/pgp-mpi-openssl.c
index afece26..75e4c8b 100644
--- a/contrib/pgcrypto/pgp-mpi-openssl.c
+++ b/contrib/pgcrypto/pgp-mpi-openssl.c
@@ -32,8 +32,8 @@
#include <openssl/bn.h>
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static BIGNUM *
mpi_to_bn(PGP_MPI *n)
diff --git a/contrib/pgcrypto/pgp-mpi.c b/contrib/pgcrypto/pgp-mpi.c
index 1da52ac..36a6d36 100644
--- a/contrib/pgcrypto/pgp-mpi.c
+++ b/contrib/pgcrypto/pgp-mpi.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
int
pgp_mpi_alloc(int bits, PGP_MPI **mpi)
diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c
index 3feadf7..8be895d 100644
--- a/contrib/pgcrypto/pgp-pgsql.c
+++ b/contrib/pgcrypto/pgp-pgsql.c
@@ -31,16 +31,15 @@
#include "postgres.h"
-#include "lib/stringinfo.h"
#include "catalog/pg_type.h"
-#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
-#include "utils/array.h"
#include "funcapi.h"
-
+#include "lib/stringinfo.h"
+#include "mb/pg_wchar.h"
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
/*
* public functions
diff --git a/contrib/pgcrypto/pgp-pubdec.c b/contrib/pgcrypto/pgp-pubdec.c
index b925ff8..a0a5738 100644
--- a/contrib/pgcrypto/pgp-pubdec.c
+++ b/contrib/pgcrypto/pgp-pubdec.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg = 02 || PS || 00 || M
diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c
index 08599f0..9fdcf7c 100644
--- a/contrib/pgcrypto/pgp-pubenc.c
+++ b/contrib/pgcrypto/pgp-pubenc.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg: 02 || non-zero pad bytes || 00 || msg
diff --git a/contrib/pgcrypto/pgp-pubkey.c b/contrib/pgcrypto/pgp-pubkey.c
index f898d72..d447e5f 100644
--- a/contrib/pgcrypto/pgp-pubkey.c
+++ b/contrib/pgcrypto/pgp-pubkey.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
int
pgp_key_alloc(PGP_PubKey **pk_p)
diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c
index 3f2f442..81ca1f0 100644
--- a/contrib/pgcrypto/pgp-s2k.c
+++ b/contrib/pgcrypto/pgp-s2k.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
static int
calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key,
diff --git a/contrib/pgcrypto/pgp.c b/contrib/pgcrypto/pgp.c
index dd8dae1..9b245fe 100644
--- a/contrib/pgcrypto/pgp.c
+++ b/contrib/pgcrypto/pgp.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* Defaults.
diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c
index 51be0b7..0913ff2 100644
--- a/contrib/pgcrypto/px-crypt.c
+++ b/contrib/pgcrypto/px-crypt.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
-
+#include "px.h"
static char *
run_crypt_des(const char *psw, const char *salt,
diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c
index 636c8d4..c17f244 100644
--- a/contrib/pgstattuple/pgstatapprox.c
+++ b/contrib/pgstattuple/pgstatapprox.c
@@ -13,12 +13,12 @@
#include "postgres.h"
#include "access/heapam.h"
+#include "access/htup_details.h"
+#include "access/multixact.h"
#include "access/relation.h"
#include "access/transam.h"
#include "access/visibilitymap.h"
#include "access/xact.h"
-#include "access/multixact.h"
-#include "access/htup_details.h"
#include "catalog/namespace.h"
#include "catalog/pg_am_d.h"
#include "commands/vacuum.h"
@@ -26,8 +26,8 @@
#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "storage/freespace.h"
-#include "storage/procarray.h"
#include "storage/lmgr.h"
+#include "storage/procarray.h"
#include "utils/builtins.h"
PG_FUNCTION_INFO_V1(pgstattuple_approx);
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index 57ed5f4..12f9dd3 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -12,21 +12,19 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/htup_details.h"
#include "access/xact.h"
#include "catalog/pg_user_mapping.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "postgres_fdw.h"
#include "storage/latch.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
-
/*
* Connection cache hash table entry
*
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c
index 431c34a..e803997 100644
--- a/contrib/postgres_fdw/deparse.c
+++ b/contrib/postgres_fdw/deparse.c
@@ -33,8 +33,6 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
@@ -52,13 +50,13 @@
#include "optimizer/prep.h"
#include "optimizer/tlist.h"
#include "parser/parsetree.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
-
/*
* Global context for foreign_expr_walker's search of an expression tree.
*/
diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
index 7ea68c3..da175a6 100644
--- a/contrib/postgres_fdw/option.c
+++ b/contrib/postgres_fdw/option.c
@@ -12,18 +12,16 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/reloptions.h"
#include "catalog/pg_foreign_server.h"
#include "catalog/pg_foreign_table.h"
#include "catalog/pg_user_mapping.h"
#include "commands/defrem.h"
#include "commands/extension.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/varlena.h"
-
/*
* Describes the valid options for objects that this wrapper uses.
*/
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 82d8140..3236664 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -12,8 +12,6 @@
*/
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
@@ -35,6 +33,7 @@
#include "optimizer/restrictinfo.h"
#include "optimizer/tlist.h"
#include "parser/parsetree.h"
+#include "postgres_fdw.h"
#include "utils/builtins.h"
#include "utils/float.h"
#include "utils/guc.h"
diff --git a/contrib/postgres_fdw/shippable.c b/contrib/postgres_fdw/shippable.c
index 2b55a40..14d6d09 100644
--- a/contrib/postgres_fdw/shippable.c
+++ b/contrib/postgres_fdw/shippable.c
@@ -23,15 +23,13 @@
#include "postgres.h"
-#include "postgres_fdw.h"
-
#include "access/transam.h"
#include "catalog/dependency.h"
+#include "postgres_fdw.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/syscache.h"
-
/* Hash table for caching the results of shippability lookups */
static HTAB *ShippableCacheHash = NULL;
diff --git a/contrib/sepgsql/database.c b/contrib/sepgsql/database.c
index 8edd3df..0190d38 100644
--- a/contrib/sepgsql/database.c
+++ b/contrib/sepgsql/database.c
@@ -15,14 +15,14 @@
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/dependency.h"
-#include "catalog/pg_database.h"
#include "catalog/indexing.h"
+#include "catalog/pg_database.h"
#include "commands/dbcommands.h"
#include "commands/seclabel.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/snapmgr.h"
-#include "sepgsql.h"
/*
* sepgsql_database_post_create
diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c
index 2892346..1419879 100644
--- a/contrib/sepgsql/dml.c
+++ b/contrib/sepgsql/dml.c
@@ -14,8 +14,8 @@
#include "access/sysattr.h"
#include "access/tupdesc.h"
#include "catalog/catalog.h"
-#include "catalog/heap.h"
#include "catalog/dependency.h"
+#include "catalog/heap.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_class.h"
#include "catalog/pg_inherits.h"
@@ -23,11 +23,10 @@
#include "commands/tablecmds.h"
#include "executor/executor.h"
#include "nodes/bitmapset.h"
+#include "sepgsql.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
/*
* fixup_whole_row_references
*
diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c
index ebfa441..992c70e 100644
--- a/contrib/sepgsql/hooks.c
+++ b/contrib/sepgsql/hooks.c
@@ -20,12 +20,11 @@
#include "executor/executor.h"
#include "fmgr.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "tcop/utility.h"
#include "utils/guc.h"
#include "utils/queryenvironment.h"
-#include "sepgsql.h"
-
PG_MODULE_MAGIC;
/*
diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c
index 63a2dd5..d2505f7 100644
--- a/contrib/sepgsql/label.c
+++ b/contrib/sepgsql/label.c
@@ -12,8 +12,8 @@
#include <selinux/label.h>
-#include "access/htup_details.h"
#include "access/genam.h"
+#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
#include "catalog/catalog.h"
@@ -29,6 +29,7 @@
#include "libpq/auth.h"
#include "libpq/libpq-be.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/guc.h"
@@ -36,8 +37,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "sepgsql.h"
-
/*
* Saved hook entries (if stacked)
*/
diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c
index aa12dbe..345a4c2 100644
--- a/contrib/sepgsql/proc.c
+++ b/contrib/sepgsql/proc.c
@@ -21,14 +21,13 @@
#include "catalog/pg_type.h"
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
/*
* sepgsql_proc_post_create
*
diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c
index 0615275..714cffe 100644
--- a/contrib/sepgsql/relation.c
+++ b/contrib/sepgsql/relation.c
@@ -14,23 +14,22 @@
#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/table.h"
-#include "catalog/indexing.h"
#include "catalog/dependency.h"
+#include "catalog/indexing.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_class.h"
#include "catalog/pg_namespace.h"
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
-#include "utils/fmgroids.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-#include "sepgsql.h"
-
static void sepgsql_index_modify(Oid indexOid);
/*
diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c
index 4c4a90f..92ef156 100644
--- a/contrib/sepgsql/schema.c
+++ b/contrib/sepgsql/schema.c
@@ -21,13 +21,12 @@
#include "commands/seclabel.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
+#include "sepgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/snapmgr.h"
-#include "sepgsql.h"
-
/*
* sepgsql_schema_post_create
*
diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c
index 60fcf99..8ce0bc6 100644
--- a/contrib/sepgsql/uavc.c
+++ b/contrib/sepgsql/uavc.c
@@ -14,13 +14,12 @@
#include "catalog/pg_proc.h"
#include "commands/seclabel.h"
+#include "sepgsql.h"
#include "storage/ipc.h"
#include "utils/guc.h"
#include "utils/hashutils.h"
#include "utils/memutils.h"
-#include "sepgsql.h"
-
/*
* avc_cache
*
diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c
index 70476f7..3eb7004 100644
--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@@ -17,8 +17,8 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com>
#include "access/htup_details.h"
#include "catalog/pg_type.h"
-#include "executor/spi.h"
#include "commands/trigger.h"
+#include "executor/spi.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index e31be80..256d52f 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -40,9 +40,8 @@
#include "funcapi.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
-#include "utils/builtins.h"
-
#include "tablefunc.h"
+#include "utils/builtins.h"
PG_MODULE_MAGIC;
diff --git a/contrib/tcn/tcn.c b/contrib/tcn/tcn.c
index 5355a64..4568768 100644
--- a/contrib/tcn/tcn.c
+++ b/contrib/tcn/tcn.c
@@ -16,9 +16,9 @@
#include "postgres.h"
#include "access/htup_details.h"
-#include "executor/spi.h"
#include "commands/async.h"
#include "commands/trigger.h"
+#include "executor/spi.h"
#include "lib/stringinfo.h"
#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index 533e2ce..55b42e3 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -22,12 +22,11 @@
#endif
#include "catalog/pg_class_d.h"
-
#include "common/logging.h"
#include "fe_utils/connect.h"
+#include "getopt_long.h"
#include "libpq-fe.h"
#include "pg_getopt.h"
-#include "getopt_long.h"
#define BUFSIZE 1024
--
1.8.3.1
0002-Make-the-order-of-the-header-file-includes-consisten.patchapplication/octet-stream; name=0002-Make-the-order-of-the-header-file-includes-consisten.patchDownload
From e4e22a43f2e31404b0cbd356cf4dcd001f960ae7 Mon Sep 17 00:00:00 2001
From: Amit Kapila <akapila@postgresql.org>
Date: Wed, 23 Oct 2019 09:38:53 +0530
Subject: [PATCH 2/2] Make the order of the header file includes consistent in
non-backend modules.
Similar to commit (insert_commitid), this commit makes the order of header
file inclusion consistent for non-backend modules. The later commits will
enforce similar rules in other parts of code.
In the passing, fix the case where we were using angle brackets (<>) for
the local module includes instead of quotes ("").
Author: Vignesh C
Reviewed-by: Amit Kapila
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
---
src/bin/pg_archivecleanup/pg_archivecleanup.c | 6 ++----
src/bin/pg_basebackup/pg_basebackup.c | 2 +-
src/bin/pg_basebackup/pg_receivewal.c | 6 ++----
src/bin/pg_basebackup/pg_recvlogical.c | 7 ++-----
src/bin/pg_basebackup/receivelog.c | 9 +++------
src/bin/pg_basebackup/streamutil.c | 6 ++----
src/bin/pg_basebackup/walmethods.c | 3 +--
src/bin/pg_config/pg_config.c | 2 +-
src/bin/pg_controldata/pg_controldata.c | 3 +--
src/bin/pg_dump/common.c | 8 +++-----
src/bin/pg_dump/parallel.c | 3 +--
src/bin/pg_dump/pg_backup_archiver.c | 7 +++----
src/bin/pg_dump/pg_backup_custom.c | 3 +--
src/bin/pg_dump/pg_backup_db.c | 16 +++++++---------
src/bin/pg_dump/pg_backup_directory.c | 8 ++++----
src/bin/pg_dump/pg_backup_null.c | 5 ++---
src/bin/pg_dump/pg_backup_tar.c | 14 +++++++-------
src/bin/pg_dump/pg_dump.c | 13 +++++--------
src/bin/pg_dump/pg_dump_sort.c | 3 +--
src/bin/pg_dump/pg_dumpall.c | 7 +++----
src/bin/pg_dump/pg_restore.c | 4 +---
src/bin/pg_resetwal/pg_resetwal.c | 7 +++----
src/bin/pg_rewind/datapagemap.c | 3 +--
src/bin/pg_rewind/fetch.c | 2 +-
src/bin/pg_rewind/filemap.c | 5 ++---
src/bin/pg_rewind/libpq_fetch.c | 7 +++----
src/bin/pg_rewind/parsexlog.c | 6 ++----
src/bin/pg_rewind/pg_rewind.c | 9 ++++-----
src/bin/pg_rewind/timeline.c | 3 +--
src/bin/pg_test_fsync/pg_test_fsync.c | 3 +--
src/bin/pg_upgrade/check.c | 1 -
src/bin/pg_upgrade/controldata.c | 4 ++--
src/bin/pg_upgrade/dump.c | 4 +---
src/bin/pg_upgrade/file.c | 13 ++++++-------
src/bin/pg_upgrade/function.c | 4 +---
src/bin/pg_upgrade/info.c | 4 +---
src/bin/pg_upgrade/option.c | 6 ++----
src/bin/pg_upgrade/parallel.c | 1 -
src/bin/pg_upgrade/pg_upgrade.c | 10 +++++-----
src/bin/pg_upgrade/relfilenode.c | 7 +++----
src/bin/pg_upgrade/server.c | 1 -
src/bin/pg_upgrade/util.c | 5 ++---
src/bin/pg_upgrade/version.c | 5 +----
src/bin/pg_waldump/compat.c | 2 +-
src/bin/pg_waldump/pg_waldump.c | 3 +--
src/bin/pgbench/pgbench.c | 15 ++++++++-------
src/bin/psql/common.c | 10 ++++------
src/bin/psql/copy.c | 10 ++++------
src/bin/psql/crosstabview.c | 3 +--
src/bin/psql/describe.c | 7 ++-----
src/bin/psql/help.c | 3 +--
src/bin/psql/input.c | 5 ++---
src/bin/psql/large_obj.c | 5 ++---
src/bin/psql/mainloop.c | 8 +++-----
src/bin/psql/prompt.c | 3 +--
src/bin/psql/startup.c | 10 +++-------
src/bin/psql/variables.c | 4 +---
src/common/f2s.c | 3 +--
src/fe_utils/print.c | 4 +---
src/fe_utils/recovery_gen.c | 3 +--
src/fe_utils/string_utils.c | 4 +---
src/interfaces/ecpg/compatlib/informix.c | 16 ++++++++--------
src/interfaces/ecpg/ecpglib/connect.c | 4 ++--
src/interfaces/ecpg/ecpglib/data.c | 10 +++++-----
src/interfaces/ecpg/ecpglib/descriptor.c | 5 ++---
src/interfaces/ecpg/ecpglib/error.c | 2 +-
src/interfaces/ecpg/ecpglib/execute.c | 17 ++++++++---------
src/interfaces/ecpg/ecpglib/memory.c | 4 ++--
src/interfaces/ecpg/ecpglib/misc.c | 11 ++++++-----
src/interfaces/ecpg/ecpglib/prepare.c | 4 ++--
src/interfaces/ecpg/ecpglib/sqlda.c | 9 ++++-----
src/interfaces/ecpg/ecpglib/typename.c | 5 ++---
src/interfaces/ecpg/pgtypeslib/common.c | 2 +-
src/interfaces/ecpg/pgtypeslib/datetime.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/dt_common.c | 2 +-
src/interfaces/ecpg/pgtypeslib/interval.c | 4 ++--
src/interfaces/ecpg/pgtypeslib/numeric.c | 5 +++--
src/interfaces/ecpg/pgtypeslib/timestamp.c | 5 ++---
src/interfaces/ecpg/preproc/c_keywords.c | 5 ++---
src/interfaces/ecpg/preproc/ecpg_keywords.c | 5 ++---
src/interfaces/libpq/fe-auth.c | 3 +--
src/interfaces/libpq/fe-connect.c | 16 +++++++---------
src/interfaces/libpq/fe-exec.c | 9 ++++-----
src/interfaces/libpq/fe-misc.c | 3 +--
src/interfaces/libpq/fe-protocol2.c | 8 +++-----
src/interfaces/libpq/fe-protocol3.c | 10 ++++------
src/interfaces/libpq/fe-secure-gssapi.c | 2 +-
src/interfaces/libpq/fe-secure.c | 8 ++++----
src/pl/plpgsql/src/pl_comp.c | 4 +---
src/pl/plpgsql/src/pl_exec.c | 4 +---
src/pl/plpgsql/src/pl_funcs.c | 4 +---
src/pl/plpgsql/src/pl_handler.c | 4 +---
src/port/pg_crc32c_armv8.c | 4 ++--
src/port/pg_crc32c_sse42.c | 4 ++--
src/port/tar.c | 4 +++-
src/test/isolation/isolationtester.c | 5 ++---
.../modules/test_ginpostinglist/test_ginpostinglist.c | 2 +-
src/test/modules/test_integerset/test_integerset.c | 6 +++---
src/test/modules/test_rls_hooks/test_rls_hooks.c | 7 ++-----
src/test/modules/test_shm_mq/setup.c | 3 +--
src/test/regress/pg_regress.c | 3 +--
src/test/regress/regress.c | 3 +--
102 files changed, 237 insertions(+), 345 deletions(-)
diff --git a/src/bin/pg_archivecleanup/pg_archivecleanup.c b/src/bin/pg_archivecleanup/pg_archivecleanup.c
index bb4257f..2917d7f 100644
--- a/src/bin/pg_archivecleanup/pg_archivecleanup.c
+++ b/src/bin/pg_archivecleanup/pg_archivecleanup.c
@@ -15,11 +15,9 @@
#include <signal.h>
#include <sys/time.h>
-#include "pg_getopt.h"
-
-#include "common/logging.h"
-
#include "access/xlog_internal.h"
+#include "common/logging.h"
+#include "pg_getopt.h"
const char *progname;
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 55ef139..a9d162a 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -35,9 +35,9 @@
#include "fe_utils/string_utils.h"
#include "getopt_long.h"
#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "pgtar.h"
#include "pgtime.h"
+#include "pqexpbuffer.h"
#include "receivelog.h"
#include "replication/basebackup.h"
#include "streamutil.h"
diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
index f39c133..c0c8747 100644
--- a/src/bin/pg_basebackup/pg_receivewal.c
+++ b/src/bin/pg_basebackup/pg_receivewal.c
@@ -19,16 +19,14 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/xlog_internal.h"
#include "common/file_perm.h"
#include "common/logging.h"
-#include "libpq-fe.h"
-#include "access/xlog_internal.h"
#include "getopt_long.h"
-
+#include "libpq-fe.h"
#include "receivelog.h"
#include "streamutil.h"
-
/* Time to sleep between reconnection attempts */
#define RECONNECT_SLEEP_TIME 5
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index af29dd7..12a3505 100644
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -19,18 +19,15 @@
#include <sys/select.h>
#endif
-/* local includes */
-#include "streamutil.h"
-
#include "access/xlog_internal.h"
-#include "common/file_perm.h"
#include "common/fe_memutils.h"
+#include "common/file_perm.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "libpq/pqsignal.h"
#include "pqexpbuffer.h"
-
+#include "streamutil.h"
/* Time to sleep between reconnection attempts */
#define RECONNECT_SLEEP_TIME 5
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
index d73f614..82fd9af 100644
--- a/src/bin/pg_basebackup/receivelog.c
+++ b/src/bin/pg_basebackup/receivelog.c
@@ -20,15 +20,12 @@
#include <sys/select.h>
#endif
-/* local includes */
-#include "receivelog.h"
-#include "streamutil.h"
-
-#include "libpq-fe.h"
#include "access/xlog_internal.h"
#include "common/file_utils.h"
#include "common/logging.h"
-
+#include "libpq-fe.h"
+#include "receivelog.h"
+#include "streamutil.h"
/* fd and filename for currently open WAL file */
static Walfile *walfile = NULL;
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
index 8d8ac11..94d1a12 100644
--- a/src/bin/pg_basebackup/streamutil.c
+++ b/src/bin/pg_basebackup/streamutil.c
@@ -17,10 +17,6 @@
#include <sys/time.h>
#include <unistd.h>
-/* local includes */
-#include "receivelog.h"
-#include "streamutil.h"
-
#include "access/xlog_internal.h"
#include "common/fe_memutils.h"
#include "common/file_perm.h"
@@ -29,6 +25,8 @@
#include "fe_utils/connect.h"
#include "port/pg_bswap.h"
#include "pqexpbuffer.h"
+#include "receivelog.h"
+#include "streamutil.h"
#define ERRCODE_DUPLICATE_OBJECT "42710"
diff --git a/src/bin/pg_basebackup/walmethods.c b/src/bin/pg_basebackup/walmethods.c
index 8ec12e6..d4d15b3 100644
--- a/src/bin/pg_basebackup/walmethods.c
+++ b/src/bin/pg_basebackup/walmethods.c
@@ -21,10 +21,9 @@
#include <zlib.h>
#endif
-#include "pgtar.h"
#include "common/file_perm.h"
#include "common/file_utils.h"
-
+#include "pgtar.h"
#include "receivelog.h"
#include "streamutil.h"
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 5279e7f..a1da918 100644
--- a/src/bin/pg_config/pg_config.c
+++ b/src/bin/pg_config/pg_config.c
@@ -24,8 +24,8 @@
#include "postgres_fe.h"
-#include "port.h"
#include "common/config_info.h"
+#include "port.h"
static const char *progname;
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index ff17804..b14767f 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -26,9 +26,8 @@
#include "catalog/pg_control.h"
#include "common/controldata_utils.h"
#include "common/logging.h"
-#include "pg_getopt.h"
#include "getopt_long.h"
-
+#include "pg_getopt.h"
static void
usage(const char *progname)
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 3549f7b..37432a6 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -15,15 +15,13 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_utils.h"
-#include "pg_dump.h"
-
#include <ctype.h>
#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"
-
+#include "pg_backup_archiver.h"
+#include "pg_backup_utils.h"
+#include "pg_dump.h"
/*
* Variables for mapping DumpId to DumpableObject
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index 03479f1..24239fa 100644
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -61,10 +61,9 @@
#include <sys/select.h>
#endif
+#include "fe_utils/string_utils.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-
-#include "fe_utils/string_utils.h"
#include "port/pg_bswap.h"
/* Mnemonic macros for indexing the fd array returned by pipe(2) */
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 6c739ce..d051f26 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -30,14 +30,13 @@
#include <io.h>
#endif
+#include "dumputils.h"
+#include "fe_utils/string_utils.h"
+#include "libpq/libpq-fs.h"
#include "parallel.h"
#include "pg_backup_archiver.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
-#include "dumputils.h"
-#include "fe_utils/string_utils.h"
-
-#include "libpq/libpq-fs.h"
#define TEXT_DUMP_HEADER "--\n-- PostgreSQL database dump\n--\n\n"
#define TEXT_DUMPALL_HEADER "--\n-- PostgreSQL database cluster dump\n--\n\n"
diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index 497b81b..fc742f5 100644
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -25,11 +25,10 @@
*/
#include "postgres_fe.h"
+#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-#include "common/file_utils.h"
-
/*--------
* Routines in the format interface
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index ee822c5..6dba7e1 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -11,21 +11,19 @@
*/
#include "postgres_fe.h"
-#include "fe_utils/connect.h"
-#include "fe_utils/string_utils.h"
-
-#include "dumputils.h"
-#include "parallel.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_db.h"
-#include "pg_backup_utils.h"
-
#include <unistd.h>
#include <ctype.h>
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
+#include "dumputils.h"
+#include "fe_utils/connect.h"
+#include "fe_utils/string_utils.h"
+#include "parallel.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_db.h"
+#include "pg_backup_utils.h"
static void _check_database_version(ArchiveHandle *AH);
static PGconn *_connectDB(ArchiveHandle *AH, const char *newdbname, const char *newUser);
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index e1afecf..aa00bca 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -34,13 +34,13 @@
*/
#include "postgres_fe.h"
+#include <dirent.h>
+#include <sys/stat.h>
+
+#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-#include "common/file_utils.h"
-
-#include <dirent.h>
-#include <sys/stat.h>
typedef struct
{
diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c
index 32c911a..c62f943 100644
--- a/src/bin/pg_dump/pg_backup_null.c
+++ b/src/bin/pg_dump/pg_backup_null.c
@@ -23,11 +23,10 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_utils.h"
#include "fe_utils/string_utils.h"
-
#include "libpq/libpq-fs.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_utils.h"
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
static void _WriteBlobData(ArchiveHandle *AH, const void *data, size_t dLen);
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index dead8fc..fd74835 100644
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -29,18 +29,18 @@
*/
#include "postgres_fe.h"
-#include "pg_backup_archiver.h"
-#include "pg_backup_tar.h"
-#include "pg_backup_utils.h"
-#include "pgtar.h"
-#include "common/file_utils.h"
-#include "fe_utils/string_utils.h"
-
#include <sys/stat.h>
#include <ctype.h>
#include <limits.h>
#include <unistd.h>
+#include "common/file_utils.h"
+#include "fe_utils/string_utils.h"
+#include "pg_backup_archiver.h"
+#include "pg_backup_tar.h"
+#include "pg_backup_utils.h"
+#include "pgtar.h"
+
static void _ArchiveEntry(ArchiveHandle *AH, TocEntry *te);
static void _StartData(ArchiveHandle *AH, TocEntry *te);
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 2a087d7..bf69adc 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -38,8 +38,6 @@
#include <termios.h>
#endif
-#include "getopt_long.h"
-
#include "access/attnum.h"
#include "access/sysattr.h"
#include "access/transam.h"
@@ -54,17 +52,16 @@
#include "catalog/pg_proc_d.h"
#include "catalog/pg_trigger_d.h"
#include "catalog/pg_type_d.h"
-#include "libpq/libpq-fs.h"
-#include "storage/block.h"
-
#include "dumputils.h"
+#include "fe_utils/connect.h"
+#include "fe_utils/string_utils.h"
+#include "getopt_long.h"
+#include "libpq/libpq-fs.h"
#include "parallel.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"
-#include "fe_utils/connect.h"
-#include "fe_utils/string_utils.h"
-
+#include "storage/block.h"
typedef struct
{
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 31fc06a..ad01316 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -15,12 +15,11 @@
*/
#include "postgres_fe.h"
+#include "catalog/pg_class_d.h"
#include "pg_backup_archiver.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"
-#include "catalog/pg_class_d.h"
-
/*
* Sort priority for database object types.
* Objects are sorted by type, and within a type by name.
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 0981efc..1442ea9 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -18,14 +18,13 @@
#include <time.h>
#include <unistd.h>
-#include "getopt_long.h"
-
-#include "dumputils.h"
-#include "pg_backup.h"
#include "common/file_utils.h"
#include "common/logging.h"
+#include "dumputils.h"
#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"
+#include "getopt_long.h"
+#include "pg_backup.h"
/* version string we expect back from pg_dump */
#define PGDUMP_VERSIONSTR "pg_dump (PostgreSQL) " PG_VERSION "\n"
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 40a6b37..d1a36b1 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -45,13 +45,11 @@
#include <termios.h>
#endif
-#include "getopt_long.h"
-
#include "dumputils.h"
+#include "getopt_long.h"
#include "parallel.h"
#include "pg_backup_utils.h"
-
static void usage(const char *progname);
int
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index f85ea2d..c83f865 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -44,9 +44,9 @@
#include <time.h>
#include <unistd.h>
-#include "access/transam.h"
#include "access/heaptoast.h"
#include "access/multixact.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlog_internal.h"
#include "common/controldata_utils.h"
@@ -55,10 +55,9 @@
#include "common/logging.h"
#include "common/restricted_token.h"
#include "common/string.h"
-#include "storage/large_object.h"
-#include "pg_getopt.h"
#include "getopt_long.h"
-
+#include "pg_getopt.h"
+#include "storage/large_object.h"
static ControlFileData ControlFile; /* pg_control values */
static XLogSegNo newXlogSegNo; /* new XLOG segment # */
diff --git a/src/bin/pg_rewind/datapagemap.c b/src/bin/pg_rewind/datapagemap.c
index 93165f6..c903dbb 100644
--- a/src/bin/pg_rewind/datapagemap.c
+++ b/src/bin/pg_rewind/datapagemap.c
@@ -12,9 +12,8 @@
#include "postgres_fe.h"
-#include "datapagemap.h"
-
#include "common/logging.h"
+#include "datapagemap.h"
struct datapagemap_iterator
{
diff --git a/src/bin/pg_rewind/fetch.c b/src/bin/pg_rewind/fetch.c
index 03a5fd6..294c72c 100644
--- a/src/bin/pg_rewind/fetch.c
+++ b/src/bin/pg_rewind/fetch.c
@@ -19,10 +19,10 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "pg_rewind.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
+#include "pg_rewind.h"
void
fetchSourceFileList(void)
diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c
index 601f7e9..21254f3 100644
--- a/src/bin/pg_rewind/filemap.c
+++ b/src/bin/pg_rewind/filemap.c
@@ -13,12 +13,11 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "catalog/pg_tablespace_d.h"
+#include "common/string.h"
#include "datapagemap.h"
#include "filemap.h"
#include "pg_rewind.h"
-
-#include "common/string.h"
-#include "catalog/pg_tablespace_d.h"
#include "storage/fd.h"
filemap_t *filemap = NULL;
diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c
index f4ebf7d..2cc87e8 100644
--- a/src/bin/pg_rewind/libpq_fetch.c
+++ b/src/bin/pg_rewind/libpq_fetch.c
@@ -14,14 +14,13 @@
#include <fcntl.h>
#include <unistd.h>
-#include "pg_rewind.h"
+#include "catalog/pg_type_d.h"
#include "datapagemap.h"
+#include "fe_utils/connect.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
-
-#include "catalog/pg_type_d.h"
-#include "fe_utils/connect.h"
+#include "pg_rewind.h"
#include "port/pg_bswap.h"
PGconn *conn = NULL;
diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c
index 264a8f4..1d03375 100644
--- a/src/bin/pg_rewind/parsexlog.c
+++ b/src/bin/pg_rewind/parsexlog.c
@@ -13,16 +13,14 @@
#include <unistd.h>
-#include "pg_rewind.h"
-#include "filemap.h"
-
#include "access/rmgr.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "catalog/pg_control.h"
#include "catalog/storage_xlog.h"
#include "commands/dbcommands_xlog.h"
-
+#include "filemap.h"
+#include "pg_rewind.h"
/*
* RmgrNames is an array of resource manager names, to make error messages
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 875a43b..e75c7ee 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -14,11 +14,6 @@
#include <time.h>
#include <unistd.h>
-#include "pg_rewind.h"
-#include "fetch.h"
-#include "file_ops.h"
-#include "filemap.h"
-
#include "access/timeline.h"
#include "access/xlog_internal.h"
#include "catalog/catversion.h"
@@ -28,7 +23,11 @@
#include "common/file_utils.h"
#include "common/restricted_token.h"
#include "fe_utils/recovery_gen.h"
+#include "fetch.h"
+#include "file_ops.h"
+#include "filemap.h"
#include "getopt_long.h"
+#include "pg_rewind.h"
#include "storage/bufpage.h"
static void usage(const char *progname);
diff --git a/src/bin/pg_rewind/timeline.c b/src/bin/pg_rewind/timeline.c
index 987452c..a29b56b 100644
--- a/src/bin/pg_rewind/timeline.c
+++ b/src/bin/pg_rewind/timeline.c
@@ -9,10 +9,9 @@
*/
#include "postgres_fe.h"
-#include "pg_rewind.h"
-
#include "access/timeline.h"
#include "access/xlog_internal.h"
+#include "pg_rewind.h"
/*
* This is copy-pasted from the backend readTimeLineHistory, modified to
diff --git a/src/bin/pg_test_fsync/pg_test_fsync.c b/src/bin/pg_test_fsync/pg_test_fsync.c
index 225557e..2ca1608 100644
--- a/src/bin/pg_test_fsync/pg_test_fsync.c
+++ b/src/bin/pg_test_fsync/pg_test_fsync.c
@@ -12,10 +12,9 @@
#include <unistd.h>
#include <signal.h>
-#include "getopt_long.h"
#include "access/xlogdefs.h"
#include "common/logging.h"
-
+#include "getopt_long.h"
/*
* put the temp files in the local directory
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 87b9d32..ff7057d 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -14,7 +14,6 @@
#include "mb/pg_wchar.h"
#include "pg_upgrade.h"
-
static void check_new_cluster_is_empty(void);
static void check_databases_are_compatible(void);
static void check_locale_and_encoding(DbInfo *olddb, DbInfo *newdb);
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 3823641..93f3c34 100644
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -9,10 +9,10 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include <ctype.h>
+#include "pg_upgrade.h"
+
/*
* get_control_data()
*
diff --git a/src/bin/pg_upgrade/dump.c b/src/bin/pg_upgrade/dump.c
index c1429fe..bdb5006 100644
--- a/src/bin/pg_upgrade/dump.c
+++ b/src/bin/pg_upgrade/dump.c
@@ -9,10 +9,8 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "fe_utils/string_utils.h"
-
+#include "pg_upgrade.h"
void
generate_old_dump(void)
diff --git a/src/bin/pg_upgrade/file.c b/src/bin/pg_upgrade/file.c
index c7fed24..ab64d5f 100644
--- a/src/bin/pg_upgrade/file.c
+++ b/src/bin/pg_upgrade/file.c
@@ -9,13 +9,6 @@
#include "postgres_fe.h"
-#include "access/visibilitymap.h"
-#include "common/file_perm.h"
-#include "pg_upgrade.h"
-#include "storage/bufpage.h"
-#include "storage/checksum.h"
-#include "storage/checksum_impl.h"
-
#include <sys/stat.h>
#include <fcntl.h>
#ifdef HAVE_COPYFILE_H
@@ -26,6 +19,12 @@
#include <linux/fs.h>
#endif
+#include "access/visibilitymap.h"
+#include "common/file_perm.h"
+#include "pg_upgrade.h"
+#include "storage/bufpage.h"
+#include "storage/checksum.h"
+#include "storage/checksum_impl.h"
#ifdef WIN32
static int win32_pghardlink(const char *src, const char *dst);
diff --git a/src/bin/pg_upgrade/function.c b/src/bin/pg_upgrade/function.c
index 3cbaab6..ac984db 100644
--- a/src/bin/pg_upgrade/function.c
+++ b/src/bin/pg_upgrade/function.c
@@ -9,11 +9,9 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "access/transam.h"
#include "catalog/pg_language_d.h"
-
+#include "pg_upgrade.h"
/*
* qsort comparator for pointers to library names
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 5c7b433..d67d3a4 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -9,11 +9,9 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "access/transam.h"
#include "catalog/pg_class_d.h"
-
+#include "pg_upgrade.h"
static void create_rel_filename_map(const char *old_data, const char *new_data,
const DbInfo *old_db, const DbInfo *new_db,
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index da9e1da..14351e8 100644
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -14,12 +14,10 @@
#include <io.h>
#endif
-#include "getopt_long.h"
#include "common/string.h"
-#include "utils/pidfile.h"
-
+#include "getopt_long.h"
#include "pg_upgrade.h"
-
+#include "utils/pidfile.h"
static void usage(void);
static void check_required_directory(char **dirpath,
diff --git a/src/bin/pg_upgrade/parallel.c b/src/bin/pg_upgrade/parallel.c
index 80ab1b8..d3d3401 100644
--- a/src/bin/pg_upgrade/parallel.c
+++ b/src/bin/pg_upgrade/parallel.c
@@ -16,7 +16,6 @@
#include "pg_upgrade.h"
-
static int parallel_jobs;
#ifdef WIN32
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index 5b82e0c..5154a71 100644
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -37,16 +37,16 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
#include "catalog/pg_class_d.h"
#include "common/file_perm.h"
#include "common/logging.h"
#include "common/restricted_token.h"
#include "fe_utils/string_utils.h"
-
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
+#include "pg_upgrade.h"
static void prepare_new_cluster(void);
static void prepare_new_globals(void);
diff --git a/src/bin/pg_upgrade/relfilenode.c b/src/bin/pg_upgrade/relfilenode.c
index 0c78073..f9d0812 100644
--- a/src/bin/pg_upgrade/relfilenode.c
+++ b/src/bin/pg_upgrade/relfilenode.c
@@ -9,12 +9,11 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include <sys/stat.h>
-#include "catalog/pg_class_d.h"
-#include "access/transam.h"
+#include "access/transam.h"
+#include "catalog/pg_class_d.h"
+#include "pg_upgrade.h"
static void transfer_single_new_db(FileNameMap *maps, int size, char *old_tablespace);
static void transfer_relfile(FileNameMap *map, const char *suffix, bool vm_must_add_frozenbit);
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index 6ad4b14..30f28bd 100644
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -13,7 +13,6 @@
#include "fe_utils/string_utils.h"
#include "pg_upgrade.h"
-
static PGconn *get_db_conn(ClusterInfo *cluster, const char *db_name);
diff --git a/src/bin/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c
index d867995..46d0bb4 100644
--- a/src/bin/pg_upgrade/util.c
+++ b/src/bin/pg_upgrade/util.c
@@ -9,11 +9,10 @@
#include "postgres_fe.h"
-#include "common/username.h"
-#include "pg_upgrade.h"
-
#include <signal.h>
+#include "common/username.h"
+#include "pg_upgrade.h"
LogOpts log_opts;
diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index b64171d..3e6d6b0 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -9,12 +9,9 @@
#include "postgres_fe.h"
-#include "pg_upgrade.h"
-
#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"
-
-
+#include "pg_upgrade.h"
/*
* new_9_0_populate_pg_largeobject_metadata()
diff --git a/src/bin/pg_waldump/compat.c b/src/bin/pg_waldump/compat.c
index 0e0dca7..7b389a2 100644
--- a/src/bin/pg_waldump/compat.c
+++ b/src/bin/pg_waldump/compat.c
@@ -20,8 +20,8 @@
#include <time.h>
-#include "utils/datetime.h"
#include "lib/stringinfo.h"
+#include "utils/datetime.h"
/* copied from timestamp.c */
pg_time_t
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index b79208c..8e54d7f 100644
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -16,16 +16,15 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-#include "access/xlog_internal.h"
#include "access/transam.h"
#include "common/fe_memutils.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "rmgrdesc.h"
-
static const char *progname;
static int WalSegSz;
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index e72ad00..03bcd22 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -32,12 +32,6 @@
#endif
#include "postgres_fe.h"
-#include "common/int.h"
-#include "common/logging.h"
-#include "fe_utils/conditional.h"
-#include "getopt_long.h"
-#include "libpq-fe.h"
-#include "portability/instr_time.h"
#include <ctype.h>
#include <float.h>
@@ -63,11 +57,18 @@
#endif
#endif
+#include "common/int.h"
+#include "common/logging.h"
+#include "fe_utils/conditional.h"
+#include "getopt_long.h"
+#include "libpq-fe.h"
+#include "pgbench.h"
+#include "portability/instr_time.h"
+
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
-#include "pgbench.h"
#define ERRCODE_UNDEFINED_TABLE "42P01"
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 4b26793..90f6380 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -18,18 +18,16 @@
#include <win32.h>
#endif
-#include "common/logging.h"
-#include "fe_utils/mbprint.h"
-#include "fe_utils/string_utils.h"
-#include "portability/instr_time.h"
-
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "copy.h"
#include "crosstabview.h"
+#include "fe_utils/mbprint.h"
+#include "fe_utils/string_utils.h"
+#include "portability/instr_time.h"
#include "settings.h"
-
static bool DescribeQuery(const char *query, double *elapsed_msec);
static bool ExecQueryUsingCursor(const char *query, double *elapsed_msec);
static bool command_no_begin(const char *query);
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index f9e53d6..04e518e 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -6,7 +6,6 @@
* src/bin/psql/copy.c
*/
#include "postgres_fe.h"
-#include "copy.h"
#include <signal.h>
#include <sys/stat.h>
@@ -16,16 +15,15 @@
#include <io.h> /* I think */
#endif
+#include "common.h"
+#include "common/logging.h"
+#include "copy.h"
#include "libpq-fe.h"
#include "pqexpbuffer.h"
-
-#include "settings.h"
-#include "common.h"
#include "prompt.h"
+#include "settings.h"
#include "stringutils.h"
-#include "common/logging.h"
-
/*
* parse_slash_copy
* -- parses \copy command line
diff --git a/src/bin/psql/crosstabview.c b/src/bin/psql/crosstabview.c
index 83789cb..701ef34 100644
--- a/src/bin/psql/crosstabview.c
+++ b/src/bin/psql/crosstabview.c
@@ -8,13 +8,12 @@
#include "postgres_fe.h"
#include "common.h"
+#include "common/logging.h"
#include "crosstabview.h"
#include "pqexpbuffer.h"
#include "psqlscanslash.h"
#include "settings.h"
-#include "common/logging.h"
-
/*
* Value/position from the resultset that goes into the horizontal or vertical
* crosstabview header.
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index d7c0fc0..b3b9313 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -18,18 +18,15 @@
#include "catalog/pg_cast_d.h"
#include "catalog/pg_class_d.h"
#include "catalog/pg_default_acl_d.h"
-
+#include "common.h"
#include "common/logging.h"
+#include "describe.h"
#include "fe_utils/mbprint.h"
#include "fe_utils/print.h"
#include "fe_utils/string_utils.h"
-
-#include "common.h"
-#include "describe.h"
#include "settings.h"
#include "variables.h"
-
static bool describeOneTableDetails(const char *schemaname,
const char *relationname,
const char *oid,
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 59ea8cc..0f58eeb 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -21,10 +21,9 @@
#include <termios.h>
#endif
+#include "common.h"
#include "common/logging.h"
#include "common/username.h"
-
-#include "common.h"
#include "help.h"
#include "input.h"
#include "settings.h"
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 5a18ac9..5798e6e 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -13,12 +13,11 @@
#include <fcntl.h>
#include <limits.h>
+#include "common.h"
+#include "common/logging.h"
#include "input.h"
#include "settings.h"
#include "tab-complete.h"
-#include "common.h"
-
-#include "common/logging.h"
#ifndef WIN32
#define PSQLHISTORY ".psql_history"
diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c
index 2713f15..042403e 100644
--- a/src/bin/psql/large_obj.c
+++ b/src/bin/psql/large_obj.c
@@ -6,12 +6,11 @@
* src/bin/psql/large_obj.c
*/
#include "postgres_fe.h"
-#include "large_obj.h"
-#include "settings.h"
#include "common.h"
-
#include "common/logging.h"
+#include "large_obj.h"
+#include "settings.h"
static void print_lo_result(const char *fmt,...) pg_attribute_printf(1, 2);
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index e386d98..b3a8407 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -6,18 +6,16 @@
* src/bin/psql/mainloop.c
*/
#include "postgres_fe.h"
-#include "mainloop.h"
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "input.h"
+#include "mainloop.h"
+#include "mb/pg_wchar.h"
#include "prompt.h"
#include "settings.h"
-#include "common/logging.h"
-#include "mb/pg_wchar.h"
-
-
/* callback functions for our flex lexer */
const PsqlScanCallbacks psqlscan_callbacks = {
psql_get_variable,
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index 0fcb8c7..195192a 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -18,12 +18,11 @@
#endif
#include "common.h"
+#include "common/string.h"
#include "input.h"
#include "prompt.h"
#include "settings.h"
-#include "common/string.h"
-
/*--------------------------
* get_prompt
*
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index e4c0a7e..0d941ef 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -14,21 +14,17 @@
#include <win32.h>
#endif /* WIN32 */
-#include "getopt_long.h"
-
-#include "common/logging.h"
-#include "fe_utils/print.h"
-
#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "describe.h"
+#include "fe_utils/print.h"
+#include "getopt_long.h"
#include "help.h"
#include "input.h"
#include "mainloop.h"
#include "settings.h"
-
-
/*
* Global psql options
*/
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index 1d2a31c..3f7b641 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -8,10 +8,8 @@
#include "postgres_fe.h"
#include "common.h"
-#include "variables.h"
-
#include "common/logging.h"
-
+#include "variables.h"
/*
* Check whether a variable's name is allowed.
diff --git a/src/common/f2s.c b/src/common/f2s.c
index e332557..ea5ca8d 100644
--- a/src/common/f2s.c
+++ b/src/common/f2s.c
@@ -39,9 +39,8 @@
#endif
#include "common/shortest_dec.h"
-
-#include "ryu_common.h"
#include "digit_table.h"
+#include "ryu_common.h"
#define FLOAT_MANTISSA_BITS 23
#define FLOAT_EXPONENT_BITS 8
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index e41f42e..1f8bde8 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -30,11 +30,9 @@
#include <termios.h>
#endif
-#include "fe_utils/print.h"
-
#include "catalog/pg_type_d.h"
#include "fe_utils/mbprint.h"
-
+#include "fe_utils/print.h"
/*
* If the calling program doesn't have any mechanism for setting
diff --git a/src/fe_utils/recovery_gen.c b/src/fe_utils/recovery_gen.c
index 6641f95..aec01c0 100644
--- a/src/fe_utils/recovery_gen.c
+++ b/src/fe_utils/recovery_gen.c
@@ -10,9 +10,8 @@
#include "postgres_fe.h"
#include "common/logging.h"
-#include "fe_utils/string_utils.h"
#include "fe_utils/recovery_gen.h"
-
+#include "fe_utils/string_utils.h"
static char *escape_quotes(const char *src);
diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c
index 8c3a603..b07f142 100644
--- a/src/fe_utils/string_utils.c
+++ b/src/fe_utils/string_utils.c
@@ -17,10 +17,8 @@
#include <ctype.h>
-#include "fe_utils/string_utils.h"
-
#include "common/keywords.h"
-
+#include "fe_utils/string_utils.h"
static PQExpBuffer defaultGetLocalPQExpBuffer(void);
diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
index 6ef1fad..bbaf450 100644
--- a/src/interfaces/ecpg/compatlib/informix.c
+++ b/src/interfaces/ecpg/compatlib/informix.c
@@ -7,14 +7,14 @@
#include <ctype.h>
#include <limits.h>
-#include <ecpgtype.h>
-#include <ecpg_informix.h>
-#include <pgtypes_error.h>
-#include <pgtypes_date.h>
-#include <pgtypes_numeric.h>
-#include <sqltypes.h>
-#include <sqlca.h>
-#include <ecpgerrno.h>
+#include "ecpg_informix.h"
+#include "ecpgerrno.h"
+#include "ecpgtype.h"
+#include "pgtypes_date.h"
+#include "pgtypes_error.h"
+#include "pgtypes_numeric.h"
+#include "sqlca.h"
+#include "sqltypes.h"
/* this is also defined in ecpglib/misc.c, by defining it twice we don't have to export the symbol */
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
index b4f6089..1cb5211 100644
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -4,10 +4,10 @@
#include "postgres_fe.h"
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#ifdef ENABLE_THREAD_SAFETY
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 81f94cc..7d2a78a 100644
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -5,15 +5,15 @@
#include <math.h>
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
+#include "sqlca.h"
/* returns true if character c is a delimiter for the given array type */
static bool
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index ef500a9..ead8778 100644
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -7,12 +7,11 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#include "sqlda.h"
#include "sql3types.h"
diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c
index 9c56991..a4e3c0d 100644
--- a/src/interfaces/ecpg/ecpglib/error.c
+++ b/src/interfaces/ecpg/ecpglib/error.c
@@ -4,9 +4,9 @@
#include "postgres_fe.h"
#include "ecpgerrno.h"
-#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
void
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 7c9cb76..23cc869 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -19,19 +19,18 @@
#include <math.h>
#include "catalog/pg_type_d.h"
-
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "sqlda-native.h"
-#include "sqlda-compat.h"
-#include "sql3types.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
+#include "sql3types.h"
+#include "sqlca.h"
+#include "sqlda-compat.h"
+#include "sqlda-native.h"
/*
* This function returns a newly malloced string that has ' and \
diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c
index 52ca1c5..bd81251 100644
--- a/src/interfaces/ecpg/ecpglib/memory.c
+++ b/src/interfaces/ecpg/ecpglib/memory.c
@@ -4,10 +4,10 @@
#include "postgres_fe.h"
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
void
ecpg_free(void *ptr)
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index 2eec54a..647da14 100644
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -5,17 +5,18 @@
#include <limits.h>
#include <unistd.h>
+
#include "ecpg-pthread-win32.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqlca.h"
-#include "pgtypes_numeric.h"
+#include "ecpgtype.h"
#include "pgtypes_date.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
+#include "pgtypes_numeric.h"
+#include "pgtypes_timestamp.h"
#include "pg_config_paths.h"
+#include "sqlca.h"
#ifdef HAVE_LONG_LONG_INT
#ifndef LONG_LONG_MIN
diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c
index 6e7adb9..b9653c0 100644
--- a/src/interfaces/ecpg/ecpglib/prepare.c
+++ b/src/interfaces/ecpg/ecpglib/prepare.c
@@ -5,10 +5,10 @@
#include <ctype.h>
-#include "ecpgtype.h"
-#include "ecpglib.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
#define STMTID_SIZE 32
diff --git a/src/interfaces/ecpg/ecpglib/sqlda.c b/src/interfaces/ecpg/ecpglib/sqlda.c
index 3fb0d82..081e326 100644
--- a/src/interfaces/ecpg/ecpglib/sqlda.c
+++ b/src/interfaces/ecpg/ecpglib/sqlda.c
@@ -10,16 +10,15 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
-#include "ecpg-pthread-win32.h"
#include "decimal.h"
-#include "ecpgtype.h"
-#include "ecpglib.h"
+#include "ecpg-pthread-win32.h"
#include "ecpgerrno.h"
+#include "ecpglib.h"
#include "ecpglib_extern.h"
+#include "ecpgtype.h"
#include "sqlca.h"
-#include "sqlda-native.h"
#include "sqlda-compat.h"
+#include "sqlda-native.h"
/*
* Compute the next variable's offset with
diff --git a/src/interfaces/ecpg/ecpglib/typename.c b/src/interfaces/ecpg/ecpglib/typename.c
index 9251450..1d482c4 100644
--- a/src/interfaces/ecpg/ecpglib/typename.c
+++ b/src/interfaces/ecpg/ecpglib/typename.c
@@ -4,12 +4,11 @@
#include "postgres_fe.h"
#include "catalog/pg_type_d.h"
-
-#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
-#include "sqltypes.h"
+#include "ecpgtype.h"
#include "sql3types.h"
+#include "sqltypes.h"
/*
* This function is used to generate the correct type names.
diff --git a/src/interfaces/ecpg/pgtypeslib/common.c b/src/interfaces/ecpg/pgtypeslib/common.c
index abcf7f5..8972229 100644
--- a/src/interfaces/ecpg/pgtypeslib/common.c
+++ b/src/interfaces/ecpg/pgtypeslib/common.c
@@ -2,8 +2,8 @@
#include "postgres_fe.h"
-#include "pgtypeslib_extern.h"
#include "pgtypes.h"
+#include "pgtypeslib_extern.h"
/* Return value is zero-filled. */
char *
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index 9ee460b..71dc1a5 100644
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -6,10 +6,10 @@
#include <ctype.h>
#include <limits.h>
-#include "pgtypeslib_extern.h"
#include "dt.h"
-#include "pgtypes_error.h"
#include "pgtypes_date.h"
+#include "pgtypes_error.h"
+#include "pgtypeslib_extern.h"
date *
PGTYPESdate_new(void)
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index 29c1117..c22f657 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -7,9 +7,9 @@
#include <math.h>
#include "common/string.h"
-#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_timestamp.h"
+#include "pgtypeslib_extern.h"
const int day_tab[2][13] = {
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0},
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index 3ff8a10..5b3c9a7 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -1,6 +1,7 @@
/* src/interfaces/ecpg/pgtypeslib/interval.c */
#include "postgres_fe.h"
+
#include <time.h>
#include <math.h>
#include <limits.h>
@@ -10,11 +11,10 @@
#endif
#include "common/string.h"
-
-#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_error.h"
#include "pgtypes_interval.h"
+#include "pgtypeslib_extern.h"
/* copy&pasted from .../src/backend/utils/adt/datetime.c
* and changesd struct pg_tm to struct tm
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index 22088ba..b6ca2d3 100644
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -1,12 +1,14 @@
/* src/interfaces/ecpg/pgtypeslib/numeric.c */
#include "postgres_fe.h"
+
#include <ctype.h>
#include <float.h>
#include <limits.h>
-#include "pgtypeslib_extern.h"
#include "pgtypes_error.h"
+#include "pgtypes_numeric.h"
+#include "pgtypeslib_extern.h"
#define Max(x, y) ((x) > (y) ? (x) : (y))
#define Min(x, y) ((x) < (y) ? (x) : (y))
@@ -20,7 +22,6 @@
free(buf); \
} while (0)
-#include "pgtypes_numeric.h"
#if 0
/* ----------
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 2be151f..7816e6f 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -11,11 +11,10 @@
#error -ffast-math is known to break this code
#endif
-#include "pgtypeslib_extern.h"
#include "dt.h"
-#include "pgtypes_timestamp.h"
#include "pgtypes_date.h"
-
+#include "pgtypes_timestamp.h"
+#include "pgtypeslib_extern.h"
static int64
time2t(const int hour, const int min, const int sec, const fsec_t fsec)
diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c
index 80aa7d5..e51c036 100644
--- a/src/interfaces/ecpg/preproc/c_keywords.c
+++ b/src/interfaces/ecpg/preproc/c_keywords.c
@@ -9,11 +9,10 @@
*/
#include "postgres_fe.h"
-#include "preproc_extern.h"
-#include "preproc.h"
-
/* ScanKeywordList lookup data for C keywords */
#include "c_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"
/* Token codes for C keywords */
#define PG_KEYWORD(kwname, value) value,
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index 4839c37..a2db06f 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -13,11 +13,10 @@
#include <ctype.h>
-#include "preproc_extern.h"
-#include "preproc.h"
-
/* ScanKeywordList lookup data for ECPG keywords */
#include "ecpg_kwlist_d.h"
+#include "preproc_extern.h"
+#include "preproc.h"
/* Token codes for ECPG keywords */
#define PG_KEYWORD(kwname, value) value,
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index a690f3b..2364dda 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -40,9 +40,8 @@
#include "common/md5.h"
#include "common/scram-common.h"
-#include "libpq-fe.h"
#include "fe-auth.h"
-
+#include "libpq-fe.h"
#ifdef ENABLE_GSS
/*
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 9905123..dcd86ee 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -21,10 +21,16 @@
#include <time.h>
#include <unistd.h>
+#include "common/ip.h"
+#include "common/link-canary.h"
+#include "common/scram-common.h"
+#include "common/string.h"
+#include "fe-auth.h"
#include "libpq-fe.h"
#include "libpq-int.h"
-#include "fe-auth.h"
+#include "mb/pg_wchar.h"
#include "pg_config_paths.h"
+#include "port/pg_bswap.h"
#ifdef WIN32
#include "win32.h"
@@ -70,14 +76,6 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
PQExpBuffer errorMessage);
#endif
-#include "common/ip.h"
-#include "common/link-canary.h"
-#include "common/scram-common.h"
-#include "common/string.h"
-#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
-
-
#ifndef WIN32
#define PGPASSFILE ".pgpass"
#else
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index b3c59a0..051f548 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -18,17 +18,16 @@
#include <fcntl.h>
#include <limits.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-
-#include "mb/pg_wchar.h"
-
#ifdef WIN32
#include "win32.h"
#else
#include <unistd.h>
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "mb/pg_wchar.h"
+
/* keep this in same order as ExecStatusType in libpq-fe.h */
char *const pgresStatus[] = {
"PGRES_EMPTY_QUERY",
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 18fec4a..a7c08c5 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -50,9 +50,8 @@
#include "libpq-fe.h"
#include "libpq-int.h"
#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
#include "pg_config_paths.h"
-
+#include "port/pg_bswap.h"
static int pqPutMsgBytes(const void *buf, size_t len, PGconn *conn);
static int pqSendSome(PGconn *conn, int len);
diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c
index 0e36974..e71e25a 100644
--- a/src/interfaces/libpq/fe-protocol2.c
+++ b/src/interfaces/libpq/fe-protocol2.c
@@ -17,11 +17,6 @@
#include <ctype.h>
#include <fcntl.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-#include "port/pg_bswap.h"
-
-
#ifdef WIN32
#include "win32.h"
#else
@@ -31,6 +26,9 @@
#endif
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "port/pg_bswap.h"
static int getRowDescriptions(PGconn *conn);
static int getAnotherTuple(PGconn *conn, bool binary);
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
index b04f7ec..c97841e 100644
--- a/src/interfaces/libpq/fe-protocol3.c
+++ b/src/interfaces/libpq/fe-protocol3.c
@@ -17,12 +17,6 @@
#include <ctype.h>
#include <fcntl.h>
-#include "libpq-fe.h"
-#include "libpq-int.h"
-
-#include "mb/pg_wchar.h"
-#include "port/pg_bswap.h"
-
#ifdef WIN32
#include "win32.h"
#else
@@ -32,6 +26,10 @@
#endif
#endif
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "mb/pg_wchar.h"
+#include "port/pg_bswap.h"
/*
* This macro lists the backend message types that could be "long" (more
diff --git a/src/interfaces/libpq/fe-secure-gssapi.c b/src/interfaces/libpq/fe-secure-gssapi.c
index 095750d..a1c1d12 100644
--- a/src/interfaces/libpq/fe-secure-gssapi.c
+++ b/src/interfaces/libpq/fe-secure-gssapi.c
@@ -13,9 +13,9 @@
#include "postgres_fe.h"
+#include "fe-gssapi-common.h"
#include "libpq-fe.h"
#include "libpq-int.h"
-#include "fe-gssapi-common.h"
#include "port/pg_bswap.h"
/*
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index b8191b4..e55b375 100644
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -28,10 +28,6 @@
#include <fcntl.h>
#include <ctype.h>
-#include "libpq-fe.h"
-#include "fe-auth.h"
-#include "libpq-int.h"
-
#ifdef WIN32
#include "win32.h"
#else
@@ -55,6 +51,10 @@
#endif
#endif
+#include "fe-auth.h"
+#include "libpq-fe.h"
+#include "libpq-int.h"
+
/*
* Macros to handle disabling and then restoring the state of SIGPIPE handling.
* On Windows, these are all no-ops since there's no SIGPIPEs.
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 0c24ba6..3fb8fc7 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -24,6 +24,7 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "parser/parse_type.h"
+#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
@@ -33,9 +34,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "plpgsql.h"
-
-
/* ----------
* Our own local and global variables
* ----------
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 345065e..fd799b7 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -34,6 +34,7 @@
#include "parser/parse_coerce.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
+#include "plpgsql.h"
#include "storage/proc.h"
#include "tcop/tcopprot.h"
#include "tcop/utility.h"
@@ -48,9 +49,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "plpgsql.h"
-
-
typedef struct
{
int nargs; /* number of arguments */
diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
index 053f83d..2d4616c 100644
--- a/src/pl/plpgsql/src/pl_funcs.c
+++ b/src/pl/plpgsql/src/pl_funcs.c
@@ -15,10 +15,8 @@
#include "postgres.h"
-#include "utils/memutils.h"
-
#include "plpgsql.h"
-
+#include "utils/memutils.h"
/* ----------
* Local variables for namespace handling
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index ce03f1e..e92deb3 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -20,15 +20,13 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
+#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/varlena.h"
-#include "plpgsql.h"
-
-
static bool plpgsql_extra_checks_check_hook(char **newvalue, void **extra, GucSource source);
static void plpgsql_extra_warnings_assign_hook(const char *newvalue, void *extra);
static void plpgsql_extra_errors_assign_hook(const char *newvalue, void *extra);
diff --git a/src/port/pg_crc32c_armv8.c b/src/port/pg_crc32c_armv8.c
index ebe449e..de725d3 100644
--- a/src/port/pg_crc32c_armv8.c
+++ b/src/port/pg_crc32c_armv8.c
@@ -14,10 +14,10 @@
*/
#include "c.h"
-#include "port/pg_crc32c.h"
-
#include <arm_acle.h>
+#include "port/pg_crc32c.h"
+
pg_crc32c
pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t len)
{
diff --git a/src/port/pg_crc32c_sse42.c b/src/port/pg_crc32c_sse42.c
index ef56cff..a81718b 100644
--- a/src/port/pg_crc32c_sse42.c
+++ b/src/port/pg_crc32c_sse42.c
@@ -14,10 +14,10 @@
*/
#include "c.h"
-#include "port/pg_crc32c.h"
-
#include <nmmintrin.h>
+#include "port/pg_crc32c.h"
+
pg_crc32c
pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len)
{
diff --git a/src/port/tar.c b/src/port/tar.c
index f1da959..4afe9f2 100644
--- a/src/port/tar.c
+++ b/src/port/tar.c
@@ -1,7 +1,9 @@
#include "c.h"
-#include "pgtar.h"
+
#include <sys/stat.h>
+#include "pgtar.h"
+
/*
* Print a numeric field in a tar header. The field starts at *s and is of
* length len; val is the value to be written.
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
index 556b46d..b50c189 100644
--- a/src/test/isolation/isolationtester.c
+++ b/src/test/isolation/isolationtester.c
@@ -13,11 +13,10 @@
#endif
#include "datatype/timestamp.h"
+#include "isolationtester.h"
#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "pg_getopt.h"
-
-#include "isolationtester.h"
+#include "pqexpbuffer.h"
#define PREP_WAITING "isolationtester_waiting"
diff --git a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
index bab073b..7e9d7de 100644
--- a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
+++ b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
@@ -12,10 +12,10 @@
*/
#include "postgres.h"
-#include "fmgr.h"
#include "access/ginblock.h"
#include "access/gin_private.h"
#include "access/htup_details.h"
+#include "fmgr.h"
PG_MODULE_MAGIC;
diff --git a/src/test/modules/test_integerset/test_integerset.c b/src/test/modules/test_integerset/test_integerset.c
index e3925a1..82d8563 100644
--- a/src/test/modules/test_integerset/test_integerset.c
+++ b/src/test/modules/test_integerset/test_integerset.c
@@ -14,12 +14,12 @@
#include "fmgr.h"
#include "lib/integerset.h"
+#include "miscadmin.h"
#include "nodes/bitmapset.h"
-#include "utils/memutils.h"
-#include "utils/timestamp.h"
#include "storage/block.h"
#include "storage/itemptr.h"
-#include "miscadmin.h"
+#include "utils/memutils.h"
+#include "utils/timestamp.h"
/*
* If you enable this, the "pattern" tests will print information about
diff --git a/src/test/modules/test_rls_hooks/test_rls_hooks.c b/src/test/modules/test_rls_hooks/test_rls_hooks.c
index 10379bc..f576ecb 100644
--- a/src/test/modules/test_rls_hooks/test_rls_hooks.c
+++ b/src/test/modules/test_rls_hooks/test_rls_hooks.c
@@ -13,19 +13,16 @@
#include "postgres.h"
+#include "catalog/pg_type.h"
#include "fmgr.h"
#include "miscadmin.h"
-
-#include "test_rls_hooks.h"
-
-#include "catalog/pg_type.h"
-#include "nodes/makefuncs.h"
#include "nodes/makefuncs.h"
#include "parser/parse_clause.h"
#include "parser/parse_collate.h"
#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "rewrite/rowsecurity.h"
+#include "test_rls_hooks.h"
#include "utils/acl.h"
#include "utils/rel.h"
#include "utils/relcache.h"
diff --git a/src/test/modules/test_shm_mq/setup.c b/src/test/modules/test_shm_mq/setup.c
index a318168..c1a0fa4 100644
--- a/src/test/modules/test_shm_mq/setup.c
+++ b/src/test/modules/test_shm_mq/setup.c
@@ -20,9 +20,8 @@
#include "postmaster/bgworker.h"
#include "storage/procsignal.h"
#include "storage/shm_toc.h"
-#include "utils/memutils.h"
-
#include "test_shm_mq.h"
+#include "utils/memutils.h"
typedef struct
{
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 3a39472..6554ce2 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -29,14 +29,13 @@
#include <sys/resource.h>
#endif
-#include "pg_regress.h"
-
#include "common/logging.h"
#include "common/restricted_token.h"
#include "common/username.h"
#include "getopt_long.h"
#include "libpq/pqcomm.h" /* needed for UNIXSOCK_PATH() */
#include "pg_config_paths.h"
+#include "pg_regress.h"
#include "portability/instr_time.h"
/* for resultmap we need a list of pairs of strings */
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index cb8ef53..2f66d76 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -36,10 +36,9 @@
#include "port/atomics.h"
#include "utils/builtins.h"
#include "utils/geo_decls.h"
+#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/typcache.h"
-#include "utils/memutils.h"
-
#define EXPECT_TRUE(expr) \
do { \
--
1.8.3.1
Re: Ordering of header file inclusion
On Wed, Oct 23, 2019 at 10:23 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
Attached are patches for (a) and (b) after another round of review and
fixes by Vignesh. I am planning to commit the first one (a) tomorrow
morning and then if everything is fine on buildfarm, I will commit the
second one (b) and once both are good, I will look into the third one
(c). Another pair of eyes on these patches would be good.
I have pushed the first one. I'll wait for some time and probably
commit the second one tomorrow.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Thu, Oct 24, 2019 at 2:43 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Wed, Oct 23, 2019 at 10:23 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
Attached are patches for (a) and (b) after another round of review and
fixes by Vignesh. I am planning to commit the first one (a) tomorrow
morning and then if everything is fine on buildfarm, I will commit the
second one (b) and once both are good, I will look into the third one
(c). Another pair of eyes on these patches would be good.I have pushed the first one. I'll wait for some time and probably
commit the second one tomorrow.
I have committed the second one as well. Now, the remaining patch is
for the entire backend. I will pick it up after a few days.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Fri, Oct 25, 2019 at 3:28 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Thu, Oct 24, 2019 at 2:43 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Wed, Oct 23, 2019 at 10:23 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
Attached are patches for (a) and (b) after another round of review and
fixes by Vignesh. I am planning to commit the first one (a) tomorrow
morning and then if everything is fine on buildfarm, I will commit the
second one (b) and once both are good, I will look into the third one
(c). Another pair of eyes on these patches would be good.I have pushed the first one. I'll wait for some time and probably
commit the second one tomorrow.I have committed the second one as well. Now, the remaining patch is
for the entire backend. I will pick it up after a few days.
Thanks Amit for committing the changes.
I found couple of more inconsistencies, the attached patch includes
the fix for the same.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Attachments:
0001-Make-the-order-of-the-header-file-includes-consistent-backend.patchtext/x-patch; charset=UTF-8; name=0001-Make-the-order-of-the-header-file-includes-consistent-backend.patchDownload
From 44edb72c6b798924bed22c55b60826f28302a35f Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Sat, 2 Nov 2019 07:33:21 +0530
Subject: [PATCH] Make the order of the header file includes consistent in
backend modules.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The basic rule we follow here is to always first include 'postgres.h' or
'postgres_fe.h' whichever is applicable, then system header includes and
then Postgres header includes. In this, we also follow that all the
Postgres header includes are in order based on their ASCII value. We
generally follow these rules, but the code has deviated in many places.
This commit makes it consistent for backend modules.
Author: Vignesh C
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
---
src/backend/access/brin/brin_minmax.c | 5 ++--
src/backend/access/brin/brin_pageops.c | 3 +--
src/backend/access/brin/brin_tuple.c | 3 +--
src/backend/access/brin/brin_validate.c | 3 +--
src/backend/access/gin/ginbtree.c | 2 +-
src/backend/access/gin/ginfast.c | 10 ++++----
src/backend/access/gin/gininsert.c | 5 ++--
src/backend/access/gin/ginvalidate.c | 3 +--
src/backend/access/gist/gist.c | 3 +--
src/backend/access/gist/gistget.c | 4 +--
src/backend/access/gist/gistutil.c | 5 ++--
src/backend/access/hash/hash.c | 2 --
src/backend/access/hash/hash_xlog.c | 6 ++---
src/backend/access/hash/hashinsert.c | 4 +--
src/backend/access/hash/hashpage.c | 3 +--
src/backend/access/hash/hashsearch.c | 2 +-
src/backend/access/hash/hashutil.c | 2 +-
src/backend/access/heap/heapam_handler.c | 5 +---
src/backend/access/heap/pruneheap.c | 4 +--
src/backend/access/heap/rewriteheap.c | 12 ++-------
src/backend/access/nbtree/nbtxlog.c | 2 +-
src/backend/access/spgist/spgquadtreeproc.c | 3 +--
src/backend/access/transam/clog.c | 2 +-
src/backend/access/transam/parallel.c | 3 +--
src/backend/access/transam/rmgr.c | 4 +--
src/backend/access/transam/slru.c | 3 +--
src/backend/access/transam/twophase.c | 3 +--
src/backend/access/transam/xact.c | 3 +--
src/backend/access/transam/xlog.c | 6 ++---
src/backend/access/transam/xlogfuncs.c | 7 +++--
src/backend/access/transam/xloginsert.c | 2 +-
src/backend/access/transam/xlogreader.c | 3 +--
src/backend/catalog/aclchk.c | 5 ++--
src/backend/catalog/catalog.c | 3 +--
src/backend/catalog/index.c | 7 +++--
src/backend/catalog/objectaddress.c | 10 ++++----
src/backend/catalog/partition.c | 3 +--
src/backend/catalog/pg_enum.c | 3 +--
src/backend/catalog/pg_publication.c | 9 +++----
src/backend/catalog/pg_shdepend.c | 7 +++--
src/backend/catalog/pg_subscription.c | 10 ++------
src/backend/catalog/pg_type.c | 2 +-
src/backend/catalog/storage.c | 3 +--
src/backend/commands/alter.c | 5 ++--
src/backend/commands/cluster.c | 5 ++--
src/backend/commands/copy.c | 3 +--
src/backend/commands/createas.c | 3 +--
src/backend/commands/dbcommands.c | 3 +--
src/backend/commands/event_trigger.c | 6 ++---
src/backend/commands/functioncmds.c | 2 +-
src/backend/commands/lockcmds.c | 4 +--
src/backend/commands/opclasscmds.c | 3 +--
src/backend/commands/policy.c | 2 +-
src/backend/commands/publicationcmds.c | 10 +++-----
src/backend/commands/schemacmds.c | 3 +--
src/backend/commands/subscriptioncmds.c | 12 ++-------
src/backend/commands/tablecmds.c | 2 --
src/backend/commands/tablespace.c | 3 +--
src/backend/commands/variable.c | 4 +--
src/backend/commands/view.c | 3 +--
src/backend/executor/execAmi.c | 2 --
src/backend/executor/execExprInterp.c | 5 ++--
src/backend/executor/execGrouping.c | 2 +-
src/backend/executor/execParallel.c | 4 +--
src/backend/executor/execProcnode.c | 3 +--
src/backend/executor/execTuples.c | 3 +--
src/backend/executor/nodeAgg.c | 3 +--
src/backend/executor/nodeBitmapHeapscan.c | 3 +--
src/backend/executor/nodeCustom.c | 3 +--
src/backend/executor/nodeHash.c | 3 +--
src/backend/executor/nodeSubplan.c | 3 +--
src/backend/executor/nodeTableFuncscan.c | 3 +--
src/backend/executor/nodeWindowAgg.c | 2 +-
src/backend/jit/jit.c | 7 ++---
src/backend/jit/llvm/llvmjit.c | 18 +++++--------
src/backend/jit/llvm/llvmjit_expr.c | 3 +--
src/backend/libpq/be-secure.c | 5 ++--
src/backend/libpq/hba.c | 2 +-
src/backend/nodes/nodeFuncs.c | 3 +--
src/backend/optimizer/geqo/geqo_cx.c | 2 +-
src/backend/optimizer/geqo/geqo_erx.c | 2 +-
src/backend/optimizer/path/clausesel.c | 3 +--
src/backend/optimizer/plan/initsplan.c | 3 +--
src/backend/optimizer/plan/planagg.c | 3 +--
src/backend/optimizer/plan/planner.c | 7 +++--
src/backend/optimizer/prep/preptlist.c | 3 +--
src/backend/optimizer/util/pathnode.c | 3 +--
src/backend/optimizer/util/plancat.c | 7 +++--
src/backend/parser/parse_clause.c | 12 ++++-----
src/backend/parser/parse_expr.c | 3 +--
src/backend/parser/parse_node.c | 3 +--
src/backend/parser/parse_relation.c | 3 +--
src/backend/parser/parse_target.c | 3 +--
src/backend/parser/parse_type.c | 3 +--
src/backend/parser/scansup.c | 3 +--
src/backend/partitioning/partbounds.c | 2 +-
src/backend/partitioning/partdesc.c | 4 +--
src/backend/postmaster/bgworker.c | 2 +-
src/backend/postmaster/bgwriter.c | 3 +--
src/backend/postmaster/fork_process.c | 3 ++-
src/backend/postmaster/pgstat.c | 4 +--
src/backend/replication/basebackup.c | 3 +--
.../libpqwalreceiver/libpqwalreceiver.c | 4 +--
src/backend/replication/logical/decode.c | 7 ++---
src/backend/replication/logical/launcher.c | 16 +++---------
src/backend/replication/logical/logical.c | 10 +++-----
src/backend/replication/logical/logicalfuncs.c | 30 ++++++++--------------
src/backend/replication/logical/message.c | 9 ++-----
src/backend/replication/logical/origin.c | 18 +++++--------
src/backend/replication/logical/snapbuild.c | 15 ++++-------
src/backend/replication/logical/tablesync.c | 13 +++-------
src/backend/replication/pgoutput/pgoutput.c | 5 +---
src/backend/replication/slotfuncs.c | 2 +-
src/backend/rewrite/rowsecurity.c | 2 +-
src/backend/statistics/dependencies.c | 4 +--
src/backend/statistics/mvdistinct.c | 7 +++--
src/backend/storage/buffer/buf_init.c | 3 +--
src/backend/storage/buffer/buf_table.c | 3 +--
src/backend/storage/file/buffile.c | 4 +--
src/backend/storage/file/copydir.c | 4 +--
src/backend/storage/file/fd.c | 3 +--
src/backend/storage/ipc/dsm_impl.c | 6 ++---
src/backend/storage/ipc/ipci.c | 2 +-
src/backend/storage/ipc/procsignal.c | 3 +--
src/backend/storage/ipc/sinvaladt.c | 3 +--
src/backend/storage/lmgr/lwlock.c | 2 +-
src/backend/storage/lmgr/proc.c | 3 +--
src/backend/storage/lmgr/s_lock.c | 3 +--
src/backend/storage/page/checksum.c | 1 -
src/backend/storage/smgr/md.c | 8 +++---
src/backend/storage/sync/sync.c | 8 +++---
src/backend/tcop/postgres.c | 7 +++--
src/backend/tcop/utility.c | 7 +++--
src/backend/tsearch/wparser.c | 3 +--
src/backend/utils/adt/acl.c | 5 ++--
src/backend/utils/adt/datetime.c | 1 -
src/backend/utils/adt/format_type.c | 2 +-
src/backend/utils/adt/int8.c | 3 +--
src/backend/utils/adt/json.c | 4 +--
src/backend/utils/adt/jsonb.c | 4 +--
src/backend/utils/adt/jsonpath_exec.c | 5 ++--
src/backend/utils/adt/misc.c | 7 +++--
src/backend/utils/adt/oracle_compat.c | 3 +--
src/backend/utils/adt/rangetypes_gist.c | 3 +--
src/backend/utils/adt/regproc.c | 4 +--
src/backend/utils/adt/ri_triggers.c | 3 +--
src/backend/utils/adt/ruleutils.c | 3 +--
src/backend/utils/adt/tsquery.c | 2 +-
src/backend/utils/adt/tsquery_cleanup.c | 2 +-
src/backend/utils/adt/tsquery_gist.c | 2 +-
src/backend/utils/adt/tsquery_util.c | 2 +-
src/backend/utils/adt/tsrank.c | 3 +--
src/backend/utils/adt/txid.c | 3 +--
src/backend/utils/adt/varchar.c | 3 +--
src/backend/utils/cache/evtcache.c | 4 +--
src/backend/utils/cache/relcache.c | 3 +--
src/backend/utils/cache/relfilenodemap.c | 2 +-
src/backend/utils/cache/syscache.c | 5 ++--
src/backend/utils/init/postinit.c | 3 +--
.../utf8_and_cyrillic/utf8_and_cyrillic.c | 5 ++--
.../utf8_and_iso8859/utf8_and_iso8859.c | 3 ++-
src/backend/utils/misc/guc.c | 8 +++---
src/backend/utils/misc/pg_config.c | 6 ++---
src/backend/utils/misc/pg_controldata.c | 2 +-
src/backend/utils/misc/ps_status.c | 2 +-
src/backend/utils/misc/superuser.c | 3 +--
src/backend/utils/mmgr/slab.c | 3 +--
src/backend/utils/time/combocid.c | 3 +--
168 files changed, 286 insertions(+), 468 deletions(-)
diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c
index ad0d18e..655c0b5 100644
--- a/src/backend/access/brin/brin_minmax.c
+++ b/src/backend/access/brin/brin_minmax.c
@@ -10,19 +10,18 @@
*/
#include "postgres.h"
-#include "access/genam.h"
#include "access/brin_internal.h"
#include "access/brin_tuple.h"
+#include "access/genam.h"
#include "access/stratnum.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_amop.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/datum.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-
typedef struct MinmaxOpaque
{
Oid cached_subtype;
diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c
index f907b4b..c4cbe84 100644
--- a/src/backend/access/brin/brin_pageops.c
+++ b/src/backend/access/brin/brin_pageops.c
@@ -10,8 +10,8 @@
*/
#include "postgres.h"
-#include "access/brin_pageops.h"
#include "access/brin_page.h"
+#include "access/brin_pageops.h"
#include "access/brin_revmap.h"
#include "access/brin_xlog.h"
#include "access/xloginsert.h"
@@ -22,7 +22,6 @@
#include "storage/smgr.h"
#include "utils/rel.h"
-
/*
* Maximum size of an entry in a BRIN_PAGETYPE_REGULAR page. We can tolerate
* a single item per page, unlike other index AMs.
diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c
index 2b38617..6d24e53 100644
--- a/src/backend/access/brin/brin_tuple.c
+++ b/src/backend/access/brin/brin_tuple.c
@@ -31,14 +31,13 @@
*/
#include "postgres.h"
-#include "access/htup_details.h"
#include "access/brin_tuple.h"
+#include "access/htup_details.h"
#include "access/tupdesc.h"
#include "access/tupmacs.h"
#include "utils/datum.h"
#include "utils/memutils.h"
-
static inline void brin_deconstruct_tuple(BrinDesc *brdesc,
char *tp, bits8 *nullbits, bool nulls,
Datum *values, bool *allnulls, bool *hasnulls);
diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index 0129338..02337a7 100644
--- a/src/backend/access/brin/brin_validate.c
+++ b/src/backend/access/brin/brin_validate.c
@@ -22,9 +22,8 @@
#include "catalog/pg_opfamily.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
-
+#include "utils/syscache.h"
/*
* Validator for a BRIN opclass.
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 4c29261..20adfa2 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -17,8 +17,8 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
#include "access/xloginsert.h"
-#include "storage/predicate.h"
#include "miscadmin.h"
+#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index 439a91b..3d2153b 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -20,19 +20,19 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/xlog.h"
-#include "commands/vacuum.h"
+#include "access/xloginsert.h"
#include "catalog/pg_am.h"
+#include "commands/vacuum.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/acl.h"
#include "postmaster/autovacuum.h"
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
/* GUC parameter */
int gin_pending_list_limit = 0;
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index 55eab14..bdb3d5f 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -16,18 +16,17 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/tableam.h"
+#include "access/xloginsert.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/smgr.h"
#include "storage/indexfsm.h"
#include "storage/predicate.h"
+#include "storage/smgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
typedef struct
{
GinState ginstate;
diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 63bd7f2..5d96f29 100644
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -23,9 +23,8 @@
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
-
+#include "utils/syscache.h"
/*
* Validator for a GIN opclass.
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 0cc8791..8d9c8d0 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -18,15 +18,14 @@
#include "access/gistscan.h"
#include "catalog/pg_collation.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
/* non-export function prototypes */
static void gistfixsplit(GISTInsertState *state, GISTSTATE *giststate);
static bool gistinserttuple(GISTInsertState *state, GISTInsertStack *stack,
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 22d790d..98b6892 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -17,11 +17,11 @@
#include "access/genam.h"
#include "access/gist_private.h"
#include "access/relscan.h"
+#include "lib/pairingheap.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "pgstat.h"
-#include "lib/pairingheap.h"
#include "utils/float.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
index 45804d7..bf2e848 100644
--- a/src/backend/access/gist/gistutil.c
+++ b/src/backend/access/gist/gistutil.c
@@ -22,10 +22,9 @@
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "utils/float.h"
-#include "utils/syscache.h"
-#include "utils/snapmgr.h"
#include "utils/lsyscache.h"
-
+#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
* Write itup vector to page, has no control of free space.
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 5cc30da..cdb6fa9 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -31,8 +31,6 @@
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/rel.h"
-#include "miscadmin.h"
-
/* Working state for hashbuild and its callback */
typedef struct
diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c
index 86e7210..c1d248a 100644
--- a/src/backend/access/hash/hash_xlog.c
+++ b/src/backend/access/hash/hash_xlog.c
@@ -17,11 +17,11 @@
#include "access/bufmask.h"
#include "access/hash.h"
#include "access/hash_xlog.h"
-#include "access/xlogutils.h"
-#include "access/xlog.h"
#include "access/transam.h"
-#include "storage/procarray.h"
+#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* replay a hash index meta page
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 89876d2..e0ca1b0 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -18,10 +18,10 @@
#include "access/hash.h"
#include "access/hash_xlog.h"
#include "miscadmin.h"
-#include "utils/rel.h"
-#include "storage/lwlock.h"
#include "storage/buf_internals.h"
+#include "storage/lwlock.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static void _hash_vacuum_one_page(Relation rel, Relation hrel,
Buffer metabuf, Buffer buf);
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 838ee68..63697bf 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -32,9 +32,8 @@
#include "access/hash_xlog.h"
#include "miscadmin.h"
#include "storage/lmgr.h"
-#include "storage/smgr.h"
#include "storage/predicate.h"
-
+#include "storage/smgr.h"
static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock,
uint32 nblocks);
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 79ae499..725e614 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -18,8 +18,8 @@
#include "access/relscan.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "utils/rel.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static bool _hash_readpage(IndexScanDesc scan, Buffer *bufP,
ScanDirection dir);
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 3fb92ea..c5005f4 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -17,9 +17,9 @@
#include "access/hash.h"
#include "access/reloptions.h"
#include "access/relscan.h"
+#include "storage/buf_internals.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
-#include "storage/buf_internals.h"
#define CALC_NEW_BUCKET(old_bucket, lowmask) \
old_bucket | (lowmask + 1)
diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
index 2dd8821..2c70a87 100644
--- a/src/backend/access/heap/heapam_handler.c
+++ b/src/backend/access/heap/heapam_handler.c
@@ -19,8 +19,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/heaptoast.h"
@@ -35,10 +33,10 @@
#include "catalog/storage_xlog.h"
#include "commands/progress.h"
#include "executor/executor.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
#include "storage/procarray.h"
@@ -46,7 +44,6 @@
#include "utils/builtins.h"
#include "utils/rel.h"
-
static void reform_and_rewrite_tuple(HeapTuple tuple,
Relation OldHeap, Relation NewHeap,
Datum *values, bool *isnull, RewriteState rwstate);
diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
index a0d2217..6d62a96 100644
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@ -16,15 +16,15 @@
#include "access/heapam.h"
#include "access/heapam_xlog.h"
-#include "access/transam.h"
#include "access/htup_details.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
-#include "utils/snapmgr.h"
#include "utils/rel.h"
+#include "utils/snapmgr.h"
/* Working data for heap_page_prune and subroutines */
typedef struct
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
index d41dbcf..d285b1f 100644
--- a/src/backend/access/heap/rewriteheap.c
+++ b/src/backend/access/heap/rewriteheap.c
@@ -105,8 +105,6 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam.h"
#include "access/heapam_xlog.h"
#include "access/heaptoast.h"
@@ -114,25 +112,19 @@
#include "access/transam.h"
#include "access/xact.h"
#include "access/xloginsert.h"
-
#include "catalog/catalog.h"
-
#include "lib/ilist.h"
-
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "replication/logical.h"
#include "replication/slot.h"
-
#include "storage/bufmgr.h"
#include "storage/fd.h"
+#include "storage/procarray.h"
#include "storage/smgr.h"
-
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "storage/procarray.h"
-
/*
* State associated with a rewrite operation. This is opaque to the user
* of the rewrite facility.
diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index dd5315c..44f6283 100644
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -20,8 +20,8 @@
#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlogutils.h"
-#include "storage/procarray.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* _bt_restore_page -- re-enter all the index tuples on a page
diff --git a/src/backend/access/spgist/spgquadtreeproc.c b/src/backend/access/spgist/spgquadtreeproc.c
index e50108e..992c558 100644
--- a/src/backend/access/spgist/spgquadtreeproc.c
+++ b/src/backend/access/spgist/spgquadtreeproc.c
@@ -16,14 +16,13 @@
#include "postgres.h"
#include "access/spgist.h"
-#include "access/stratnum.h"
#include "access/spgist_private.h"
+#include "access/stratnum.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/float.h"
#include "utils/geo_decls.h"
-
Datum
spg_quad_config(PG_FUNCTION_ARGS)
{
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index 595c860..7f7eb21 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -39,8 +39,8 @@
#include "access/xloginsert.h"
#include "access/xlogutils.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "storage/proc.h"
/*
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
index 55d129a..d147236 100644
--- a/src/backend/access/transam/parallel.c
+++ b/src/backend/access/transam/parallel.c
@@ -19,9 +19,9 @@
#include "access/session.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_enum.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
+#include "catalog/pg_enum.h"
#include "commands/async.h"
#include "executor/execParallel.h"
#include "libpq/libpq.h"
@@ -43,7 +43,6 @@
#include "utils/snapmgr.h"
#include "utils/typcache.h"
-
/*
* We don't want to waste a lot of memory on an error queue which, most of
* the time, will process only a handful of small messages. However, it is
diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c
index 9368b56..58091f6 100644
--- a/src/backend/access/transam/rmgr.c
+++ b/src/backend/access/transam/rmgr.c
@@ -7,14 +7,14 @@
*/
#include "postgres.h"
+#include "access/brin_xlog.h"
#include "access/clog.h"
#include "access/commit_ts.h"
+#include "access/generic_xlog.h"
#include "access/ginxlog.h"
#include "access/gistxlog.h"
-#include "access/generic_xlog.h"
#include "access/hash_xlog.h"
#include "access/heapam_xlog.h"
-#include "access/brin_xlog.h"
#include "access/multixact.h"
#include "access/nbtxlog.h"
#include "access/spgxlog.h"
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index e38f919..59bad09 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -54,11 +54,10 @@
#include "access/slru.h"
#include "access/transam.h"
#include "access/xlog.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/fd.h"
#include "storage/shmem.h"
-#include "miscadmin.h"
-
#define SlruFileName(ctl, path, seg) \
snprintf(path, MAXPGPATH, "%s/%04X", (ctl)->Dir, seg)
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 546bd43..712e842 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -85,8 +85,8 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "access/xloginsert.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
+#include "access/xlogutils.h"
#include "catalog/pg_type.h"
#include "catalog/storage.h"
#include "funcapi.h"
@@ -108,7 +108,6 @@
#include "utils/memutils.h"
#include "utils/timestamp.h"
-
/*
* Directory where Two-phase commit files reside within PGDATA
*/
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index fc55fa6..c3a75a5 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -40,6 +40,7 @@
#include "libpq/be-fsstubs.h"
#include "libpq/pqsignal.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "replication/logical.h"
#include "replication/logicallauncher.h"
@@ -65,8 +66,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
-
/*
* User-tweakable parameters
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 2e3cc51..6bff2d8 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -42,15 +42,16 @@
#include "commands/tablespace.h"
#include "common/controldata_utils.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "port/atomics.h"
#include "postmaster/bgwriter.h"
-#include "postmaster/walwriter.h"
#include "postmaster/startup.h"
+#include "postmaster/walwriter.h"
#include "replication/basebackup.h"
#include "replication/logical.h"
-#include "replication/slot.h"
#include "replication/origin.h"
+#include "replication/slot.h"
#include "replication/snapbuild.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
@@ -74,7 +75,6 @@
#include "utils/relmapper.h"
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
extern uint32 bootstrap_data_checksum_version;
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index 8f17988..1fccf29 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -27,17 +27,16 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "replication/walreceiver.h"
+#include "storage/fd.h"
+#include "storage/ipc.h"
#include "storage/smgr.h"
#include "utils/builtins.h"
+#include "utils/guc.h"
#include "utils/memutils.h"
#include "utils/numeric.h"
-#include "utils/guc.h"
#include "utils/pg_lsn.h"
#include "utils/timestamp.h"
#include "utils/tuplestore.h"
-#include "storage/fd.h"
-#include "storage/ipc.h"
-
/*
* Store label file and tablespace map during non-exclusive backups.
diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c
index 3ec67d4..aa9dca0 100644
--- a/src/backend/access/transam/xloginsert.c
+++ b/src/backend/access/transam/xloginsert.c
@@ -26,11 +26,11 @@
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/proc.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/* Buffer size required to store a compressed version of backup block image */
#define PGLZ_MAX_BLCKSZ PGLZ_MAX_OUTPUT(BLCKSZ)
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index c8b0d23..fb25864 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -18,9 +18,9 @@
#include "postgres.h"
#include "access/transam.h"
-#include "access/xlogrecord.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
+#include "access/xlogrecord.h"
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "replication/origin.h"
@@ -30,7 +30,6 @@
#include "utils/memutils.h"
#endif
-
static void report_invalid_record(XLogReaderState *state, const char *fmt,...)
pg_attribute_printf(2, 3);
static bool allocate_recordbuf(XLogReaderState *state, uint32 reclength);
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 88ce37c..bed10f9 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -52,12 +52,12 @@
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_tablespace.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_transform.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
#include "catalog/pg_ts_template.h"
-#include "catalog/pg_transform.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
@@ -76,7 +76,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
/*
* Internal format used by ALTER DEFAULT PRIVILEGES.
*/
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 1af31c2..6b10469 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -31,9 +31,9 @@
#include "catalog/pg_auth_members.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_pltemplate.h"
-#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_replication_origin.h"
#include "catalog/pg_shdepend.h"
#include "catalog/pg_shdescription.h"
@@ -50,7 +50,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
/*
* IsSystemRelation
* True iff the relation is either a system catalog or a toast table.
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 7c34509..67f637d 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -43,11 +43,11 @@
#include "catalog/pg_am.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
-#include "catalog/pg_description.h"
#include "catalog/pg_depend.h"
+#include "catalog/pg_description.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_tablespace.h"
#include "catalog/pg_trigger.h"
#include "catalog/pg_type.h"
@@ -76,10 +76,9 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_rusage.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/snapmgr.h"
-
/* Potentially set by pg_upgrade_support functions */
Oid binary_upgrade_next_index_pg_class_oid = InvalidOid;
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index ce8a4e9..3544bd0 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -29,13 +29,13 @@
#include "catalog/pg_attrdef.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_cast.h"
-#include "catalog/pg_default_acl.h"
-#include "catalog/pg_enum.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_conversion.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_default_acl.h"
+#include "catalog/pg_enum.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_extension.h"
#include "catalog/pg_foreign_data_wrapper.h"
#include "catalog/pg_foreign_server.h"
@@ -44,10 +44,10 @@
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_opclass.h"
-#include "catalog/pg_opfamily.h"
#include "catalog/pg_operator.h"
-#include "catalog/pg_proc.h"
+#include "catalog/pg_opfamily.h"
#include "catalog/pg_policy.h"
+#include "catalog/pg_proc.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
#include "catalog/pg_rewrite.h"
diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
index 53af14e..5dfa449 100644
--- a/src/backend/catalog/partition.c
+++ b/src/backend/catalog/partition.c
@@ -16,9 +16,9 @@
#include "access/genam.h"
#include "access/htup_details.h"
+#include "access/sysattr.h"
#include "access/table.h"
#include "access/tupconvert.h"
-#include "access/sysattr.h"
#include "catalog/indexing.h"
#include "catalog/partition.h"
#include "catalog/pg_inherits.h"
@@ -32,7 +32,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static Oid get_partition_parent_worker(Relation inhRel, Oid relid);
static void get_partition_ancestors_worker(Relation inhRel, Oid relid,
List **ancestors);
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index d0ff802..be0f065 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -22,9 +22,9 @@
#include "catalog/indexing.h"
#include "catalog/pg_enum.h"
#include "catalog/pg_type.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "nodes/value.h"
+#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/fmgroids.h"
@@ -32,7 +32,6 @@
#include "utils/memutils.h"
#include "utils/syscache.h"
-
/* Potentially set by pg_upgrade_support functions */
Oid binary_upgrade_next_pg_enum_oid = InvalidOid;
diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index fd5da7d..d442c8e 100644
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -14,15 +14,11 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/index.h"
@@ -30,10 +26,11 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
-
+#include "catalog/pg_type.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index fb7f8dd..59f97bf 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -34,8 +34,8 @@
#include "catalog/pg_largeobject.h"
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_shdepend.h"
@@ -47,9 +47,9 @@
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
#include "commands/alter.h"
-#include "commands/dbcommands.h"
#include "commands/collationcmds.h"
#include "commands/conversioncmds.h"
+#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
@@ -60,13 +60,12 @@
#include "commands/subscriptioncmds.h"
#include "commands/tablecmds.h"
#include "commands/typecmds.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
+#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/fmgroids.h"
#include "utils/syscache.h"
-
typedef enum
{
LOCAL_OBJECT,
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index afee283..68d88ff 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -14,23 +14,18 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/indexing.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "catalog/pg_type.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
-
#include "storage/lmgr.h"
-
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
@@ -38,7 +33,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static List *textarray_to_stringlist(ArrayType *textarray);
/*
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 2a51501..a8c1de5 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-#include "catalog/catalog.h"
#include "catalog/binary_upgrade.h"
+#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/objectaccess.h"
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index 625af8d..056ea3d 100644
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -19,8 +19,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/visibilitymap.h"
#include "access/xact.h"
#include "access/xlog.h"
@@ -28,6 +26,7 @@
#include "access/xlogutils.h"
#include "catalog/storage.h"
#include "catalog/storage_xlog.h"
+#include "miscadmin.h"
#include "storage/freespace.h"
#include "storage/smgr.h"
#include "utils/memutils.h"
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 70dbcb0..af1aca9 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -34,8 +34,8 @@
#include "catalog/pg_opclass.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
-#include "catalog/pg_subscription.h"
#include "catalog/pg_statistic_ext.h"
+#include "catalog/pg_subscription.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
@@ -57,8 +57,8 @@
#include "commands/trigger.h"
#include "commands/typecmds.h"
#include "commands/user.h"
-#include "parser/parse_func.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
#include "rewrite/rewriteDefine.h"
#include "tcop/utility.h"
#include "utils/builtins.h"
@@ -67,7 +67,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static Oid AlterObjectNamespace_internal(Relation rel, Oid objid, Oid nspOid);
/*
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index a23128d..b8c349f 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -22,17 +22,17 @@
#include "access/multixact.h"
#include "access/relscan.h"
#include "access/tableam.h"
-#include "access/transam.h"
#include "access/toast_internals.h"
+#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_am.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/heap.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_am.h"
#include "catalog/toasting.h"
#include "commands/cluster.h"
#include "commands/progress.h"
@@ -55,7 +55,6 @@
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-
/*
* This struct is used to pass around the information on tables to be
* clustered. We need this so we can make a list of them when invoked without
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index e17d8c7..42a147b 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -39,8 +39,8 @@
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
-#include "optimizer/optimizer.h"
#include "nodes/makefuncs.h"
+#include "optimizer/optimizer.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
#include "parser/parse_expr.h"
@@ -58,7 +58,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
#define OCTVALUE(c) ((c) - '0')
diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c
index b7d2206..2bf7083 100644
--- a/src/backend/commands/createas.c
+++ b/src/backend/commands/createas.c
@@ -25,8 +25,8 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -51,7 +51,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
typedef struct
{
DestReceiver pub; /* publicly-known function pointers */
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 01d6621..aa03172 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -53,8 +53,8 @@
#include "replication/slot.h"
#include "storage/copydir.h"
#include "storage/fd.h"
-#include "storage/lmgr.h"
#include "storage/ipc.h"
+#include "storage/lmgr.h"
#include "storage/md.h"
#include "storage/procarray.h"
#include "storage/smgr.h"
@@ -65,7 +65,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
typedef struct
{
Oid src_dboid; /* source (template) DB */
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index 0301ae1..6b022af 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -33,11 +33,12 @@
#include "commands/extension.h"
#include "commands/trigger.h"
#include "funcapi.h"
-#include "parser/parse_func.h"
-#include "pgstat.h"
#include "lib/ilist.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
+#include "pgstat.h"
#include "tcop/deparse_utility.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/evtcache.h"
@@ -46,7 +47,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
typedef struct EventTriggerQueryState
{
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 40f1f9a..94411b5 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -34,8 +34,8 @@
#include "access/genam.h"
#include "access/htup_details.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index bae3b38..2621e36 100644
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -20,13 +20,13 @@
#include "catalog/pg_inherits.h"
#include "commands/lockcmds.h"
#include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
#include "parser/parse_clause.h"
+#include "rewrite/rewriteHandler.h"
#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "rewrite/rewriteHandler.h"
-#include "nodes/nodeFuncs.h"
static void LockTableRecurse(Oid reloid, LOCKMODE lockmode, bool nowait, Oid userid);
static AclResult LockTableAclCheck(Oid relid, LOCKMODE lockmode, Oid userid);
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index 6a1ccde..cb7a6bd 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -19,8 +19,8 @@
#include "access/genam.h"
#include "access/hash.h"
-#include "access/nbtree.h"
#include "access/htup_details.h"
+#include "access/nbtree.h"
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/catalog.h"
@@ -50,7 +50,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterOpFamilyAdd(AlterOpFamilyStmt *stmt,
Oid amoid, Oid opfamilyoid,
int maxOpNumber, int maxProcNumber,
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index 1df7662..36093dc 100644
--- a/src/backend/commands/policy.c
+++ b/src/backend/commands/policy.c
@@ -16,8 +16,8 @@
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index f115d4b..fbf11c8 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -14,29 +14,25 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/publicationcmds.h"
-
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 6cf94a3..7cf3cc1 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -21,8 +21,8 @@
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_namespace.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterSchemaOwner_internal(HeapTuple tup, Relation rel, Oid newOwnerId);
/*
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 1419195..5408edc 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -14,38 +14,30 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/subscriptioncmds.h"
-
#include "executor/executor.h"
-
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
-
#include "replication/logicallauncher.h"
#include "replication/origin.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
#include "replication/worker_internal.h"
-
#include "storage/lmgr.h"
-
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 8d25d14..97acdb1 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -20,7 +20,6 @@
#include "access/multixact.h"
#include "access/reloptions.h"
#include "access/relscan.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/tupconvert.h"
@@ -100,7 +99,6 @@
#include "utils/timestamp.h"
#include "utils/typcache.h"
-
/*
* ON COMMIT action list
*/
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 84efb41..570dcb2 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -51,8 +51,8 @@
#include <sys/stat.h>
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -84,7 +84,6 @@
#include "utils/rel.h"
#include "utils/varlena.h"
-
/* GUC variables */
char *default_tablespace = NULL;
char *temp_tablespaces = NULL;
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 1119e21..a0bd8c3 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -24,14 +24,14 @@
#include "access/xlog.h"
#include "catalog/pg_authid.h"
#include "commands/variable.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
/*
* DATESTYLE
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index bea890f..9fa433a 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -26,8 +26,8 @@
#include "parser/analyze.h"
#include "parser/parse_relation.h"
#include "rewrite/rewriteDefine.h"
-#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteHandler.h"
+#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteSupport.h"
#include "utils/acl.h"
#include "utils/builtins.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc);
/*---------------------------------------------------------------------
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 1f18e5d..779d3dc 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -28,7 +28,6 @@
#include "executor/nodeGather.h"
#include "executor/nodeGatherMerge.h"
#include "executor/nodeGroup.h"
-#include "executor/nodeGroup.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
#include "executor/nodeIndexonlyscan.h"
@@ -62,7 +61,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static bool IndexSupportsBackwardScan(Oid indexid);
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
index 0cd6f65..dbed597 100644
--- a/src/backend/executor/execExprInterp.c
+++ b/src/backend/executor/execExprInterp.c
@@ -62,22 +62,21 @@
#include "executor/execExpr.h"
#include "executor/nodeSubplan.h"
#include "funcapi.h"
-#include "utils/array.h"
-#include "utils/memutils.h"
#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
#include "parser/parsetree.h"
#include "pgstat.h"
+#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datum.h"
#include "utils/expandedrecord.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/timestamp.h"
#include "utils/typcache.h"
#include "utils/xml.h"
-
/*
* Use computed-goto-based opcode dispatch when computed gotos are available.
* But use a separate symbol so that it's easy to adjust locally in this file
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index 6349c11..7bc5e40 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -21,8 +21,8 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "miscadmin.h"
-#include "utils/lsyscache.h"
#include "utils/hashutils.h"
+#include "utils/lsyscache.h"
#include "utils/memutils.h"
static uint32 TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple);
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 53cd2fc..b256642 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -31,14 +31,15 @@
#include "executor/nodeForeignscan.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
-#include "executor/nodeIndexscan.h"
#include "executor/nodeIndexonlyscan.h"
+#include "executor/nodeIndexscan.h"
#include "executor/nodeSeqscan.h"
#include "executor/nodeSort.h"
#include "executor/nodeSubplan.h"
#include "executor/tqueue.h"
#include "jit/jit.h"
#include "nodes/nodeFuncs.h"
+#include "pgstat.h"
#include "storage/spin.h"
#include "tcop/tcopprot.h"
#include "utils/datum.h"
@@ -46,7 +47,6 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
-#include "pgstat.h"
/*
* Magic numbers for parallel executor communication. We use constants
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index c227282..7a6e285 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -113,9 +113,8 @@
#include "executor/nodeValuesscan.h"
#include "executor/nodeWindowAgg.h"
#include "executor/nodeWorktablescan.h"
-#include "nodes/nodeFuncs.h"
#include "miscadmin.h"
-
+#include "nodes/nodeFuncs.h"
static TupleTableSlot *ExecProcNodeFirst(PlanState *node);
static TupleTableSlot *ExecProcNodeInstr(PlanState *node);
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 87bc510..da43057 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -60,8 +60,8 @@
#include "access/heaptoast.h"
#include "access/htup_details.h"
#include "access/tupdesc_details.h"
-#include "funcapi.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
#include "nodes/nodeFuncs.h"
#include "storage/bufmgr.h"
#include "utils/builtins.h"
@@ -69,7 +69,6 @@
#include "utils/lsyscache.h"
#include "utils/typcache.h"
-
static TupleDesc ExecTypeFromTLInternal(List *targetList,
bool skipjunk);
static pg_attribute_always_inline void slot_deform_heap_tuple(TupleTableSlot *slot, HeapTuple tuple, uint32 *offp,
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 58c376a..6ee24ea 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -231,13 +231,12 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/datum.h"
#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/datum.h"
-
static void select_current_set(AggState *aggstate, int setno, bool is_hash);
static void initialize_phase(AggState *aggstate, int newphase);
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index f62105f..256d61a 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -49,9 +49,8 @@
#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "utils/spccache.h"
#include "utils/snapmgr.h"
-
+#include "utils/spccache.h"
static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node);
static inline void BitmapDoneInitializingSharedState(ParallelBitmapHeapState *pstate);
diff --git a/src/backend/executor/nodeCustom.c b/src/backend/executor/nodeCustom.c
index 6dd0916..ccaa68b 100644
--- a/src/backend/executor/nodeCustom.c
+++ b/src/backend/executor/nodeCustom.c
@@ -13,16 +13,15 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "executor/nodeCustom.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
#include "nodes/extensible.h"
#include "nodes/plannodes.h"
-#include "miscadmin.h"
#include "parser/parsetree.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
static TupleTableSlot *ExecCustomScan(PlanState *pstate);
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 224cbb3..d6f4eda 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -38,11 +38,10 @@
#include "pgstat.h"
#include "port/atomics.h"
#include "utils/dynahash.h"
-#include "utils/memutils.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/syscache.h"
-
static void ExecHashIncreaseNumBatches(HashJoinTable hashtable);
static void ExecHashIncreaseNumBuckets(HashJoinTable hashtable);
static void ExecParallelHashIncreaseNumBatches(HashJoinTable hashtable);
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 1991b90..2c364bd 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -32,14 +32,13 @@
#include "access/htup_details.h"
#include "executor/executor.h"
#include "executor/nodeSubplan.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "miscadmin.h"
#include "utils/array.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-
static Datum ExecHashSubPlan(SubPlanState *node,
ExprContext *econtext,
bool *isNull);
diff --git a/src/backend/executor/nodeTableFuncscan.c b/src/backend/executor/nodeTableFuncscan.c
index d264337..21cf3ca 100644
--- a/src/backend/executor/nodeTableFuncscan.c
+++ b/src/backend/executor/nodeTableFuncscan.c
@@ -22,17 +22,16 @@
*/
#include "postgres.h"
-#include "nodes/execnodes.h"
#include "executor/executor.h"
#include "executor/nodeTableFuncscan.h"
#include "executor/tablefunc.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/xml.h"
-
static TupleTableSlot *TableFuncNext(TableFuncScanState *node);
static bool TableFuncRecheck(TableFuncScanState *node, TupleTableSlot *slot);
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index b5d3f3c..f1b9407 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -46,8 +46,8 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/expandeddatum.h"
#include "utils/datum.h"
+#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/regproc.h"
diff --git a/src/backend/jit/jit.c b/src/backend/jit/jit.c
index 43e65b1..e066f72 100644
--- a/src/backend/jit/jit.c
+++ b/src/backend/jit/jit.c
@@ -17,19 +17,16 @@
*/
#include "postgres.h"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-
-#include "fmgr.h"
#include "executor/execExpr.h"
+#include "fmgr.h"
#include "jit/jit.h"
#include "miscadmin.h"
-#include "utils/resowner_private.h"
#include "utils/fmgrprotos.h"
-
+#include "utils/resowner_private.h"
/* GUCs */
bool jit_enabled = true;
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index 82c4afb..1c851e0 100644
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -13,17 +13,6 @@
#include "postgres.h"
-#include "jit/llvmjit.h"
-#include "jit/llvmjit_emit.h"
-
-#include "miscadmin.h"
-
-#include "utils/memutils.h"
-#include "utils/resowner_private.h"
-#include "portability/instr_time.h"
-#include "storage/ipc.h"
-
-
#include <llvm-c/Analysis.h>
#include <llvm-c/BitReader.h>
#include <llvm-c/BitWriter.h>
@@ -39,6 +28,13 @@
#include <llvm-c/Transforms/Utils.h>
#endif
+#include "jit/llvmjit.h"
+#include "jit/llvmjit_emit.h"
+#include "miscadmin.h"
+#include "portability/instr_time.h"
+#include "storage/ipc.h"
+#include "utils/memutils.h"
+#include "utils/resowner_private.h"
/* Handle of a module emitted via ORC JIT */
typedef struct LLVMJitHandle
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index d093246..a9d3621 100644
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -23,10 +23,10 @@
#include "access/tupconvert.h"
#include "catalog/objectaccess.h"
#include "catalog/pg_type.h"
+#include "executor/execExpr.h"
#include "executor/execdebug.h"
#include "executor/nodeAgg.h"
#include "executor/nodeSubplan.h"
-#include "executor/execExpr.h"
#include "funcapi.h"
#include "jit/llvmjit.h"
#include "jit/llvmjit_emit.h"
@@ -46,7 +46,6 @@
#include "utils/typcache.h"
#include "utils/xml.h"
-
typedef struct CompiledExprState
{
LLVMJitContext *context;
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index b90eb0a..c276207 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -32,11 +32,10 @@
#include "libpq/libpq.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "tcop/tcopprot.h"
-#include "utils/memutils.h"
#include "storage/ipc.h"
#include "storage/proc.h"
-
+#include "tcop/tcopprot.h"
+#include "utils/memutils.h"
char *ssl_library;
char *ssl_cert_file;
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 2221c04..7f59a29 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -39,10 +39,10 @@
#include "storage/fd.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/varlena.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/varlena.h"
#ifdef USE_LDAP
#ifdef WIN32
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index b655931..bcada74 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -17,14 +17,13 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "miscadmin.h"
-#include "nodes/makefuncs.h"
#include "nodes/execnodes.h"
+#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "nodes/pathnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-
static bool expression_returns_set_walker(Node *node, void *context);
static int leftmostLoc(int loc1, int loc2);
static bool fix_opfuncids_walker(Node *node, void *context);
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index a546908..3b8d2fe 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -35,8 +35,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(CX)
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index fbabe2e..3b92f42 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -32,8 +32,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(ERX)
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 4bf777d..fe02050 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -21,11 +21,10 @@
#include "optimizer/optimizer.h"
#include "optimizer/pathnode.h"
#include "optimizer/plancat.h"
+#include "statistics/statistics.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
-#include "statistics/statistics.h"
-
/*
* Data structure for accumulating info about possible range-query
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 274fea0..fa63a38 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -14,8 +14,8 @@
*/
#include "postgres.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/clauses.h"
@@ -34,7 +34,6 @@
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
-
/* These parameters are set by GUC */
int from_collapse_limit;
int join_collapse_limit;
diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c
index 9381939..974f620 100644
--- a/src/backend/optimizer/plan/planagg.c
+++ b/src/backend/optimizer/plan/planagg.c
@@ -41,13 +41,12 @@
#include "optimizer/planmain.h"
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_clause.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
static bool find_minmax_aggs_walker(Node *node, List **context);
static bool build_minmax_path(PlannerInfo *root, MinMaxAggInfo *mminfo,
Oid eqop, Oid sortop, bool nulls_first);
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 17c5f08..7fe11b5 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -31,10 +31,10 @@
#include "executor/executor.h"
#include "executor/nodeAgg.h"
#include "foreign/fdwapi.h"
-#include "miscadmin.h"
#include "jit/jit.h"
#include "lib/bipartite_match.h"
#include "lib/knapsack.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#ifdef OPTIMIZER_DEBUG
@@ -55,17 +55,16 @@
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
#include "parser/parse_agg.h"
+#include "parser/parsetree.h"
#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "storage/dsm_impl.h"
+#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/selfuncs.h"
-#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
/* GUC parameters */
double cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION;
int force_parallel_mode = FORCE_PARALLEL_OFF;
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 792ae39..0da43ef 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -47,12 +47,11 @@
#include "optimizer/optimizer.h"
#include "optimizer/prep.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteHandler.h"
#include "utils/rel.h"
-
static List *expand_targetlist(List *tlist, int command_type,
Index result_relation, Relation rel);
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 34acb73..60c93ee 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -16,8 +16,8 @@
#include <math.h>
-#include "miscadmin.h"
#include "foreign/fdwapi.h"
+#include "miscadmin.h"
#include "nodes/extensible.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/appendinfo.h"
@@ -35,7 +35,6 @@
#include "utils/memutils.h"
#include "utils/selfuncs.h"
-
typedef enum
{
COSTS_EQUAL, /* path costs are fuzzily equal */
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index e5f9e04..5e889d1 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -20,9 +20,9 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/nbtree.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/table.h"
+#include "access/tableam.h"
#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
@@ -40,9 +40,9 @@
#include "optimizer/optimizer.h"
#include "optimizer/plancat.h"
#include "optimizer/prep.h"
-#include "partitioning/partdesc.h"
#include "parser/parse_relation.h"
#include "parser/parsetree.h"
+#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "statistics/statistics.h"
#include "storage/bufmgr.h"
@@ -50,9 +50,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
-
+#include "utils/syscache.h"
/* GUC parameter */
int constraint_exclusion = CONSTRAINT_EXCLUSION_PARTITION;
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 260ccd4..fe41918 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -15,8 +15,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/nbtree.h"
#include "access/table.h"
@@ -29,12 +27,11 @@
#include "catalog/pg_constraint.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
-#include "parser/parser.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -44,14 +41,15 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/builtins.h"
-#include "utils/guc.h"
#include "utils/catcache.h"
+#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
-
+#include "utils/syscache.h"
/* Convenience macro for the most common makeNamespaceItem() case */
#define makeDefaultNSItem(rte) makeNamespaceItem(rte, true, true, false, true)
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 76f3dd7..eb91da2 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -22,6 +22,7 @@
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
+#include "parser/parse_agg.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -31,14 +32,12 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
-#include "parser/parse_agg.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/lsyscache.h"
#include "utils/timestamp.h"
#include "utils/xml.h"
-
/* GUC parameters */
bool operator_precedence_warning = false;
bool Transform_null_equals = false;
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 1baf7ef..bc832e7 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -20,17 +20,16 @@
#include "mb/pg_wchar.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_relation.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/int8.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/varbit.h"
-
static void pcb_error_callback(void *arg);
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 4dd8150..47188fc 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -26,10 +26,10 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_enr.h"
#include "parser/parse_relation.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
@@ -37,7 +37,6 @@
#include "utils/syscache.h"
#include "utils/varlena.h"
-
#define MAX_FUZZY_DISTANCE 3
static RangeTblEntry *scanNameSpaceForRefname(ParseState *pstate,
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 2901025..30d419e 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -20,19 +20,18 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_func.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/typcache.h"
-
static void markTargetListOrigin(ParseState *pstate, TargetEntry *tle,
Var *var, int levelsup);
static Node *transformAssignmentIndirection(ParseState *pstate,
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 7932a96..78fef26 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -19,14 +19,13 @@
#include "catalog/pg_type.h"
#include "lib/stringinfo.h"
#include "nodes/makefuncs.h"
-#include "parser/parser.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
static int32 typenameTypeMod(ParseState *pstate, const TypeName *typeName,
Type typ);
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index 53e3ae2..7745e8d 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -17,9 +17,8 @@
#include <ctype.h>
-#include "parser/scansup.h"
#include "mb/pg_wchar.h"
-
+#include "parser/scansup.h"
/* ----------------
* scanstr
diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c
index 4bc8810..cfb44e2 100644
--- a/src/backend/partitioning/partbounds.c
+++ b/src/backend/partitioning/partbounds.c
@@ -36,8 +36,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/snapmgr.h"
#include "utils/ruleutils.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
/*
diff --git a/src/backend/partitioning/partdesc.c b/src/backend/partitioning/partdesc.c
index b207b76..6ede084 100644
--- a/src/backend/partitioning/partdesc.c
+++ b/src/backend/partitioning/partdesc.c
@@ -25,13 +25,13 @@
#include "storage/bufmgr.h"
#include "storage/sinval.h"
#include "utils/builtins.h"
-#include "utils/inval.h"
#include "utils/fmgroids.h"
#include "utils/hsearch.h"
+#include "utils/inval.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-#include "utils/rel.h"
#include "utils/partcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
typedef struct PartitionDirectoryData
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index b66b517..5f8a007 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -14,8 +14,8 @@
#include <unistd.h>
-#include "libpq/pqsignal.h"
#include "access/parallel.h"
+#include "libpq/pqsignal.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "port/atomics.h"
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index 8ec16a3..74f8ff8 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -44,8 +44,8 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "postmaster/bgwriter.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
+#include "storage/bufmgr.h"
#include "storage/condition_variable.h"
#include "storage/fd.h"
#include "storage/ipc.h"
@@ -60,7 +60,6 @@
#include "utils/resowner.h"
#include "utils/timestamp.h"
-
/*
* GUC parameters
*/
diff --git a/src/backend/postmaster/fork_process.c b/src/backend/postmaster/fork_process.c
index a9138f5..59385c5 100644
--- a/src/backend/postmaster/fork_process.c
+++ b/src/backend/postmaster/fork_process.c
@@ -10,7 +10,6 @@
* src/backend/postmaster/fork_process.c
*/
#include "postgres.h"
-#include "postmaster/fork_process.h"
#include <fcntl.h>
#include <time.h>
@@ -21,6 +20,8 @@
#include <openssl/rand.h>
#endif
+#include "postmaster/fork_process.h"
+
#ifndef WIN32
/*
* Wrapper for fork(). Return values are the same as those for fork():
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 011076c..fabcf31 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -32,8 +32,6 @@
#include <sys/select.h>
#endif
-#include "pgstat.h"
-
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
@@ -48,6 +46,7 @@
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/autovacuum.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
@@ -69,7 +68,6 @@
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-
/* ----------
* Timer definitions.
* ----------
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index d0f210d..1fa4551 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -24,8 +24,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
#include "nodes/pg_list.h"
-#include "pgtar.h"
#include "pgstat.h"
+#include "pgtar.h"
#include "port.h"
#include "postmaster/syslogger.h"
#include "replication/basebackup.h"
@@ -42,7 +42,6 @@
#include "utils/relcache.h"
#include "utils/timestamp.h"
-
typedef struct
{
const char *label;
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 6eba08a..545d2fc 100644
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -19,14 +19,14 @@
#include <unistd.h>
#include <sys/time.h>
-#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "access/xlog.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "libpq-fe.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "pqexpbuffer.h"
#include "replication/walreceiver.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
index c53e7e2..bc532d0 100644
--- a/src/backend/replication/logical/decode.c
+++ b/src/backend/replication/logical/decode.c
@@ -31,19 +31,16 @@
#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog_internal.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-
+#include "access/xlogutils.h"
#include "catalog/pg_control.h"
-
#include "replication/decode.h"
#include "replication/logical.h"
#include "replication/message.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
#include "storage/standby.h"
typedef struct XLogRecordBuffer
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index 186057b..1f8821c 100644
--- a/src/backend/replication/logical/launcher.c
+++ b/src/backend/replication/logical/launcher.c
@@ -17,43 +17,35 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/heapam.h"
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "funcapi.h"
#include "libpq/pqsignal.h"
-
+#include "miscadmin.h"
+#include "pgstat.h"
#include "postmaster/bgworker.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
-
#include "replication/logicallauncher.h"
#include "replication/logicalworker.h"
#include "replication/slot.h"
#include "replication/walreceiver.h"
#include "replication/worker_internal.h"
-
#include "storage/ipc.h"
#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/procsignal.h"
-
#include "tcop/tcopprot.h"
-
#include "utils/memutils.h"
#include "utils/pg_lsn.h"
#include "utils/ps_status.h"
-#include "utils/timeout.h"
#include "utils/snapmgr.h"
+#include "utils/timeout.h"
/* max sleep time between cycles (3min) */
#define DEFAULT_NAPTIME_PER_CYCLE 180000L
diff --git a/src/backend/replication/logical/logical.c b/src/backend/replication/logical/logical.c
index da265f5..7e06615 100644
--- a/src/backend/replication/logical/logical.c
+++ b/src/backend/replication/logical/logical.c
@@ -28,21 +28,17 @@
#include "postgres.h"
-#include "fmgr.h"
-#include "miscadmin.h"
-
#include "access/xact.h"
#include "access/xlog_internal.h"
-
+#include "fmgr.h"
+#include "miscadmin.h"
#include "replication/decode.h"
#include "replication/logical.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
#include "storage/proc.h"
#include "storage/procarray.h"
-
#include "utils/memutils.h"
/* data for errcontext callback */
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c
index d1cf80d..aa2106b 100644
--- a/src/backend/replication/logical/logicalfuncs.c
+++ b/src/backend/replication/logical/logicalfuncs.c
@@ -17,36 +17,28 @@
#include <unistd.h>
-#include "fmgr.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
+#include "access/xact.h"
#include "access/xlog_internal.h"
#include "access/xlogutils.h"
-
-#include "access/xact.h"
-
#include "catalog/pg_type.h"
-
-#include "nodes/makefuncs.h"
-
+#include "fmgr.h"
+#include "funcapi.h"
#include "mb/pg_wchar.h"
-
+#include "miscadmin.h"
+#include "nodes/makefuncs.h"
+#include "replication/decode.h"
+#include "replication/logical.h"
+#include "replication/logicalfuncs.h"
+#include "replication/message.h"
+#include "storage/fd.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/inval.h"
+#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_lsn.h"
#include "utils/regproc.h"
#include "utils/resowner.h"
-#include "utils/lsyscache.h"
-
-#include "replication/decode.h"
-#include "replication/logical.h"
-#include "replication/logicalfuncs.h"
-#include "replication/message.h"
-
-#include "storage/fd.h"
/* private date for writing out data */
typedef struct DecodingOutputState
diff --git a/src/backend/replication/logical/message.c b/src/backend/replication/logical/message.c
index 0681cb4..1652546 100644
--- a/src/backend/replication/logical/message.c
+++ b/src/backend/replication/logical/message.c
@@ -31,17 +31,12 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/xact.h"
-
#include "catalog/indexing.h"
-
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-
-#include "replication/message.h"
#include "replication/logical.h"
-
+#include "replication/message.h"
#include "utils/memutils.h"
/*
diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c
index 07ae613..a590f9c 100644
--- a/src/backend/replication/logical/origin.c
+++ b/src/backend/replication/logical/origin.c
@@ -70,33 +70,29 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/indexing.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-
-#include "replication/origin.h"
-#include "replication/logical.h"
#include "pgstat.h"
+#include "replication/logical.h"
+#include "replication/origin.h"
+#include "storage/condition_variable.h"
+#include "storage/copydir.h"
#include "storage/fd.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
-#include "storage/condition_variable.h"
-#include "storage/copydir.h"
-
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/pg_lsn.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
* Replay progress of a single remote node.
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index 0bd1d0f..5112eca 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -120,29 +120,24 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam_xlog.h"
#include "access/transam.h"
#include "access/xact.h"
-
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "replication/logical.h"
#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
-#include "utils/builtins.h"
-#include "utils/memutils.h"
-#include "utils/snapshot.h"
-#include "utils/snapmgr.h"
-
#include "storage/block.h" /* debugging output */
#include "storage/fd.h"
#include "storage/lmgr.h"
#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/standby.h"
+#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/snapmgr.h"
+#include "utils/snapshot.h"
/*
* This struct contains the current state of the snapshot building
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
index 7881079..e01d18c 100644
--- a/src/backend/replication/logical/tablesync.c
+++ b/src/backend/replication/logical/tablesync.c
@@ -85,30 +85,23 @@
#include "postgres.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/pg_subscription_rel.h"
#include "catalog/pg_type.h"
-
#include "commands/copy.h"
-
+#include "miscadmin.h"
#include "parser/parse_relation.h"
-
+#include "pgstat.h"
#include "replication/logicallauncher.h"
#include "replication/logicalrelation.h"
#include "replication/walreceiver.h"
#include "replication/worker_internal.h"
-
-#include "utils/snapmgr.h"
#include "storage/ipc.h"
-
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/snapmgr.h"
static bool table_states_valid = false;
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index 9c08757..3483c1b 100644
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -13,16 +13,13 @@
#include "postgres.h"
#include "catalog/pg_publication.h"
-
#include "fmgr.h"
-
#include "replication/logical.h"
#include "replication/logicalproto.h"
#include "replication/origin.h"
#include "replication/pgoutput.h"
-
-#include "utils/inval.h"
#include "utils/int8.h"
+#include "utils/inval.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/varlena.h"
diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c
index 42da631..46e6dd4 100644
--- a/src/backend/replication/slotfuncs.c
+++ b/src/backend/replication/slotfuncs.c
@@ -17,9 +17,9 @@
#include "funcapi.h"
#include "miscadmin.h"
#include "replication/decode.h"
-#include "replication/slot.h"
#include "replication/logical.h"
#include "replication/logicalfuncs.h"
+#include "replication/slot.h"
#include "utils/builtins.h"
#include "utils/inval.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c
index 1c44714..df7bde3 100644
--- a/src/backend/rewrite/rowsecurity.c
+++ b/src/backend/rewrite/rowsecurity.c
@@ -51,12 +51,12 @@
#include "rewrite/rewriteHandler.h"
#include "rewrite/rewriteManip.h"
#include "rewrite/rowsecurity.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/rls.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
static void get_policies_for_relation(Relation relation,
CmdType cmd, Oid user_id,
diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 585cad2..9493b2d 100644
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -20,10 +20,10 @@
#include "catalog/pg_statistic_ext_data.h"
#include "lib/stringinfo.h"
#include "nodes/nodeFuncs.h"
-#include "optimizer/clauses.h"
-#include "optimizer/optimizer.h"
#include "nodes/nodes.h"
#include "nodes/pathnodes.h"
+#include "optimizer/clauses.h"
+#include "optimizer/optimizer.h"
#include "statistics/extended_stats_internal.h"
#include "statistics/statistics.h"
#include "utils/bytea.h"
diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c
index f3383c0..4ccfc5f 100644
--- a/src/backend/statistics/mvdistinct.c
+++ b/src/backend/statistics/mvdistinct.c
@@ -28,14 +28,13 @@
#include "access/htup_details.h"
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_statistic_ext_data.h"
+#include "lib/stringinfo.h"
+#include "statistics/extended_stats_internal.h"
+#include "statistics/statistics.h"
#include "utils/fmgrprotos.h"
#include "utils/lsyscache.h"
-#include "lib/stringinfo.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "statistics/extended_stats_internal.h"
-#include "statistics/statistics.h"
-
static double ndistinct_for_combination(double totalrows, int numrows,
HeapTuple *rows, VacAttrStats **stats,
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index ccd2c31..1eb08cd 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -14,9 +14,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
-
+#include "storage/bufmgr.h"
BufferDescPadded *BufferDescriptors;
char *BufferBlocks;
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index e546585..7e44b51 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -21,9 +21,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
-
+#include "storage/bufmgr.h"
/* entry for buffer lookup hashtable */
typedef struct
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index b40e6f3..440ff77 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -45,9 +45,9 @@
#include "executor/instrument.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "storage/fd.h"
-#include "storage/buffile.h"
#include "storage/buf_internals.h"
+#include "storage/buffile.h"
+#include "storage/fd.h"
#include "utils/resowner.h"
/*
diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c
index ca1c9cd..c94ce5b 100644
--- a/src/backend/storage/file/copydir.c
+++ b/src/backend/storage/file/copydir.c
@@ -22,10 +22,10 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "storage/copydir.h"
-#include "storage/fd.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "storage/copydir.h"
+#include "storage/fd.h"
/*
* copydir: copy a directory
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index fe2bb8f..f18bcb2 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -79,11 +79,11 @@
#include <sys/resource.h> /* for getrlimit */
#endif
-#include "miscadmin.h"
#include "access/xact.h"
#include "access/xlog.h"
#include "catalog/pg_tablespace.h"
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "portability/mem.h"
#include "storage/fd.h"
@@ -91,7 +91,6 @@
#include "utils/guc.h"
#include "utils/resowner_private.h"
-
/* Define PG_FLUSH_DATA_WORKS if we have an implementation for pg_flush_data */
#if defined(HAVE_SYNC_FILE_RANGE)
#define PG_FLUSH_DATA_WORKS 1
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
index 2879b84..d550093 100644
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -47,7 +47,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include <fcntl.h>
#include <unistd.h>
@@ -61,15 +60,16 @@
#ifdef HAVE_SYS_SHM_H
#include <sys/shm.h>
#endif
+
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "portability/mem.h"
+#include "postmaster/postmaster.h"
#include "storage/dsm_impl.h"
#include "storage/fd.h"
#include "utils/guc.h"
#include "utils/memutils.h"
-#include "postmaster/postmaster.h"
#ifdef USE_DSM_POSIX
static bool dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 8853706..4829953 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -29,10 +29,10 @@
#include "postmaster/bgwriter.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
+#include "replication/origin.h"
#include "replication/slot.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
-#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/dsm.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 7605b2c..fde97a1 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -21,14 +21,13 @@
#include "commands/async.h"
#include "miscadmin.h"
#include "replication/walsender.h"
-#include "storage/latch.h"
#include "storage/ipc.h"
+#include "storage/latch.h"
#include "storage/proc.h"
#include "storage/shmem.h"
#include "storage/sinval.h"
#include "tcop/tcopprot.h"
-
/*
* The SIGUSR1 signal is multiplexed to support signalling multiple event
* types. The specific reason is communicated via flags in shared memory.
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index db080c8..0c58b39 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -17,6 +17,7 @@
#include <signal.h>
#include <unistd.h>
+#include "access/transam.h"
#include "miscadmin.h"
#include "storage/backendid.h"
#include "storage/ipc.h"
@@ -25,8 +26,6 @@
#include "storage/shmem.h"
#include "storage/sinvaladt.h"
#include "storage/spin.h"
-#include "access/transam.h"
-
/*
* Conceptually, the shared cache invalidation messages are stored in an
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index fb0bf44..18e3843 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -77,8 +77,8 @@
#include "postgres.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/postmaster.h"
#include "replication/slot.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index b3c54a6..fff0628 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -45,7 +45,6 @@
#include "replication/syncrep.h"
#include "replication/walsender.h"
#include "storage/condition_variable.h"
-#include "storage/standby.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
#include "storage/pmsignal.h"
@@ -53,10 +52,10 @@
#include "storage/procarray.h"
#include "storage/procsignal.h"
#include "storage/spin.h"
+#include "storage/standby.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-
/* GUC variables */
int DeadlockTimeout = 1000;
int StatementTimeout = 0;
diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
index 2e6c55b..04befb7 100644
--- a/src/backend/storage/lmgr/s_lock.c
+++ b/src/backend/storage/lmgr/s_lock.c
@@ -50,9 +50,8 @@
#include <time.h>
#include <unistd.h>
-#include "storage/s_lock.h"
#include "port/atomics.h"
-
+#include "storage/s_lock.h"
#define MIN_SPINS_PER_DELAY 10
#define MAX_SPINS_PER_DELAY 1000
diff --git a/src/backend/storage/page/checksum.c b/src/backend/storage/page/checksum.c
index 1eb7ef6..8f7a110 100644
--- a/src/backend/storage/page/checksum.c
+++ b/src/backend/storage/page/checksum.c
@@ -14,7 +14,6 @@
#include "postgres.h"
#include "storage/checksum.h"
-
/*
* The actual code is in storage/checksum_impl.h. This is done so that
* external programs can incorporate the checksum code by #include'ing
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 07f3c93..8a9eaf6 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -25,21 +25,21 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "postmaster/bgwriter.h"
-#include "storage/fd.h"
#include "storage/bufmgr.h"
+#include "storage/fd.h"
#include "storage/md.h"
#include "storage/relfilenode.h"
#include "storage/smgr.h"
#include "storage/sync.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/*
* The magnetic disk storage manager keeps track of open file
diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
index f329c3f..3485e6f 100644
--- a/src/backend/storage/sync/sync.c
+++ b/src/backend/storage/sync/sync.c
@@ -18,19 +18,19 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "pgstat.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pgstat.h"
#include "portability/instr_time.h"
#include "postmaster/bgwriter.h"
#include "storage/bufmgr.h"
#include "storage/ipc.h"
#include "storage/md.h"
#include "utils/hsearch.h"
-#include "utils/memutils.h"
#include "utils/inval.h"
+#include "utils/memutils.h"
static MemoryContext pendingOpsCxt; /* context for the pending ops state */
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 4bec40a..1bf8b51 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -47,14 +47,15 @@
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
#include "libpq/pqsignal.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "nodes/print.h"
#include "optimizer/optimizer.h"
-#include "pgstat.h"
-#include "pg_trace.h"
#include "parser/analyze.h"
#include "parser/parser.h"
#include "pg_getopt.h"
+#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/autovacuum.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
@@ -77,8 +78,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "mb/pg_wchar.h"
-
/* ----------------
* global variables
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index f2269ad..dc04199 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -28,8 +28,8 @@
#include "commands/alter.h"
#include "commands/async.h"
#include "commands/cluster.h"
-#include "commands/comment.h"
#include "commands/collationcmds.h"
+#include "commands/comment.h"
#include "commands/conversioncmds.h"
#include "commands/copy.h"
#include "commands/createas.h"
@@ -39,8 +39,8 @@
#include "commands/event_trigger.h"
#include "commands/explain.h"
#include "commands/extension.h"
-#include "commands/matview.h"
#include "commands/lockcmds.h"
+#include "commands/matview.h"
#include "commands/policy.h"
#include "commands/portalcmds.h"
#include "commands/prepare.h"
@@ -68,9 +68,8 @@
#include "utils/acl.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
-
+#include "utils/syscache.h"
/* Hook for plugins to get control in ProcessUtility() */
ProcessUtility_hook_type ProcessUtility_hook = NULL;
diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c
index a3372a8..083292c 100644
--- a/src/backend/tsearch/wparser.c
+++ b/src/backend/tsearch/wparser.c
@@ -13,17 +13,16 @@
*/
#include "postgres.h"
-#include "funcapi.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "funcapi.h"
#include "tsearch/ts_cache.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/jsonapi.h"
#include "utils/varlena.h"
-
/******sql-level interface******/
typedef struct
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index d7e6100..0070a7e 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -19,10 +19,10 @@
#include "access/htup_details.h"
#include "catalog/catalog.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/proclang.h"
#include "commands/tablespace.h"
@@ -40,7 +40,6 @@
#include "utils/syscache.h"
#include "utils/varlena.h"
-
typedef struct
{
const char *name;
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index e38bd93..c911d72 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -31,7 +31,6 @@
#include "utils/memutils.h"
#include "utils/tzparser.h"
-
static int DecodeNumber(int flen, char *field, bool haveTextMonth,
int fmask, int *tmask,
struct pg_tm *tm, fsec_t *fsec, bool *is2digits);
diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c
index 6ae2a31..b6befd6 100644
--- a/src/backend/utils/adt/format_type.c
+++ b/src/backend/utils/adt/format_type.c
@@ -20,11 +20,11 @@
#include "access/htup_details.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/numeric.h"
#include "utils/syscache.h"
-#include "mb/pg_wchar.h"
static char *printTypmod(const char *typname, int32 typmod, Oid typmodout);
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 0ff9394..5a558fb 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -23,9 +23,8 @@
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "optimizer/optimizer.h"
-#include "utils/int8.h"
#include "utils/builtins.h"
-
+#include "utils/int8.h"
#define MAXINT8LEN 25
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index d4ba3bd..e2e16eb 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -27,11 +27,11 @@
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
-#include "utils/typcache.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
+#include "utils/typcache.h"
/*
* The context of the parser is maintained by the recursive descent
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 74b4bbe..9927d08 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -12,20 +12,20 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/transam.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
#include "utils/jsonb.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index e2c1bfb..fb5947a 100644
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -66,18 +66,17 @@
#include "miscadmin.h"
#include "regex/regex.h"
#include "utils/builtins.h"
+#include "utils/date.h"
#include "utils/datetime.h"
#include "utils/datum.h"
-#include "utils/formatting.h"
#include "utils/float.h"
+#include "utils/formatting.h"
#include "utils/guc.h"
#include "utils/json.h"
#include "utils/jsonpath.h"
-#include "utils/date.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-
/*
* Represents "base object" and it's "id" for .keyvalue() evaluation.
*/
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index d330a88..27474a6 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -29,18 +29,17 @@
#include "common/keywords.h"
#include "funcapi.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "parser/scansup.h"
+#include "pgstat.h"
#include "postmaster/syslogger.h"
#include "rewrite/rewriteHandler.h"
#include "storage/fd.h"
-#include "utils/lsyscache.h"
-#include "utils/ruleutils.h"
#include "tcop/tcopprot.h"
#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/ruleutils.h"
#include "utils/timestamp.h"
-
/*
* Common subroutine for num_nulls() and num_nonnulls().
* Returns true if successful, false if function should return NULL.
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index 0fdfee5..9557732 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -16,10 +16,9 @@
#include "postgres.h"
#include "common/int.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/formatting.h"
-#include "mb/pg_wchar.h"
-
static text *dotrim(const char *string, int stringlen,
const char *set, int setlen,
diff --git a/src/backend/utils/adt/rangetypes_gist.c b/src/backend/utils/adt/rangetypes_gist.c
index cf73f4d..96b22b7 100644
--- a/src/backend/utils/adt/rangetypes_gist.c
+++ b/src/backend/utils/adt/rangetypes_gist.c
@@ -16,12 +16,11 @@
#include "access/gist.h"
#include "access/stratnum.h"
+#include "utils/datum.h"
#include "utils/float.h"
#include "utils/fmgrprotos.h"
-#include "utils/datum.h"
#include "utils/rangetypes.h"
-
/*
* Range class properties used to segregate different classes of ranges in
* GiST. Each unique combination of properties is a class. CLS_EMPTY cannot
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 17a7f6c..4b1decf 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -33,11 +33,11 @@
#include "miscadmin.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
-#include "utils/acl.h"
#include "utils/regproc.h"
+#include "utils/syscache.h"
#include "utils/varlena.h"
static char *format_operator_internal(Oid operator_oid, bool force_qualify);
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index fb477d4..d4282a3 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -36,9 +36,9 @@
#include "executor/executor.h"
#include "executor/spi.h"
#include "lib/ilist.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "parser/parse_relation.h"
-#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "utils/acl.h"
#include "utils/builtins.h"
@@ -54,7 +54,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
/*
* Local definitions
*/
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 3e64390..c1de869 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -50,9 +50,9 @@
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
-#include "parser/parse_node.h"
#include "parser/parse_agg.h"
#include "parser/parse_func.h"
+#include "parser/parse_node.h"
#include "parser/parse_oper.h"
#include "parser/parser.h"
#include "parser/parsetree.h"
@@ -74,7 +74,6 @@
#include "utils/varlena.h"
#include "utils/xml.h"
-
/* ----------
* Pretty formatting constants
* ----------
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index ab2b49f..4f574b3 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -16,8 +16,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_locale.h"
+#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
index af07563..217de77 100644
--- a/src/backend/utils/adt/tsquery_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -15,8 +15,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
typedef struct NODE
{
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
index 91200ee..282fb2d 100644
--- a/src/backend/utils/adt/tsquery_gist.c
+++ b/src/backend/utils/adt/tsquery_gist.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "access/stratnum.h"
#include "access/gist.h"
+#include "access/stratnum.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
index de46a00..7cb19db 100644
--- a/src/backend/utils/adt/tsquery_util.c
+++ b/src/backend/utils/adt/tsquery_util.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
/*
* Build QTNode tree for a tsquery given in QueryItem array format.
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
index e28859d..2d8359d 100644
--- a/src/backend/utils/adt/tsrank.c
+++ b/src/backend/utils/adt/tsrank.c
@@ -16,11 +16,10 @@
#include <limits.h>
#include <math.h>
+#include "miscadmin.h"
#include "tsearch/ts_utils.h"
#include "utils/array.h"
#include "utils/builtins.h"
-#include "miscadmin.h"
-
static const float weights[] = {0.1f, 0.2f, 0.4f, 1.0f};
diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c
index 90b2c9b..d346324 100644
--- a/src/backend/utils/adt/txid.c
+++ b/src/backend/utils/adt/txid.c
@@ -26,15 +26,14 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "funcapi.h"
-#include "miscadmin.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "postmaster/postmaster.h"
#include "storage/lwlock.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
-
/* txid will be signed int8 in database, so must limit to 63 bits */
#define MAX_TXID ((uint64) PG_INT64_MAX)
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index e63a4e5..2aed411 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -18,6 +18,7 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "libpq/pqformat.h"
+#include "mb/pg_wchar.h"
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "utils/array.h"
@@ -26,8 +27,6 @@
#include "utils/lsyscache.h"
#include "utils/pg_locale.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
-
/* common code for bpchartypmodin and varchartypmodin */
static int32
diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c
index 419bde5..1b0f738 100644
--- a/src/backend/utils/cache/evtcache.c
+++ b/src/backend/utils/cache/evtcache.c
@@ -16,17 +16,17 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/indexing.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_type.h"
#include "commands/trigger.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/evtcache.h"
+#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/memutils.h"
-#include "utils/hsearch.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 585dcee..ad1ff01 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -47,8 +47,8 @@
#include "catalog/pg_am.h"
#include "catalog/pg_amproc.h"
#include "catalog/pg_attrdef.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_database.h"
#include "catalog/pg_namespace.h"
@@ -90,7 +90,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
#define RELCACHE_INIT_FILEMAGIC 0x573266 /* version ID value */
/*
diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c
index c506dc9..d244eaf 100644
--- a/src/backend/utils/cache/relfilenodemap.c
+++ b/src/backend/utils/cache/relfilenodemap.c
@@ -22,9 +22,9 @@
#include "miscadmin.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
-#include "utils/fmgroids.h"
#include "utils/rel.h"
#include "utils/relfilenodemap.h"
#include "utils/relmapper.h"
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 16297a5..18eb440 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -53,13 +53,13 @@
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
#include "catalog/pg_range.h"
+#include "catalog/pg_replication_origin.h"
#include "catalog/pg_rewrite.h"
#include "catalog/pg_seclabel.h"
#include "catalog/pg_sequence.h"
#include "catalog/pg_shdepend.h"
#include "catalog/pg_shdescription.h"
#include "catalog/pg_shseclabel.h"
-#include "catalog/pg_replication_origin.h"
#include "catalog/pg_statistic.h"
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_statistic_ext_data.h"
@@ -74,11 +74,10 @@
#include "catalog/pg_ts_template.h"
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
-#include "utils/rel.h"
#include "utils/catcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
-
/*---------------------------------------------------------------------------
Adding system caches:
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 29c5ec7..cc38669 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -46,9 +46,9 @@
#include "storage/fd.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
+#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/procsignal.h"
-#include "storage/proc.h"
#include "storage/sinvaladt.h"
#include "storage/smgr.h"
#include "storage/sync.h"
@@ -64,7 +64,6 @@
#include "utils/syscache.h"
#include "utils/timeout.h"
-
static HeapTuple GetDatabaseTuple(const char *dbname);
static HeapTuple GetDatabaseTupleByOid(Oid dboid);
static void PerformAuthentication(Port *port);
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
index 10222d5..d253678 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
@@ -12,12 +12,13 @@
*/
#include "postgres.h"
+
#include "fmgr.h"
#include "mb/pg_wchar.h"
-#include "../../Unicode/utf8_to_koi8r.map"
#include "../../Unicode/koi8r_to_utf8.map"
-#include "../../Unicode/utf8_to_koi8u.map"
#include "../../Unicode/koi8u_to_utf8.map"
+#include "../../Unicode/utf8_to_koi8r.map"
+#include "../../Unicode/utf8_to_koi8u.map"
PG_MODULE_MAGIC;
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
index e33ca42..34ddcba 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
@@ -12,12 +12,14 @@
*/
#include "postgres.h"
+
#include "fmgr.h"
#include "mb/pg_wchar.h"
#include "../../Unicode/iso8859_10_to_utf8.map"
#include "../../Unicode/iso8859_13_to_utf8.map"
#include "../../Unicode/iso8859_14_to_utf8.map"
#include "../../Unicode/iso8859_15_to_utf8.map"
+#include "../../Unicode/iso8859_16_to_utf8.map"
#include "../../Unicode/iso8859_2_to_utf8.map"
#include "../../Unicode/iso8859_3_to_utf8.map"
#include "../../Unicode/iso8859_4_to_utf8.map"
@@ -39,7 +41,6 @@
#include "../../Unicode/utf8_to_iso8859_7.map"
#include "../../Unicode/utf8_to_iso8859_8.map"
#include "../../Unicode/utf8_to_iso8859_9.map"
-#include "../../Unicode/iso8859_16_to_utf8.map"
PG_MODULE_MAGIC;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 31a5ef0..0364709 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -38,10 +38,10 @@
#include "catalog/pg_authid.h"
#include "commands/async.h"
#include "commands/prepare.h"
+#include "commands/trigger.h"
#include "commands/user.h"
#include "commands/vacuum.h"
#include "commands/variable.h"
-#include "commands/trigger.h"
#include "common/string.h"
#include "funcapi.h"
#include "jit/jit.h"
@@ -72,18 +72,18 @@
#include "replication/walsender.h"
#include "storage/bufmgr.h"
#include "storage/dsm_impl.h"
-#include "storage/standby.h"
#include "storage/fd.h"
#include "storage/large_object.h"
#include "storage/pg_shmem.h"
-#include "storage/proc.h"
#include "storage/predicate.h"
+#include "storage/proc.h"
+#include "storage/standby.h"
#include "tcop/tcopprot.h"
#include "tsearch/ts_cache.h"
#include "utils/builtins.h"
#include "utils/bytea.h"
-#include "utils/guc_tables.h"
#include "utils/float.h"
+#include "utils/guc_tables.h"
#include "utils/memutils.h"
#include "utils/pg_locale.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index 2d17839..8cab0e1 100644
--- a/src/backend/utils/misc/pg_config.c
+++ b/src/backend/utils/misc/pg_config.c
@@ -14,12 +14,12 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
#include "catalog/pg_type.h"
#include "common/config_info.h"
-#include "utils/builtins.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "port.h"
+#include "utils/builtins.h"
Datum
pg_config(PG_FUNCTION_ARGS)
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index b429218..3d0916f 100644
--- a/src/backend/utils/misc/pg_controldata.c
+++ b/src/backend/utils/misc/pg_controldata.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/transam.h"
-#include "access/xlog_internal.h"
#include "access/xlog.h"
+#include "access/xlog_internal.h"
#include "catalog/pg_control.h"
#include "catalog/pg_type.h"
#include "common/controldata_utils.h"
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index 67ba95c..6c851dd 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -28,8 +28,8 @@
#include "libpq/libpq.h"
#include "miscadmin.h"
-#include "utils/ps_status.h"
#include "utils/guc.h"
+#include "utils/ps_status.h"
extern char **environ;
bool update_process_title = true;
diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 5636081..327dca6 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -22,10 +22,9 @@
#include "access/htup_details.h"
#include "catalog/pg_authid.h"
+#include "miscadmin.h"
#include "utils/inval.h"
#include "utils/syscache.h"
-#include "miscadmin.h"
-
/*
* In common cases the same roleid (ie, the session or current ID) will
diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c
index 50deb35..db1dac3 100644
--- a/src/backend/utils/mmgr/slab.c
+++ b/src/backend/utils/mmgr/slab.c
@@ -52,10 +52,9 @@
#include "postgres.h"
+#include "lib/ilist.h"
#include "utils/memdebug.h"
#include "utils/memutils.h"
-#include "lib/ilist.h"
-
/*
* SlabContext is a specialized implementation of MemoryContext.
diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c
index deb9af5..16d464d 100644
--- a/src/backend/utils/time/combocid.c
+++ b/src/backend/utils/time/combocid.c
@@ -41,15 +41,14 @@
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/xact.h"
+#include "miscadmin.h"
#include "storage/shmem.h"
#include "utils/combocid.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-
/* Hash table to lookup combo cids by cmin and cmax */
static HTAB *comboHash = NULL;
--
1.8.3.1
Re: Ordering of header file inclusion
On Sat, Nov 2, 2019 at 7:42 AM vignesh C <vignesh21@gmail.com> wrote:
Thanks Amit for committing the changes.
I found couple of more inconsistencies, the attached patch includes
the fix for the same.
Thanks for the patch. It seems you've to rebase the patch as it
doesn't apply on the latest HEAD. Apart from that, the changes looks
good to me.
--
Thanks & Regards,
Kuntal Ghosh
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Fri, Nov 8, 2019 at 2:22 PM Kuntal Ghosh <kuntalghosh.2007@gmail.com> wrote:
On Sat, Nov 2, 2019 at 7:42 AM vignesh C <vignesh21@gmail.com> wrote:
Thanks Amit for committing the changes.
I found couple of more inconsistencies, the attached patch includes
the fix for the same.Thanks for the patch. It seems you've to rebase the patch as it
doesn't apply on the latest HEAD. Apart from that, the changes looks
good to me.
Thanks Kuntal for reviewing the patch. I have attached the patch which
has been rebased on the latest HEAD.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Attachments:
0001-Make-the-order-of-the-header-file-includes-consistent-backend-nov10th.patchtext/x-patch; charset=UTF-8; name=0001-Make-the-order-of-the-header-file-includes-consistent-backend-nov10th.patchDownload
From 9377ef563e2d02d8d6829b05ee45ff8fa5721411 Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Sun, 10 Nov 2019 17:26:08 +0530
Subject: [PATCH] Make the order of the header file includes consistent in
backend modules.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The basic rule we follow here is to always first include 'postgres.h' or
'postgres_fe.h' whichever is applicable, then system header includes and
then Postgres header includes. In this, we also follow that all the
Postgres header includes are in order based on their ASCII value. We
generally follow these rules, but the code has deviated in many places.
This commit makes it consistent for backend modules.
Author: Vignesh C
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
---
src/backend/access/brin/brin_minmax.c | 5 ++--
src/backend/access/brin/brin_pageops.c | 3 +--
src/backend/access/brin/brin_tuple.c | 3 +--
src/backend/access/brin/brin_validate.c | 3 +--
src/backend/access/gin/ginbtree.c | 2 +-
src/backend/access/gin/ginfast.c | 10 ++++----
src/backend/access/gin/gininsert.c | 5 ++--
src/backend/access/gin/ginvalidate.c | 3 +--
src/backend/access/gist/gist.c | 3 +--
src/backend/access/gist/gistget.c | 4 +--
src/backend/access/gist/gistutil.c | 5 ++--
src/backend/access/hash/hash.c | 2 --
src/backend/access/hash/hash_xlog.c | 6 ++---
src/backend/access/hash/hashinsert.c | 4 +--
src/backend/access/hash/hashpage.c | 3 +--
src/backend/access/hash/hashsearch.c | 2 +-
src/backend/access/hash/hashutil.c | 2 +-
src/backend/access/heap/heapam_handler.c | 5 +---
src/backend/access/heap/pruneheap.c | 4 +--
src/backend/access/heap/rewriteheap.c | 12 ++-------
src/backend/access/nbtree/nbtxlog.c | 2 +-
src/backend/access/spgist/spgquadtreeproc.c | 3 +--
src/backend/access/transam/clog.c | 2 +-
src/backend/access/transam/parallel.c | 3 +--
src/backend/access/transam/rmgr.c | 4 +--
src/backend/access/transam/slru.c | 3 +--
src/backend/access/transam/twophase.c | 3 +--
src/backend/access/transam/xact.c | 3 +--
src/backend/access/transam/xlog.c | 6 ++---
src/backend/access/transam/xlogfuncs.c | 7 +++--
src/backend/access/transam/xloginsert.c | 2 +-
src/backend/access/transam/xlogreader.c | 3 +--
src/backend/catalog/aclchk.c | 5 ++--
src/backend/catalog/catalog.c | 3 +--
src/backend/catalog/index.c | 7 +++--
src/backend/catalog/objectaddress.c | 10 ++++----
src/backend/catalog/partition.c | 3 +--
src/backend/catalog/pg_enum.c | 3 +--
src/backend/catalog/pg_publication.c | 9 +++----
src/backend/catalog/pg_shdepend.c | 7 +++--
src/backend/catalog/pg_subscription.c | 10 ++------
src/backend/catalog/pg_type.c | 2 +-
src/backend/catalog/storage.c | 3 +--
src/backend/commands/alter.c | 5 ++--
src/backend/commands/cluster.c | 5 ++--
src/backend/commands/copy.c | 3 +--
src/backend/commands/createas.c | 3 +--
src/backend/commands/dbcommands.c | 3 +--
src/backend/commands/event_trigger.c | 6 ++---
src/backend/commands/functioncmds.c | 2 +-
src/backend/commands/lockcmds.c | 4 +--
src/backend/commands/opclasscmds.c | 3 +--
src/backend/commands/policy.c | 2 +-
src/backend/commands/publicationcmds.c | 10 +++-----
src/backend/commands/schemacmds.c | 3 +--
src/backend/commands/subscriptioncmds.c | 12 ++-------
src/backend/commands/tablecmds.c | 2 --
src/backend/commands/tablespace.c | 3 +--
src/backend/commands/variable.c | 4 +--
src/backend/commands/view.c | 3 +--
src/backend/executor/execAmi.c | 2 --
src/backend/executor/execExprInterp.c | 5 ++--
src/backend/executor/execGrouping.c | 2 +-
src/backend/executor/execParallel.c | 4 +--
src/backend/executor/execProcnode.c | 3 +--
src/backend/executor/execTuples.c | 3 +--
src/backend/executor/nodeAgg.c | 3 +--
src/backend/executor/nodeBitmapHeapscan.c | 3 +--
src/backend/executor/nodeCustom.c | 3 +--
src/backend/executor/nodeHash.c | 3 +--
src/backend/executor/nodeSubplan.c | 3 +--
src/backend/executor/nodeTableFuncscan.c | 3 +--
src/backend/executor/nodeWindowAgg.c | 2 +-
src/backend/jit/jit.c | 7 ++---
src/backend/jit/llvm/llvmjit.c | 18 +++++--------
src/backend/jit/llvm/llvmjit_expr.c | 3 +--
src/backend/libpq/be-secure.c | 5 ++--
src/backend/libpq/hba.c | 2 +-
src/backend/nodes/nodeFuncs.c | 3 +--
src/backend/optimizer/geqo/geqo_cx.c | 2 +-
src/backend/optimizer/geqo/geqo_erx.c | 2 +-
src/backend/optimizer/path/clausesel.c | 3 +--
src/backend/optimizer/plan/initsplan.c | 3 +--
src/backend/optimizer/plan/planagg.c | 3 +--
src/backend/optimizer/plan/planner.c | 7 +++--
src/backend/optimizer/prep/preptlist.c | 3 +--
src/backend/optimizer/util/pathnode.c | 3 +--
src/backend/optimizer/util/plancat.c | 7 +++--
src/backend/parser/parse_clause.c | 12 ++++-----
src/backend/parser/parse_expr.c | 3 +--
src/backend/parser/parse_node.c | 3 +--
src/backend/parser/parse_relation.c | 3 +--
src/backend/parser/parse_target.c | 3 +--
src/backend/parser/parse_type.c | 3 +--
src/backend/parser/scansup.c | 3 +--
src/backend/partitioning/partbounds.c | 2 +-
src/backend/partitioning/partdesc.c | 4 +--
src/backend/postmaster/bgworker.c | 2 +-
src/backend/postmaster/bgwriter.c | 3 +--
src/backend/postmaster/fork_process.c | 3 ++-
src/backend/postmaster/pgstat.c | 4 +--
src/backend/replication/basebackup.c | 3 +--
.../libpqwalreceiver/libpqwalreceiver.c | 4 +--
src/backend/replication/logical/decode.c | 7 ++---
src/backend/replication/logical/launcher.c | 16 +++---------
src/backend/replication/logical/logical.c | 10 +++-----
src/backend/replication/logical/logicalfuncs.c | 30 ++++++++--------------
src/backend/replication/logical/message.c | 9 ++-----
src/backend/replication/logical/origin.c | 18 +++++--------
src/backend/replication/logical/snapbuild.c | 15 ++++-------
src/backend/replication/logical/tablesync.c | 13 +++-------
src/backend/replication/pgoutput/pgoutput.c | 5 +---
src/backend/replication/slotfuncs.c | 2 +-
src/backend/rewrite/rowsecurity.c | 2 +-
src/backend/statistics/dependencies.c | 4 +--
src/backend/statistics/mvdistinct.c | 7 +++--
src/backend/storage/buffer/buf_init.c | 3 +--
src/backend/storage/buffer/buf_table.c | 3 +--
src/backend/storage/file/buffile.c | 4 +--
src/backend/storage/file/copydir.c | 4 +--
src/backend/storage/file/fd.c | 3 +--
src/backend/storage/ipc/dsm_impl.c | 6 ++---
src/backend/storage/ipc/ipci.c | 2 +-
src/backend/storage/ipc/procsignal.c | 3 +--
src/backend/storage/ipc/sinvaladt.c | 3 +--
src/backend/storage/lmgr/lwlock.c | 2 +-
src/backend/storage/lmgr/proc.c | 3 +--
src/backend/storage/lmgr/s_lock.c | 3 +--
src/backend/storage/page/checksum.c | 1 -
src/backend/storage/smgr/md.c | 8 +++---
src/backend/storage/sync/sync.c | 8 +++---
src/backend/tcop/postgres.c | 7 +++--
src/backend/tcop/utility.c | 7 +++--
src/backend/tsearch/wparser.c | 3 +--
src/backend/utils/adt/acl.c | 5 ++--
src/backend/utils/adt/datetime.c | 1 -
src/backend/utils/adt/format_type.c | 2 +-
src/backend/utils/adt/int8.c | 3 +--
src/backend/utils/adt/json.c | 4 +--
src/backend/utils/adt/jsonb.c | 4 +--
src/backend/utils/adt/jsonpath_exec.c | 5 ++--
src/backend/utils/adt/misc.c | 7 +++--
src/backend/utils/adt/oracle_compat.c | 3 +--
src/backend/utils/adt/rangetypes_gist.c | 3 +--
src/backend/utils/adt/regproc.c | 4 +--
src/backend/utils/adt/ri_triggers.c | 3 +--
src/backend/utils/adt/ruleutils.c | 3 +--
src/backend/utils/adt/tsquery.c | 2 +-
src/backend/utils/adt/tsquery_cleanup.c | 2 +-
src/backend/utils/adt/tsquery_gist.c | 2 +-
src/backend/utils/adt/tsquery_util.c | 2 +-
src/backend/utils/adt/tsrank.c | 3 +--
src/backend/utils/adt/txid.c | 3 +--
src/backend/utils/adt/varchar.c | 3 +--
src/backend/utils/cache/evtcache.c | 4 +--
src/backend/utils/cache/relcache.c | 3 +--
src/backend/utils/cache/relfilenodemap.c | 2 +-
src/backend/utils/cache/syscache.c | 5 ++--
src/backend/utils/init/postinit.c | 3 +--
.../utf8_and_cyrillic/utf8_and_cyrillic.c | 5 ++--
.../utf8_and_iso8859/utf8_and_iso8859.c | 3 ++-
src/backend/utils/misc/guc.c | 8 +++---
src/backend/utils/misc/pg_config.c | 6 ++---
src/backend/utils/misc/pg_controldata.c | 2 +-
src/backend/utils/misc/ps_status.c | 2 +-
src/backend/utils/misc/superuser.c | 3 +--
src/backend/utils/mmgr/slab.c | 3 +--
src/backend/utils/time/combocid.c | 3 +--
168 files changed, 286 insertions(+), 468 deletions(-)
diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c
index ad0d18e..655c0b5 100644
--- a/src/backend/access/brin/brin_minmax.c
+++ b/src/backend/access/brin/brin_minmax.c
@@ -10,19 +10,18 @@
*/
#include "postgres.h"
-#include "access/genam.h"
#include "access/brin_internal.h"
#include "access/brin_tuple.h"
+#include "access/genam.h"
#include "access/stratnum.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_amop.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/datum.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-
typedef struct MinmaxOpaque
{
Oid cached_subtype;
diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c
index f907b4b..c4cbe84 100644
--- a/src/backend/access/brin/brin_pageops.c
+++ b/src/backend/access/brin/brin_pageops.c
@@ -10,8 +10,8 @@
*/
#include "postgres.h"
-#include "access/brin_pageops.h"
#include "access/brin_page.h"
+#include "access/brin_pageops.h"
#include "access/brin_revmap.h"
#include "access/brin_xlog.h"
#include "access/xloginsert.h"
@@ -22,7 +22,6 @@
#include "storage/smgr.h"
#include "utils/rel.h"
-
/*
* Maximum size of an entry in a BRIN_PAGETYPE_REGULAR page. We can tolerate
* a single item per page, unlike other index AMs.
diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c
index 2b38617..6d24e53 100644
--- a/src/backend/access/brin/brin_tuple.c
+++ b/src/backend/access/brin/brin_tuple.c
@@ -31,14 +31,13 @@
*/
#include "postgres.h"
-#include "access/htup_details.h"
#include "access/brin_tuple.h"
+#include "access/htup_details.h"
#include "access/tupdesc.h"
#include "access/tupmacs.h"
#include "utils/datum.h"
#include "utils/memutils.h"
-
static inline void brin_deconstruct_tuple(BrinDesc *brdesc,
char *tp, bits8 *nullbits, bool nulls,
Datum *values, bool *allnulls, bool *hasnulls);
diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index 0129338..02337a7 100644
--- a/src/backend/access/brin/brin_validate.c
+++ b/src/backend/access/brin/brin_validate.c
@@ -22,9 +22,8 @@
#include "catalog/pg_opfamily.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
-
+#include "utils/syscache.h"
/*
* Validator for a BRIN opclass.
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 4c29261..20adfa2 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -17,8 +17,8 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
#include "access/xloginsert.h"
-#include "storage/predicate.h"
#include "miscadmin.h"
+#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index 439a91b..3d2153b 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -20,19 +20,19 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/xlog.h"
-#include "commands/vacuum.h"
+#include "access/xloginsert.h"
#include "catalog/pg_am.h"
+#include "commands/vacuum.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/acl.h"
#include "postmaster/autovacuum.h"
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
/* GUC parameter */
int gin_pending_list_limit = 0;
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index d290581..1ad6228 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -16,18 +16,17 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/tableam.h"
+#include "access/xloginsert.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/smgr.h"
#include "storage/indexfsm.h"
#include "storage/predicate.h"
+#include "storage/smgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
typedef struct
{
GinState ginstate;
diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 63bd7f2..5d96f29 100644
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -23,9 +23,8 @@
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
-
+#include "utils/syscache.h"
/*
* Validator for a GIN opclass.
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 0cc8791..8d9c8d0 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -18,15 +18,14 @@
#include "access/gistscan.h"
#include "catalog/pg_collation.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
/* non-export function prototypes */
static void gistfixsplit(GISTInsertState *state, GISTSTATE *giststate);
static bool gistinserttuple(GISTInsertState *state, GISTInsertStack *stack,
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 22d790d..98b6892 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -17,11 +17,11 @@
#include "access/genam.h"
#include "access/gist_private.h"
#include "access/relscan.h"
+#include "lib/pairingheap.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "pgstat.h"
-#include "lib/pairingheap.h"
#include "utils/float.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
index a23dec7..553a6d6 100644
--- a/src/backend/access/gist/gistutil.c
+++ b/src/backend/access/gist/gistutil.c
@@ -22,10 +22,9 @@
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "utils/float.h"
-#include "utils/syscache.h"
-#include "utils/snapmgr.h"
#include "utils/lsyscache.h"
-
+#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
* Write itup vector to page, has no control of free space.
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 6c05836..a0597a0 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -31,8 +31,6 @@
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/rel.h"
-#include "miscadmin.h"
-
/* Working state for hashbuild and its callback */
typedef struct
diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c
index 86e7210..c1d248a 100644
--- a/src/backend/access/hash/hash_xlog.c
+++ b/src/backend/access/hash/hash_xlog.c
@@ -17,11 +17,11 @@
#include "access/bufmask.h"
#include "access/hash.h"
#include "access/hash_xlog.h"
-#include "access/xlogutils.h"
-#include "access/xlog.h"
#include "access/transam.h"
-#include "storage/procarray.h"
+#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* replay a hash index meta page
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 89876d2..e0ca1b0 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -18,10 +18,10 @@
#include "access/hash.h"
#include "access/hash_xlog.h"
#include "miscadmin.h"
-#include "utils/rel.h"
-#include "storage/lwlock.h"
#include "storage/buf_internals.h"
+#include "storage/lwlock.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static void _hash_vacuum_one_page(Relation rel, Relation hrel,
Buffer metabuf, Buffer buf);
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 838ee68..63697bf 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -32,9 +32,8 @@
#include "access/hash_xlog.h"
#include "miscadmin.h"
#include "storage/lmgr.h"
-#include "storage/smgr.h"
#include "storage/predicate.h"
-
+#include "storage/smgr.h"
static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock,
uint32 nblocks);
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 79ae499..725e614 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -18,8 +18,8 @@
#include "access/relscan.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "utils/rel.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static bool _hash_readpage(IndexScanDesc scan, Buffer *bufP,
ScanDirection dir);
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 3fb92ea..c5005f4 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -17,9 +17,9 @@
#include "access/hash.h"
#include "access/reloptions.h"
#include "access/relscan.h"
+#include "storage/buf_internals.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
-#include "storage/buf_internals.h"
#define CALC_NEW_BUCKET(old_bucket, lowmask) \
old_bucket | (lowmask + 1)
diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
index 7081172..92073fe 100644
--- a/src/backend/access/heap/heapam_handler.c
+++ b/src/backend/access/heap/heapam_handler.c
@@ -19,8 +19,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/heaptoast.h"
@@ -35,10 +33,10 @@
#include "catalog/storage_xlog.h"
#include "commands/progress.h"
#include "executor/executor.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
#include "storage/procarray.h"
@@ -46,7 +44,6 @@
#include "utils/builtins.h"
#include "utils/rel.h"
-
static void reform_and_rewrite_tuple(HeapTuple tuple,
Relation OldHeap, Relation NewHeap,
Datum *values, bool *isnull, RewriteState rwstate);
diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
index a0d2217..6d62a96 100644
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@ -16,15 +16,15 @@
#include "access/heapam.h"
#include "access/heapam_xlog.h"
-#include "access/transam.h"
#include "access/htup_details.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
-#include "utils/snapmgr.h"
#include "utils/rel.h"
+#include "utils/snapmgr.h"
/* Working data for heap_page_prune and subroutines */
typedef struct
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
index d41dbcf..d285b1f 100644
--- a/src/backend/access/heap/rewriteheap.c
+++ b/src/backend/access/heap/rewriteheap.c
@@ -105,8 +105,6 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam.h"
#include "access/heapam_xlog.h"
#include "access/heaptoast.h"
@@ -114,25 +112,19 @@
#include "access/transam.h"
#include "access/xact.h"
#include "access/xloginsert.h"
-
#include "catalog/catalog.h"
-
#include "lib/ilist.h"
-
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "replication/logical.h"
#include "replication/slot.h"
-
#include "storage/bufmgr.h"
#include "storage/fd.h"
+#include "storage/procarray.h"
#include "storage/smgr.h"
-
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "storage/procarray.h"
-
/*
* State associated with a rewrite operation. This is opaque to the user
* of the rewrite facility.
diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index dd5315c..44f6283 100644
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -20,8 +20,8 @@
#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlogutils.h"
-#include "storage/procarray.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* _bt_restore_page -- re-enter all the index tuples on a page
diff --git a/src/backend/access/spgist/spgquadtreeproc.c b/src/backend/access/spgist/spgquadtreeproc.c
index e50108e..992c558 100644
--- a/src/backend/access/spgist/spgquadtreeproc.c
+++ b/src/backend/access/spgist/spgquadtreeproc.c
@@ -16,14 +16,13 @@
#include "postgres.h"
#include "access/spgist.h"
-#include "access/stratnum.h"
#include "access/spgist_private.h"
+#include "access/stratnum.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/float.h"
#include "utils/geo_decls.h"
-
Datum
spg_quad_config(PG_FUNCTION_ARGS)
{
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index 595c860..7f7eb21 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -39,8 +39,8 @@
#include "access/xloginsert.h"
#include "access/xlogutils.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "storage/proc.h"
/*
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
index 55d129a..d147236 100644
--- a/src/backend/access/transam/parallel.c
+++ b/src/backend/access/transam/parallel.c
@@ -19,9 +19,9 @@
#include "access/session.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_enum.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
+#include "catalog/pg_enum.h"
#include "commands/async.h"
#include "executor/execParallel.h"
#include "libpq/libpq.h"
@@ -43,7 +43,6 @@
#include "utils/snapmgr.h"
#include "utils/typcache.h"
-
/*
* We don't want to waste a lot of memory on an error queue which, most of
* the time, will process only a handful of small messages. However, it is
diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c
index 9368b56..58091f6 100644
--- a/src/backend/access/transam/rmgr.c
+++ b/src/backend/access/transam/rmgr.c
@@ -7,14 +7,14 @@
*/
#include "postgres.h"
+#include "access/brin_xlog.h"
#include "access/clog.h"
#include "access/commit_ts.h"
+#include "access/generic_xlog.h"
#include "access/ginxlog.h"
#include "access/gistxlog.h"
-#include "access/generic_xlog.h"
#include "access/hash_xlog.h"
#include "access/heapam_xlog.h"
-#include "access/brin_xlog.h"
#include "access/multixact.h"
#include "access/nbtxlog.h"
#include "access/spgxlog.h"
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index e38f919..59bad09 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -54,11 +54,10 @@
#include "access/slru.h"
#include "access/transam.h"
#include "access/xlog.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/fd.h"
#include "storage/shmem.h"
-#include "miscadmin.h"
-
#define SlruFileName(ctl, path, seg) \
snprintf(path, MAXPGPATH, "%s/%04X", (ctl)->Dir, seg)
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 546bd43..712e842 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -85,8 +85,8 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "access/xloginsert.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
+#include "access/xlogutils.h"
#include "catalog/pg_type.h"
#include "catalog/storage.h"
#include "funcapi.h"
@@ -108,7 +108,6 @@
#include "utils/memutils.h"
#include "utils/timestamp.h"
-
/*
* Directory where Two-phase commit files reside within PGDATA
*/
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index fc55fa6..c3a75a5 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -40,6 +40,7 @@
#include "libpq/be-fsstubs.h"
#include "libpq/pqsignal.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "replication/logical.h"
#include "replication/logicallauncher.h"
@@ -65,8 +66,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
-
/*
* User-tweakable parameters
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 55d01a8..3b766e6 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -42,15 +42,16 @@
#include "commands/tablespace.h"
#include "common/controldata_utils.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "port/atomics.h"
#include "postmaster/bgwriter.h"
-#include "postmaster/walwriter.h"
#include "postmaster/startup.h"
+#include "postmaster/walwriter.h"
#include "replication/basebackup.h"
#include "replication/logical.h"
-#include "replication/slot.h"
#include "replication/origin.h"
+#include "replication/slot.h"
#include "replication/snapbuild.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
@@ -74,7 +75,6 @@
#include "utils/relmapper.h"
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
extern uint32 bootstrap_data_checksum_version;
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index 8f17988..1fccf29 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -27,17 +27,16 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "replication/walreceiver.h"
+#include "storage/fd.h"
+#include "storage/ipc.h"
#include "storage/smgr.h"
#include "utils/builtins.h"
+#include "utils/guc.h"
#include "utils/memutils.h"
#include "utils/numeric.h"
-#include "utils/guc.h"
#include "utils/pg_lsn.h"
#include "utils/timestamp.h"
#include "utils/tuplestore.h"
-#include "storage/fd.h"
-#include "storage/ipc.h"
-
/*
* Store label file and tablespace map during non-exclusive backups.
diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c
index 3ec67d4..aa9dca0 100644
--- a/src/backend/access/transam/xloginsert.c
+++ b/src/backend/access/transam/xloginsert.c
@@ -26,11 +26,11 @@
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/proc.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/* Buffer size required to store a compressed version of backup block image */
#define PGLZ_MAX_BLCKSZ PGLZ_MAX_OUTPUT(BLCKSZ)
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index 6d85819..7f24f0c 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -18,9 +18,9 @@
#include "postgres.h"
#include "access/transam.h"
-#include "access/xlogrecord.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
+#include "access/xlogrecord.h"
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "replication/origin.h"
@@ -30,7 +30,6 @@
#include "utils/memutils.h"
#endif
-
static void report_invalid_record(XLogReaderState *state, const char *fmt,...)
pg_attribute_printf(2, 3);
static bool allocate_recordbuf(XLogReaderState *state, uint32 reclength);
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 88ce37c..bed10f9 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -52,12 +52,12 @@
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_tablespace.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_transform.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
#include "catalog/pg_ts_template.h"
-#include "catalog/pg_transform.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
@@ -76,7 +76,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
/*
* Internal format used by ALTER DEFAULT PRIVILEGES.
*/
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 1af31c2..6b10469 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -31,9 +31,9 @@
#include "catalog/pg_auth_members.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_pltemplate.h"
-#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_replication_origin.h"
#include "catalog/pg_shdepend.h"
#include "catalog/pg_shdescription.h"
@@ -50,7 +50,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
/*
* IsSystemRelation
* True iff the relation is either a system catalog or a toast table.
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 7c34509..67f637d 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -43,11 +43,11 @@
#include "catalog/pg_am.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
-#include "catalog/pg_description.h"
#include "catalog/pg_depend.h"
+#include "catalog/pg_description.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_tablespace.h"
#include "catalog/pg_trigger.h"
#include "catalog/pg_type.h"
@@ -76,10 +76,9 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_rusage.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/snapmgr.h"
-
/* Potentially set by pg_upgrade_support functions */
Oid binary_upgrade_next_index_pg_class_oid = InvalidOid;
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index b8cbe6a..ae3002b 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -29,13 +29,13 @@
#include "catalog/pg_attrdef.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_cast.h"
-#include "catalog/pg_default_acl.h"
-#include "catalog/pg_enum.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_conversion.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_default_acl.h"
+#include "catalog/pg_enum.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_extension.h"
#include "catalog/pg_foreign_data_wrapper.h"
#include "catalog/pg_foreign_server.h"
@@ -44,10 +44,10 @@
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_opclass.h"
-#include "catalog/pg_opfamily.h"
#include "catalog/pg_operator.h"
-#include "catalog/pg_proc.h"
+#include "catalog/pg_opfamily.h"
#include "catalog/pg_policy.h"
+#include "catalog/pg_proc.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
#include "catalog/pg_rewrite.h"
diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
index 53af14e..5dfa449 100644
--- a/src/backend/catalog/partition.c
+++ b/src/backend/catalog/partition.c
@@ -16,9 +16,9 @@
#include "access/genam.h"
#include "access/htup_details.h"
+#include "access/sysattr.h"
#include "access/table.h"
#include "access/tupconvert.h"
-#include "access/sysattr.h"
#include "catalog/indexing.h"
#include "catalog/partition.h"
#include "catalog/pg_inherits.h"
@@ -32,7 +32,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static Oid get_partition_parent_worker(Relation inhRel, Oid relid);
static void get_partition_ancestors_worker(Relation inhRel, Oid relid,
List **ancestors);
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index d0ff802..be0f065 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -22,9 +22,9 @@
#include "catalog/indexing.h"
#include "catalog/pg_enum.h"
#include "catalog/pg_type.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "nodes/value.h"
+#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/fmgroids.h"
@@ -32,7 +32,6 @@
#include "utils/memutils.h"
#include "utils/syscache.h"
-
/* Potentially set by pg_upgrade_support functions */
Oid binary_upgrade_next_pg_enum_oid = InvalidOid;
diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index fd5da7d..d442c8e 100644
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -14,15 +14,11 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/index.h"
@@ -30,10 +26,11 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
-
+#include "catalog/pg_type.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index fb7f8dd..59f97bf 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -34,8 +34,8 @@
#include "catalog/pg_largeobject.h"
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_shdepend.h"
@@ -47,9 +47,9 @@
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
#include "commands/alter.h"
-#include "commands/dbcommands.h"
#include "commands/collationcmds.h"
#include "commands/conversioncmds.h"
+#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
@@ -60,13 +60,12 @@
#include "commands/subscriptioncmds.h"
#include "commands/tablecmds.h"
#include "commands/typecmds.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
+#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/fmgroids.h"
#include "utils/syscache.h"
-
typedef enum
{
LOCAL_OBJECT,
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index afee283..68d88ff 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -14,23 +14,18 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/indexing.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "catalog/pg_type.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
-
#include "storage/lmgr.h"
-
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
@@ -38,7 +33,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static List *textarray_to_stringlist(ArrayType *textarray);
/*
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 2a51501..a8c1de5 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-#include "catalog/catalog.h"
#include "catalog/binary_upgrade.h"
+#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/objectaccess.h"
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index 625af8d..056ea3d 100644
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -19,8 +19,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/visibilitymap.h"
#include "access/xact.h"
#include "access/xlog.h"
@@ -28,6 +26,7 @@
#include "access/xlogutils.h"
#include "catalog/storage.h"
#include "catalog/storage_xlog.h"
+#include "miscadmin.h"
#include "storage/freespace.h"
#include "storage/smgr.h"
#include "utils/memutils.h"
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 562e3d3..d425ef9 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -34,8 +34,8 @@
#include "catalog/pg_opclass.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
-#include "catalog/pg_subscription.h"
#include "catalog/pg_statistic_ext.h"
+#include "catalog/pg_subscription.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
@@ -57,8 +57,8 @@
#include "commands/trigger.h"
#include "commands/typecmds.h"
#include "commands/user.h"
-#include "parser/parse_func.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
#include "rewrite/rewriteDefine.h"
#include "tcop/utility.h"
#include "utils/builtins.h"
@@ -67,7 +67,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static Oid AlterObjectNamespace_internal(Relation rel, Oid objid, Oid nspOid);
/*
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index a23128d..b8c349f 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -22,17 +22,17 @@
#include "access/multixact.h"
#include "access/relscan.h"
#include "access/tableam.h"
-#include "access/transam.h"
#include "access/toast_internals.h"
+#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_am.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/heap.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_am.h"
#include "catalog/toasting.h"
#include "commands/cluster.h"
#include "commands/progress.h"
@@ -55,7 +55,6 @@
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-
/*
* This struct is used to pass around the information on tables to be
* clustered. We need this so we can make a list of them when invoked without
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index e17d8c7..42a147b 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -39,8 +39,8 @@
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
-#include "optimizer/optimizer.h"
#include "nodes/makefuncs.h"
+#include "optimizer/optimizer.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
#include "parser/parse_expr.h"
@@ -58,7 +58,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
#define OCTVALUE(c) ((c) - '0')
diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c
index b7d2206..2bf7083 100644
--- a/src/backend/commands/createas.c
+++ b/src/backend/commands/createas.c
@@ -25,8 +25,8 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -51,7 +51,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
typedef struct
{
DestReceiver pub; /* publicly-known function pointers */
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 01d6621..aa03172 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -53,8 +53,8 @@
#include "replication/slot.h"
#include "storage/copydir.h"
#include "storage/fd.h"
-#include "storage/lmgr.h"
#include "storage/ipc.h"
+#include "storage/lmgr.h"
#include "storage/md.h"
#include "storage/procarray.h"
#include "storage/smgr.h"
@@ -65,7 +65,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
typedef struct
{
Oid src_dboid; /* source (template) DB */
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index 0301ae1..6b022af 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -33,11 +33,12 @@
#include "commands/extension.h"
#include "commands/trigger.h"
#include "funcapi.h"
-#include "parser/parse_func.h"
-#include "pgstat.h"
#include "lib/ilist.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
+#include "pgstat.h"
#include "tcop/deparse_utility.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/evtcache.h"
@@ -46,7 +47,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
typedef struct EventTriggerQueryState
{
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 40f1f9a..94411b5 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -34,8 +34,8 @@
#include "access/genam.h"
#include "access/htup_details.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index bae3b38..2621e36 100644
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -20,13 +20,13 @@
#include "catalog/pg_inherits.h"
#include "commands/lockcmds.h"
#include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
#include "parser/parse_clause.h"
+#include "rewrite/rewriteHandler.h"
#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "rewrite/rewriteHandler.h"
-#include "nodes/nodeFuncs.h"
static void LockTableRecurse(Oid reloid, LOCKMODE lockmode, bool nowait, Oid userid);
static AclResult LockTableAclCheck(Oid relid, LOCKMODE lockmode, Oid userid);
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index 6a1ccde..cb7a6bd 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -19,8 +19,8 @@
#include "access/genam.h"
#include "access/hash.h"
-#include "access/nbtree.h"
#include "access/htup_details.h"
+#include "access/nbtree.h"
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/catalog.h"
@@ -50,7 +50,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterOpFamilyAdd(AlterOpFamilyStmt *stmt,
Oid amoid, Oid opfamilyoid,
int maxOpNumber, int maxProcNumber,
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index 1df7662..36093dc 100644
--- a/src/backend/commands/policy.c
+++ b/src/backend/commands/policy.c
@@ -16,8 +16,8 @@
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index f115d4b..fbf11c8 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -14,29 +14,25 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/publicationcmds.h"
-
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 6cf94a3..7cf3cc1 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -21,8 +21,8 @@
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_namespace.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterSchemaOwner_internal(HeapTuple tup, Relation rel, Oid newOwnerId);
/*
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 1419195..5408edc 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -14,38 +14,30 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/subscriptioncmds.h"
-
#include "executor/executor.h"
-
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
-
#include "replication/logicallauncher.h"
#include "replication/origin.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
#include "replication/worker_internal.h"
-
#include "storage/lmgr.h"
-
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 5597be6..496c206 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -20,7 +20,6 @@
#include "access/multixact.h"
#include "access/reloptions.h"
#include "access/relscan.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/tupconvert.h"
@@ -100,7 +99,6 @@
#include "utils/timestamp.h"
#include "utils/typcache.h"
-
/*
* ON COMMIT action list
*/
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 84efb41..570dcb2 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -51,8 +51,8 @@
#include <sys/stat.h>
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -84,7 +84,6 @@
#include "utils/rel.h"
#include "utils/varlena.h"
-
/* GUC variables */
char *default_tablespace = NULL;
char *temp_tablespaces = NULL;
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 1119e21..a0bd8c3 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -24,14 +24,14 @@
#include "access/xlog.h"
#include "catalog/pg_authid.h"
#include "commands/variable.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
/*
* DATESTYLE
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index bea890f..9fa433a 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -26,8 +26,8 @@
#include "parser/analyze.h"
#include "parser/parse_relation.h"
#include "rewrite/rewriteDefine.h"
-#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteHandler.h"
+#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteSupport.h"
#include "utils/acl.h"
#include "utils/builtins.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc);
/*---------------------------------------------------------------------
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 1f18e5d..779d3dc 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -28,7 +28,6 @@
#include "executor/nodeGather.h"
#include "executor/nodeGatherMerge.h"
#include "executor/nodeGroup.h"
-#include "executor/nodeGroup.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
#include "executor/nodeIndexonlyscan.h"
@@ -62,7 +61,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static bool IndexSupportsBackwardScan(Oid indexid);
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
index 0cd6f65..dbed597 100644
--- a/src/backend/executor/execExprInterp.c
+++ b/src/backend/executor/execExprInterp.c
@@ -62,22 +62,21 @@
#include "executor/execExpr.h"
#include "executor/nodeSubplan.h"
#include "funcapi.h"
-#include "utils/array.h"
-#include "utils/memutils.h"
#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
#include "parser/parsetree.h"
#include "pgstat.h"
+#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datum.h"
#include "utils/expandedrecord.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/timestamp.h"
#include "utils/typcache.h"
#include "utils/xml.h"
-
/*
* Use computed-goto-based opcode dispatch when computed gotos are available.
* But use a separate symbol so that it's easy to adjust locally in this file
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index 6349c11..7bc5e40 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -21,8 +21,8 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "miscadmin.h"
-#include "utils/lsyscache.h"
#include "utils/hashutils.h"
+#include "utils/lsyscache.h"
#include "utils/memutils.h"
static uint32 TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple);
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 53cd2fc..b256642 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -31,14 +31,15 @@
#include "executor/nodeForeignscan.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
-#include "executor/nodeIndexscan.h"
#include "executor/nodeIndexonlyscan.h"
+#include "executor/nodeIndexscan.h"
#include "executor/nodeSeqscan.h"
#include "executor/nodeSort.h"
#include "executor/nodeSubplan.h"
#include "executor/tqueue.h"
#include "jit/jit.h"
#include "nodes/nodeFuncs.h"
+#include "pgstat.h"
#include "storage/spin.h"
#include "tcop/tcopprot.h"
#include "utils/datum.h"
@@ -46,7 +47,6 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
-#include "pgstat.h"
/*
* Magic numbers for parallel executor communication. We use constants
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index c227282..7a6e285 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -113,9 +113,8 @@
#include "executor/nodeValuesscan.h"
#include "executor/nodeWindowAgg.h"
#include "executor/nodeWorktablescan.h"
-#include "nodes/nodeFuncs.h"
#include "miscadmin.h"
-
+#include "nodes/nodeFuncs.h"
static TupleTableSlot *ExecProcNodeFirst(PlanState *node);
static TupleTableSlot *ExecProcNodeInstr(PlanState *node);
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 46d55d9..360d3c8 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -60,8 +60,8 @@
#include "access/heaptoast.h"
#include "access/htup_details.h"
#include "access/tupdesc_details.h"
-#include "funcapi.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
#include "nodes/nodeFuncs.h"
#include "storage/bufmgr.h"
#include "utils/builtins.h"
@@ -69,7 +69,6 @@
#include "utils/lsyscache.h"
#include "utils/typcache.h"
-
static TupleDesc ExecTypeFromTLInternal(List *targetList,
bool skipjunk);
static pg_attribute_always_inline void slot_deform_heap_tuple(TupleTableSlot *slot, HeapTuple tuple, uint32 *offp,
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 58c376a..6ee24ea 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -231,13 +231,12 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/datum.h"
#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/datum.h"
-
static void select_current_set(AggState *aggstate, int setno, bool is_hash);
static void initialize_phase(AggState *aggstate, int newphase);
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index f62105f..256d61a 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -49,9 +49,8 @@
#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "utils/spccache.h"
#include "utils/snapmgr.h"
-
+#include "utils/spccache.h"
static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node);
static inline void BitmapDoneInitializingSharedState(ParallelBitmapHeapState *pstate);
diff --git a/src/backend/executor/nodeCustom.c b/src/backend/executor/nodeCustom.c
index 6dd0916..ccaa68b 100644
--- a/src/backend/executor/nodeCustom.c
+++ b/src/backend/executor/nodeCustom.c
@@ -13,16 +13,15 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "executor/nodeCustom.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
#include "nodes/extensible.h"
#include "nodes/plannodes.h"
-#include "miscadmin.h"
#include "parser/parsetree.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
static TupleTableSlot *ExecCustomScan(PlanState *pstate);
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 224cbb3..d6f4eda 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -38,11 +38,10 @@
#include "pgstat.h"
#include "port/atomics.h"
#include "utils/dynahash.h"
-#include "utils/memutils.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/syscache.h"
-
static void ExecHashIncreaseNumBatches(HashJoinTable hashtable);
static void ExecHashIncreaseNumBuckets(HashJoinTable hashtable);
static void ExecParallelHashIncreaseNumBatches(HashJoinTable hashtable);
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 1991b90..2c364bd 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -32,14 +32,13 @@
#include "access/htup_details.h"
#include "executor/executor.h"
#include "executor/nodeSubplan.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "miscadmin.h"
#include "utils/array.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-
static Datum ExecHashSubPlan(SubPlanState *node,
ExprContext *econtext,
bool *isNull);
diff --git a/src/backend/executor/nodeTableFuncscan.c b/src/backend/executor/nodeTableFuncscan.c
index d264337..21cf3ca 100644
--- a/src/backend/executor/nodeTableFuncscan.c
+++ b/src/backend/executor/nodeTableFuncscan.c
@@ -22,17 +22,16 @@
*/
#include "postgres.h"
-#include "nodes/execnodes.h"
#include "executor/executor.h"
#include "executor/nodeTableFuncscan.h"
#include "executor/tablefunc.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/xml.h"
-
static TupleTableSlot *TableFuncNext(TableFuncScanState *node);
static bool TableFuncRecheck(TableFuncScanState *node, TupleTableSlot *slot);
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index b5d3f3c..f1b9407 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -46,8 +46,8 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/expandeddatum.h"
#include "utils/datum.h"
+#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/regproc.h"
diff --git a/src/backend/jit/jit.c b/src/backend/jit/jit.c
index 43e65b1..e066f72 100644
--- a/src/backend/jit/jit.c
+++ b/src/backend/jit/jit.c
@@ -17,19 +17,16 @@
*/
#include "postgres.h"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-
-#include "fmgr.h"
#include "executor/execExpr.h"
+#include "fmgr.h"
#include "jit/jit.h"
#include "miscadmin.h"
-#include "utils/resowner_private.h"
#include "utils/fmgrprotos.h"
-
+#include "utils/resowner_private.h"
/* GUCs */
bool jit_enabled = true;
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index 82c4afb..1c851e0 100644
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -13,17 +13,6 @@
#include "postgres.h"
-#include "jit/llvmjit.h"
-#include "jit/llvmjit_emit.h"
-
-#include "miscadmin.h"
-
-#include "utils/memutils.h"
-#include "utils/resowner_private.h"
-#include "portability/instr_time.h"
-#include "storage/ipc.h"
-
-
#include <llvm-c/Analysis.h>
#include <llvm-c/BitReader.h>
#include <llvm-c/BitWriter.h>
@@ -39,6 +28,13 @@
#include <llvm-c/Transforms/Utils.h>
#endif
+#include "jit/llvmjit.h"
+#include "jit/llvmjit_emit.h"
+#include "miscadmin.h"
+#include "portability/instr_time.h"
+#include "storage/ipc.h"
+#include "utils/memutils.h"
+#include "utils/resowner_private.h"
/* Handle of a module emitted via ORC JIT */
typedef struct LLVMJitHandle
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index d093246..a9d3621 100644
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -23,10 +23,10 @@
#include "access/tupconvert.h"
#include "catalog/objectaccess.h"
#include "catalog/pg_type.h"
+#include "executor/execExpr.h"
#include "executor/execdebug.h"
#include "executor/nodeAgg.h"
#include "executor/nodeSubplan.h"
-#include "executor/execExpr.h"
#include "funcapi.h"
#include "jit/llvmjit.h"
#include "jit/llvmjit_emit.h"
@@ -46,7 +46,6 @@
#include "utils/typcache.h"
#include "utils/xml.h"
-
typedef struct CompiledExprState
{
LLVMJitContext *context;
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index b90eb0a..c276207 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -32,11 +32,10 @@
#include "libpq/libpq.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "tcop/tcopprot.h"
-#include "utils/memutils.h"
#include "storage/ipc.h"
#include "storage/proc.h"
-
+#include "tcop/tcopprot.h"
+#include "utils/memutils.h"
char *ssl_library;
char *ssl_cert_file;
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 2221c04..7f59a29 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -39,10 +39,10 @@
#include "storage/fd.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/varlena.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/varlena.h"
#ifdef USE_LDAP
#ifdef WIN32
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index b655931..bcada74 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -17,14 +17,13 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "miscadmin.h"
-#include "nodes/makefuncs.h"
#include "nodes/execnodes.h"
+#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "nodes/pathnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-
static bool expression_returns_set_walker(Node *node, void *context);
static int leftmostLoc(int loc1, int loc2);
static bool fix_opfuncids_walker(Node *node, void *context);
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index a546908..3b8d2fe 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -35,8 +35,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(CX)
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index fbabe2e..3b92f42 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -32,8 +32,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(ERX)
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 4bf777d..fe02050 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -21,11 +21,10 @@
#include "optimizer/optimizer.h"
#include "optimizer/pathnode.h"
#include "optimizer/plancat.h"
+#include "statistics/statistics.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
-#include "statistics/statistics.h"
-
/*
* Data structure for accumulating info about possible range-query
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 274fea0..fa63a38 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -14,8 +14,8 @@
*/
#include "postgres.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/clauses.h"
@@ -34,7 +34,6 @@
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
-
/* These parameters are set by GUC */
int from_collapse_limit;
int join_collapse_limit;
diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c
index 9381939..974f620 100644
--- a/src/backend/optimizer/plan/planagg.c
+++ b/src/backend/optimizer/plan/planagg.c
@@ -41,13 +41,12 @@
#include "optimizer/planmain.h"
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_clause.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
static bool find_minmax_aggs_walker(Node *node, List **context);
static bool build_minmax_path(PlannerInfo *root, MinMaxAggInfo *mminfo,
Oid eqop, Oid sortop, bool nulls_first);
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 17c5f08..7fe11b5 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -31,10 +31,10 @@
#include "executor/executor.h"
#include "executor/nodeAgg.h"
#include "foreign/fdwapi.h"
-#include "miscadmin.h"
#include "jit/jit.h"
#include "lib/bipartite_match.h"
#include "lib/knapsack.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#ifdef OPTIMIZER_DEBUG
@@ -55,17 +55,16 @@
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
#include "parser/parse_agg.h"
+#include "parser/parsetree.h"
#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "storage/dsm_impl.h"
+#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/selfuncs.h"
-#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
/* GUC parameters */
double cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION;
int force_parallel_mode = FORCE_PARALLEL_OFF;
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 792ae39..0da43ef 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -47,12 +47,11 @@
#include "optimizer/optimizer.h"
#include "optimizer/prep.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteHandler.h"
#include "utils/rel.h"
-
static List *expand_targetlist(List *tlist, int command_type,
Index result_relation, Relation rel);
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 34acb73..60c93ee 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -16,8 +16,8 @@
#include <math.h>
-#include "miscadmin.h"
#include "foreign/fdwapi.h"
+#include "miscadmin.h"
#include "nodes/extensible.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/appendinfo.h"
@@ -35,7 +35,6 @@
#include "utils/memutils.h"
#include "utils/selfuncs.h"
-
typedef enum
{
COSTS_EQUAL, /* path costs are fuzzily equal */
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index e5f9e04..5e889d1 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -20,9 +20,9 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/nbtree.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/table.h"
+#include "access/tableam.h"
#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
@@ -40,9 +40,9 @@
#include "optimizer/optimizer.h"
#include "optimizer/plancat.h"
#include "optimizer/prep.h"
-#include "partitioning/partdesc.h"
#include "parser/parse_relation.h"
#include "parser/parsetree.h"
+#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "statistics/statistics.h"
#include "storage/bufmgr.h"
@@ -50,9 +50,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
-
+#include "utils/syscache.h"
/* GUC parameter */
int constraint_exclusion = CONSTRAINT_EXCLUSION_PARTITION;
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 260ccd4..fe41918 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -15,8 +15,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/nbtree.h"
#include "access/table.h"
@@ -29,12 +27,11 @@
#include "catalog/pg_constraint.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
-#include "parser/parser.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -44,14 +41,15 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/builtins.h"
-#include "utils/guc.h"
#include "utils/catcache.h"
+#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
-
+#include "utils/syscache.h"
/* Convenience macro for the most common makeNamespaceItem() case */
#define makeDefaultNSItem(rte) makeNamespaceItem(rte, true, true, false, true)
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 76f3dd7..eb91da2 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -22,6 +22,7 @@
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
+#include "parser/parse_agg.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -31,14 +32,12 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
-#include "parser/parse_agg.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/lsyscache.h"
#include "utils/timestamp.h"
#include "utils/xml.h"
-
/* GUC parameters */
bool operator_precedence_warning = false;
bool Transform_null_equals = false;
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 1baf7ef..bc832e7 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -20,17 +20,16 @@
#include "mb/pg_wchar.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_relation.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/int8.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/varbit.h"
-
static void pcb_error_callback(void *arg);
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 4dd8150..47188fc 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -26,10 +26,10 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_enr.h"
#include "parser/parse_relation.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
@@ -37,7 +37,6 @@
#include "utils/syscache.h"
#include "utils/varlena.h"
-
#define MAX_FUZZY_DISTANCE 3
static RangeTblEntry *scanNameSpaceForRefname(ParseState *pstate,
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 2901025..30d419e 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -20,19 +20,18 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_func.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/typcache.h"
-
static void markTargetListOrigin(ParseState *pstate, TargetEntry *tle,
Var *var, int levelsup);
static Node *transformAssignmentIndirection(ParseState *pstate,
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 7932a96..78fef26 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -19,14 +19,13 @@
#include "catalog/pg_type.h"
#include "lib/stringinfo.h"
#include "nodes/makefuncs.h"
-#include "parser/parser.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
static int32 typenameTypeMod(ParseState *pstate, const TypeName *typeName,
Type typ);
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index 53e3ae2..7745e8d 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -17,9 +17,8 @@
#include <ctype.h>
-#include "parser/scansup.h"
#include "mb/pg_wchar.h"
-
+#include "parser/scansup.h"
/* ----------------
* scanstr
diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c
index 4bc8810..cfb44e2 100644
--- a/src/backend/partitioning/partbounds.c
+++ b/src/backend/partitioning/partbounds.c
@@ -36,8 +36,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/snapmgr.h"
#include "utils/ruleutils.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
/*
diff --git a/src/backend/partitioning/partdesc.c b/src/backend/partitioning/partdesc.c
index b207b76..6ede084 100644
--- a/src/backend/partitioning/partdesc.c
+++ b/src/backend/partitioning/partdesc.c
@@ -25,13 +25,13 @@
#include "storage/bufmgr.h"
#include "storage/sinval.h"
#include "utils/builtins.h"
-#include "utils/inval.h"
#include "utils/fmgroids.h"
#include "utils/hsearch.h"
+#include "utils/inval.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-#include "utils/rel.h"
#include "utils/partcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
typedef struct PartitionDirectoryData
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index b66b517..5f8a007 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -14,8 +14,8 @@
#include <unistd.h>
-#include "libpq/pqsignal.h"
#include "access/parallel.h"
+#include "libpq/pqsignal.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "port/atomics.h"
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index 8ec16a3..74f8ff8 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -44,8 +44,8 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "postmaster/bgwriter.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
+#include "storage/bufmgr.h"
#include "storage/condition_variable.h"
#include "storage/fd.h"
#include "storage/ipc.h"
@@ -60,7 +60,6 @@
#include "utils/resowner.h"
#include "utils/timestamp.h"
-
/*
* GUC parameters
*/
diff --git a/src/backend/postmaster/fork_process.c b/src/backend/postmaster/fork_process.c
index a9138f5..59385c5 100644
--- a/src/backend/postmaster/fork_process.c
+++ b/src/backend/postmaster/fork_process.c
@@ -10,7 +10,6 @@
* src/backend/postmaster/fork_process.c
*/
#include "postgres.h"
-#include "postmaster/fork_process.h"
#include <fcntl.h>
#include <time.h>
@@ -21,6 +20,8 @@
#include <openssl/rand.h>
#endif
+#include "postmaster/fork_process.h"
+
#ifndef WIN32
/*
* Wrapper for fork(). Return values are the same as those for fork():
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 011076c..fabcf31 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -32,8 +32,6 @@
#include <sys/select.h>
#endif
-#include "pgstat.h"
-
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
@@ -48,6 +46,7 @@
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/autovacuum.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
@@ -69,7 +68,6 @@
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-
/* ----------
* Timer definitions.
* ----------
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index d0f210d..1fa4551 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -24,8 +24,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
#include "nodes/pg_list.h"
-#include "pgtar.h"
#include "pgstat.h"
+#include "pgtar.h"
#include "port.h"
#include "postmaster/syslogger.h"
#include "replication/basebackup.h"
@@ -42,7 +42,6 @@
#include "utils/relcache.h"
#include "utils/timestamp.h"
-
typedef struct
{
const char *label;
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 6eba08a..545d2fc 100644
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -19,14 +19,14 @@
#include <unistd.h>
#include <sys/time.h>
-#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "access/xlog.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "libpq-fe.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "pqexpbuffer.h"
#include "replication/walreceiver.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
index c53e7e2..bc532d0 100644
--- a/src/backend/replication/logical/decode.c
+++ b/src/backend/replication/logical/decode.c
@@ -31,19 +31,16 @@
#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog_internal.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-
+#include "access/xlogutils.h"
#include "catalog/pg_control.h"
-
#include "replication/decode.h"
#include "replication/logical.h"
#include "replication/message.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
#include "storage/standby.h"
typedef struct XLogRecordBuffer
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index 186057b..1f8821c 100644
--- a/src/backend/replication/logical/launcher.c
+++ b/src/backend/replication/logical/launcher.c
@@ -17,43 +17,35 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/heapam.h"
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "funcapi.h"
#include "libpq/pqsignal.h"
-
+#include "miscadmin.h"
+#include "pgstat.h"
#include "postmaster/bgworker.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
-
#include "replication/logicallauncher.h"
#include "replication/logicalworker.h"
#include "replication/slot.h"
#include "replication/walreceiver.h"
#include "replication/worker_internal.h"
-
#include "storage/ipc.h"
#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/procsignal.h"
-
#include "tcop/tcopprot.h"
-
#include "utils/memutils.h"
#include "utils/pg_lsn.h"
#include "utils/ps_status.h"
-#include "utils/timeout.h"
#include "utils/snapmgr.h"
+#include "utils/timeout.h"
/* max sleep time between cycles (3min) */
#define DEFAULT_NAPTIME_PER_CYCLE 180000L
diff --git a/src/backend/replication/logical/logical.c b/src/backend/replication/logical/logical.c
index da265f5..7e06615 100644
--- a/src/backend/replication/logical/logical.c
+++ b/src/backend/replication/logical/logical.c
@@ -28,21 +28,17 @@
#include "postgres.h"
-#include "fmgr.h"
-#include "miscadmin.h"
-
#include "access/xact.h"
#include "access/xlog_internal.h"
-
+#include "fmgr.h"
+#include "miscadmin.h"
#include "replication/decode.h"
#include "replication/logical.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
#include "storage/proc.h"
#include "storage/procarray.h"
-
#include "utils/memutils.h"
/* data for errcontext callback */
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c
index d1cf80d..aa2106b 100644
--- a/src/backend/replication/logical/logicalfuncs.c
+++ b/src/backend/replication/logical/logicalfuncs.c
@@ -17,36 +17,28 @@
#include <unistd.h>
-#include "fmgr.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
+#include "access/xact.h"
#include "access/xlog_internal.h"
#include "access/xlogutils.h"
-
-#include "access/xact.h"
-
#include "catalog/pg_type.h"
-
-#include "nodes/makefuncs.h"
-
+#include "fmgr.h"
+#include "funcapi.h"
#include "mb/pg_wchar.h"
-
+#include "miscadmin.h"
+#include "nodes/makefuncs.h"
+#include "replication/decode.h"
+#include "replication/logical.h"
+#include "replication/logicalfuncs.h"
+#include "replication/message.h"
+#include "storage/fd.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/inval.h"
+#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_lsn.h"
#include "utils/regproc.h"
#include "utils/resowner.h"
-#include "utils/lsyscache.h"
-
-#include "replication/decode.h"
-#include "replication/logical.h"
-#include "replication/logicalfuncs.h"
-#include "replication/message.h"
-
-#include "storage/fd.h"
/* private date for writing out data */
typedef struct DecodingOutputState
diff --git a/src/backend/replication/logical/message.c b/src/backend/replication/logical/message.c
index 0681cb4..1652546 100644
--- a/src/backend/replication/logical/message.c
+++ b/src/backend/replication/logical/message.c
@@ -31,17 +31,12 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/xact.h"
-
#include "catalog/indexing.h"
-
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-
-#include "replication/message.h"
#include "replication/logical.h"
-
+#include "replication/message.h"
#include "utils/memutils.h"
/*
diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c
index fad2194..fffc330 100644
--- a/src/backend/replication/logical/origin.c
+++ b/src/backend/replication/logical/origin.c
@@ -70,33 +70,29 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/indexing.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-
-#include "replication/origin.h"
-#include "replication/logical.h"
#include "pgstat.h"
+#include "replication/logical.h"
+#include "replication/origin.h"
+#include "storage/condition_variable.h"
+#include "storage/copydir.h"
#include "storage/fd.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
-#include "storage/condition_variable.h"
-#include "storage/copydir.h"
-
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/pg_lsn.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
* Replay progress of a single remote node.
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index 0bd1d0f..5112eca 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -120,29 +120,24 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam_xlog.h"
#include "access/transam.h"
#include "access/xact.h"
-
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "replication/logical.h"
#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
-#include "utils/builtins.h"
-#include "utils/memutils.h"
-#include "utils/snapshot.h"
-#include "utils/snapmgr.h"
-
#include "storage/block.h" /* debugging output */
#include "storage/fd.h"
#include "storage/lmgr.h"
#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/standby.h"
+#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/snapmgr.h"
+#include "utils/snapshot.h"
/*
* This struct contains the current state of the snapshot building
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
index 7881079..e01d18c 100644
--- a/src/backend/replication/logical/tablesync.c
+++ b/src/backend/replication/logical/tablesync.c
@@ -85,30 +85,23 @@
#include "postgres.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/pg_subscription_rel.h"
#include "catalog/pg_type.h"
-
#include "commands/copy.h"
-
+#include "miscadmin.h"
#include "parser/parse_relation.h"
-
+#include "pgstat.h"
#include "replication/logicallauncher.h"
#include "replication/logicalrelation.h"
#include "replication/walreceiver.h"
#include "replication/worker_internal.h"
-
-#include "utils/snapmgr.h"
#include "storage/ipc.h"
-
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/snapmgr.h"
static bool table_states_valid = false;
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index 9c08757..3483c1b 100644
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -13,16 +13,13 @@
#include "postgres.h"
#include "catalog/pg_publication.h"
-
#include "fmgr.h"
-
#include "replication/logical.h"
#include "replication/logicalproto.h"
#include "replication/origin.h"
#include "replication/pgoutput.h"
-
-#include "utils/inval.h"
#include "utils/int8.h"
+#include "utils/inval.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/varlena.h"
diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c
index 42da631..46e6dd4 100644
--- a/src/backend/replication/slotfuncs.c
+++ b/src/backend/replication/slotfuncs.c
@@ -17,9 +17,9 @@
#include "funcapi.h"
#include "miscadmin.h"
#include "replication/decode.h"
-#include "replication/slot.h"
#include "replication/logical.h"
#include "replication/logicalfuncs.h"
+#include "replication/slot.h"
#include "utils/builtins.h"
#include "utils/inval.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c
index 1c44714..df7bde3 100644
--- a/src/backend/rewrite/rowsecurity.c
+++ b/src/backend/rewrite/rowsecurity.c
@@ -51,12 +51,12 @@
#include "rewrite/rewriteHandler.h"
#include "rewrite/rewriteManip.h"
#include "rewrite/rowsecurity.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/rls.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
static void get_policies_for_relation(Relation relation,
CmdType cmd, Oid user_id,
diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 585cad2..9493b2d 100644
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -20,10 +20,10 @@
#include "catalog/pg_statistic_ext_data.h"
#include "lib/stringinfo.h"
#include "nodes/nodeFuncs.h"
-#include "optimizer/clauses.h"
-#include "optimizer/optimizer.h"
#include "nodes/nodes.h"
#include "nodes/pathnodes.h"
+#include "optimizer/clauses.h"
+#include "optimizer/optimizer.h"
#include "statistics/extended_stats_internal.h"
#include "statistics/statistics.h"
#include "utils/bytea.h"
diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c
index f3383c0..4ccfc5f 100644
--- a/src/backend/statistics/mvdistinct.c
+++ b/src/backend/statistics/mvdistinct.c
@@ -28,14 +28,13 @@
#include "access/htup_details.h"
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_statistic_ext_data.h"
+#include "lib/stringinfo.h"
+#include "statistics/extended_stats_internal.h"
+#include "statistics/statistics.h"
#include "utils/fmgrprotos.h"
#include "utils/lsyscache.h"
-#include "lib/stringinfo.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "statistics/extended_stats_internal.h"
-#include "statistics/statistics.h"
-
static double ndistinct_for_combination(double totalrows, int numrows,
HeapTuple *rows, VacAttrStats **stats,
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index ccd2c31..1eb08cd 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -14,9 +14,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
-
+#include "storage/bufmgr.h"
BufferDescPadded *BufferDescriptors;
char *BufferBlocks;
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index e546585..7e44b51 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -21,9 +21,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
-
+#include "storage/bufmgr.h"
/* entry for buffer lookup hashtable */
typedef struct
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index b40e6f3..440ff77 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -45,9 +45,9 @@
#include "executor/instrument.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "storage/fd.h"
-#include "storage/buffile.h"
#include "storage/buf_internals.h"
+#include "storage/buffile.h"
+#include "storage/fd.h"
#include "utils/resowner.h"
/*
diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c
index ca1c9cd..c94ce5b 100644
--- a/src/backend/storage/file/copydir.c
+++ b/src/backend/storage/file/copydir.c
@@ -22,10 +22,10 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "storage/copydir.h"
-#include "storage/fd.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "storage/copydir.h"
+#include "storage/fd.h"
/*
* copydir: copy a directory
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index fe2bb8f..f18bcb2 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -79,11 +79,11 @@
#include <sys/resource.h> /* for getrlimit */
#endif
-#include "miscadmin.h"
#include "access/xact.h"
#include "access/xlog.h"
#include "catalog/pg_tablespace.h"
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "portability/mem.h"
#include "storage/fd.h"
@@ -91,7 +91,6 @@
#include "utils/guc.h"
#include "utils/resowner_private.h"
-
/* Define PG_FLUSH_DATA_WORKS if we have an implementation for pg_flush_data */
#if defined(HAVE_SYNC_FILE_RANGE)
#define PG_FLUSH_DATA_WORKS 1
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
index 2879b84..d550093 100644
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -47,7 +47,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include <fcntl.h>
#include <unistd.h>
@@ -61,15 +60,16 @@
#ifdef HAVE_SYS_SHM_H
#include <sys/shm.h>
#endif
+
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "portability/mem.h"
+#include "postmaster/postmaster.h"
#include "storage/dsm_impl.h"
#include "storage/fd.h"
#include "utils/guc.h"
#include "utils/memutils.h"
-#include "postmaster/postmaster.h"
#ifdef USE_DSM_POSIX
static bool dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 8853706..4829953 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -29,10 +29,10 @@
#include "postmaster/bgwriter.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
+#include "replication/origin.h"
#include "replication/slot.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
-#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/dsm.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 7605b2c..fde97a1 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -21,14 +21,13 @@
#include "commands/async.h"
#include "miscadmin.h"
#include "replication/walsender.h"
-#include "storage/latch.h"
#include "storage/ipc.h"
+#include "storage/latch.h"
#include "storage/proc.h"
#include "storage/shmem.h"
#include "storage/sinval.h"
#include "tcop/tcopprot.h"
-
/*
* The SIGUSR1 signal is multiplexed to support signalling multiple event
* types. The specific reason is communicated via flags in shared memory.
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index db080c8..0c58b39 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -17,6 +17,7 @@
#include <signal.h>
#include <unistd.h>
+#include "access/transam.h"
#include "miscadmin.h"
#include "storage/backendid.h"
#include "storage/ipc.h"
@@ -25,8 +26,6 @@
#include "storage/shmem.h"
#include "storage/sinvaladt.h"
#include "storage/spin.h"
-#include "access/transam.h"
-
/*
* Conceptually, the shared cache invalidation messages are stored in an
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index fb0bf44..18e3843 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -77,8 +77,8 @@
#include "postgres.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/postmaster.h"
#include "replication/slot.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index b3c54a6..fff0628 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -45,7 +45,6 @@
#include "replication/syncrep.h"
#include "replication/walsender.h"
#include "storage/condition_variable.h"
-#include "storage/standby.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
#include "storage/pmsignal.h"
@@ -53,10 +52,10 @@
#include "storage/procarray.h"
#include "storage/procsignal.h"
#include "storage/spin.h"
+#include "storage/standby.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-
/* GUC variables */
int DeadlockTimeout = 1000;
int StatementTimeout = 0;
diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
index 2e6c55b..04befb7 100644
--- a/src/backend/storage/lmgr/s_lock.c
+++ b/src/backend/storage/lmgr/s_lock.c
@@ -50,9 +50,8 @@
#include <time.h>
#include <unistd.h>
-#include "storage/s_lock.h"
#include "port/atomics.h"
-
+#include "storage/s_lock.h"
#define MIN_SPINS_PER_DELAY 10
#define MAX_SPINS_PER_DELAY 1000
diff --git a/src/backend/storage/page/checksum.c b/src/backend/storage/page/checksum.c
index 1eb7ef6..8f7a110 100644
--- a/src/backend/storage/page/checksum.c
+++ b/src/backend/storage/page/checksum.c
@@ -14,7 +14,6 @@
#include "postgres.h"
#include "storage/checksum.h"
-
/*
* The actual code is in storage/checksum_impl.h. This is done so that
* external programs can incorporate the checksum code by #include'ing
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 07f3c93..8a9eaf6 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -25,21 +25,21 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "postmaster/bgwriter.h"
-#include "storage/fd.h"
#include "storage/bufmgr.h"
+#include "storage/fd.h"
#include "storage/md.h"
#include "storage/relfilenode.h"
#include "storage/smgr.h"
#include "storage/sync.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/*
* The magnetic disk storage manager keeps track of open file
diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
index f329c3f..3485e6f 100644
--- a/src/backend/storage/sync/sync.c
+++ b/src/backend/storage/sync/sync.c
@@ -18,19 +18,19 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "pgstat.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pgstat.h"
#include "portability/instr_time.h"
#include "postmaster/bgwriter.h"
#include "storage/bufmgr.h"
#include "storage/ipc.h"
#include "storage/md.h"
#include "utils/hsearch.h"
-#include "utils/memutils.h"
#include "utils/inval.h"
+#include "utils/memutils.h"
static MemoryContext pendingOpsCxt; /* context for the pending ops state */
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 82894ea..d7a72c0 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -47,14 +47,15 @@
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
#include "libpq/pqsignal.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "nodes/print.h"
#include "optimizer/optimizer.h"
-#include "pgstat.h"
-#include "pg_trace.h"
#include "parser/analyze.h"
#include "parser/parser.h"
#include "pg_getopt.h"
+#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/autovacuum.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
@@ -77,8 +78,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "mb/pg_wchar.h"
-
/* ----------------
* global variables
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index e984545..6787d8e 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -28,8 +28,8 @@
#include "commands/alter.h"
#include "commands/async.h"
#include "commands/cluster.h"
-#include "commands/comment.h"
#include "commands/collationcmds.h"
+#include "commands/comment.h"
#include "commands/conversioncmds.h"
#include "commands/copy.h"
#include "commands/createas.h"
@@ -39,8 +39,8 @@
#include "commands/event_trigger.h"
#include "commands/explain.h"
#include "commands/extension.h"
-#include "commands/matview.h"
#include "commands/lockcmds.h"
+#include "commands/matview.h"
#include "commands/policy.h"
#include "commands/portalcmds.h"
#include "commands/prepare.h"
@@ -68,9 +68,8 @@
#include "utils/acl.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
-
+#include "utils/syscache.h"
/* Hook for plugins to get control in ProcessUtility() */
ProcessUtility_hook_type ProcessUtility_hook = NULL;
diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c
index a3372a8..083292c 100644
--- a/src/backend/tsearch/wparser.c
+++ b/src/backend/tsearch/wparser.c
@@ -13,17 +13,16 @@
*/
#include "postgres.h"
-#include "funcapi.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "funcapi.h"
#include "tsearch/ts_cache.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/jsonapi.h"
#include "utils/varlena.h"
-
/******sql-level interface******/
typedef struct
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 79bc750..4ccb3c0 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -19,10 +19,10 @@
#include "access/htup_details.h"
#include "catalog/catalog.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/proclang.h"
#include "commands/tablespace.h"
@@ -41,7 +41,6 @@
#include "utils/syscache.h"
#include "utils/varlena.h"
-
typedef struct
{
const char *name;
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index e38bd93..c911d72 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -31,7 +31,6 @@
#include "utils/memutils.h"
#include "utils/tzparser.h"
-
static int DecodeNumber(int flen, char *field, bool haveTextMonth,
int fmask, int *tmask,
struct pg_tm *tm, fsec_t *fsec, bool *is2digits);
diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c
index 6ae2a31..b6befd6 100644
--- a/src/backend/utils/adt/format_type.c
+++ b/src/backend/utils/adt/format_type.c
@@ -20,11 +20,11 @@
#include "access/htup_details.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/numeric.h"
#include "utils/syscache.h"
-#include "mb/pg_wchar.h"
static char *printTypmod(const char *typname, int32 typmod, Oid typmodout);
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 93acabc..a40ae40 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -23,9 +23,8 @@
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "optimizer/optimizer.h"
-#include "utils/int8.h"
#include "utils/builtins.h"
-
+#include "utils/int8.h"
#define MAXINT8LEN 25
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index d4ba3bd..e2e16eb 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -27,11 +27,11 @@
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
-#include "utils/typcache.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
+#include "utils/typcache.h"
/*
* The context of the parser is maintained by the recursive descent
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 74b4bbe..9927d08 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -12,20 +12,20 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/transam.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
#include "utils/jsonb.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index e2c1bfb..fb5947a 100644
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -66,18 +66,17 @@
#include "miscadmin.h"
#include "regex/regex.h"
#include "utils/builtins.h"
+#include "utils/date.h"
#include "utils/datetime.h"
#include "utils/datum.h"
-#include "utils/formatting.h"
#include "utils/float.h"
+#include "utils/formatting.h"
#include "utils/guc.h"
#include "utils/json.h"
#include "utils/jsonpath.h"
-#include "utils/date.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-
/*
* Represents "base object" and it's "id" for .keyvalue() evaluation.
*/
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index d330a88..27474a6 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -29,18 +29,17 @@
#include "common/keywords.h"
#include "funcapi.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "parser/scansup.h"
+#include "pgstat.h"
#include "postmaster/syslogger.h"
#include "rewrite/rewriteHandler.h"
#include "storage/fd.h"
-#include "utils/lsyscache.h"
-#include "utils/ruleutils.h"
#include "tcop/tcopprot.h"
#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/ruleutils.h"
#include "utils/timestamp.h"
-
/*
* Common subroutine for num_nulls() and num_nonnulls().
* Returns true if successful, false if function should return NULL.
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index 0fdfee5..9557732 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -16,10 +16,9 @@
#include "postgres.h"
#include "common/int.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/formatting.h"
-#include "mb/pg_wchar.h"
-
static text *dotrim(const char *string, int stringlen,
const char *set, int setlen,
diff --git a/src/backend/utils/adt/rangetypes_gist.c b/src/backend/utils/adt/rangetypes_gist.c
index cf73f4d..96b22b7 100644
--- a/src/backend/utils/adt/rangetypes_gist.c
+++ b/src/backend/utils/adt/rangetypes_gist.c
@@ -16,12 +16,11 @@
#include "access/gist.h"
#include "access/stratnum.h"
+#include "utils/datum.h"
#include "utils/float.h"
#include "utils/fmgrprotos.h"
-#include "utils/datum.h"
#include "utils/rangetypes.h"
-
/*
* Range class properties used to segregate different classes of ranges in
* GiST. Each unique combination of properties is a class. CLS_EMPTY cannot
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 17a7f6c..4b1decf 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -33,11 +33,11 @@
#include "miscadmin.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
-#include "utils/acl.h"
#include "utils/regproc.h"
+#include "utils/syscache.h"
#include "utils/varlena.h"
static char *format_operator_internal(Oid operator_oid, bool force_qualify);
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index caf27f8..22b07df 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -36,9 +36,9 @@
#include "executor/executor.h"
#include "executor/spi.h"
#include "lib/ilist.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "parser/parse_relation.h"
-#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "utils/acl.h"
#include "utils/builtins.h"
@@ -54,7 +54,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
/*
* Local definitions
*/
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 3e64390..c1de869 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -50,9 +50,9 @@
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
-#include "parser/parse_node.h"
#include "parser/parse_agg.h"
#include "parser/parse_func.h"
+#include "parser/parse_node.h"
#include "parser/parse_oper.h"
#include "parser/parser.h"
#include "parser/parsetree.h"
@@ -74,7 +74,6 @@
#include "utils/varlena.h"
#include "utils/xml.h"
-
/* ----------
* Pretty formatting constants
* ----------
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index ab2b49f..4f574b3 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -16,8 +16,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_locale.h"
+#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
index af07563..217de77 100644
--- a/src/backend/utils/adt/tsquery_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -15,8 +15,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
typedef struct NODE
{
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
index 91200ee..282fb2d 100644
--- a/src/backend/utils/adt/tsquery_gist.c
+++ b/src/backend/utils/adt/tsquery_gist.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "access/stratnum.h"
#include "access/gist.h"
+#include "access/stratnum.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
index de46a00..7cb19db 100644
--- a/src/backend/utils/adt/tsquery_util.c
+++ b/src/backend/utils/adt/tsquery_util.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
/*
* Build QTNode tree for a tsquery given in QueryItem array format.
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
index e28859d..2d8359d 100644
--- a/src/backend/utils/adt/tsrank.c
+++ b/src/backend/utils/adt/tsrank.c
@@ -16,11 +16,10 @@
#include <limits.h>
#include <math.h>
+#include "miscadmin.h"
#include "tsearch/ts_utils.h"
#include "utils/array.h"
#include "utils/builtins.h"
-#include "miscadmin.h"
-
static const float weights[] = {0.1f, 0.2f, 0.4f, 1.0f};
diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c
index e220c5f..06bf5a9 100644
--- a/src/backend/utils/adt/txid.c
+++ b/src/backend/utils/adt/txid.c
@@ -26,16 +26,15 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "funcapi.h"
-#include "miscadmin.h"
#include "lib/qunique.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "postmaster/postmaster.h"
#include "storage/lwlock.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
-
/* txid will be signed int8 in database, so must limit to 63 bits */
#define MAX_TXID ((uint64) PG_INT64_MAX)
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index e63a4e5..2aed411 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -18,6 +18,7 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "libpq/pqformat.h"
+#include "mb/pg_wchar.h"
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "utils/array.h"
@@ -26,8 +27,6 @@
#include "utils/lsyscache.h"
#include "utils/pg_locale.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
-
/* common code for bpchartypmodin and varchartypmodin */
static int32
diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c
index 419bde5..1b0f738 100644
--- a/src/backend/utils/cache/evtcache.c
+++ b/src/backend/utils/cache/evtcache.c
@@ -16,17 +16,17 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/indexing.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_type.h"
#include "commands/trigger.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/evtcache.h"
+#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/memutils.h"
-#include "utils/hsearch.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 585dcee..ad1ff01 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -47,8 +47,8 @@
#include "catalog/pg_am.h"
#include "catalog/pg_amproc.h"
#include "catalog/pg_attrdef.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_database.h"
#include "catalog/pg_namespace.h"
@@ -90,7 +90,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
#define RELCACHE_INIT_FILEMAGIC 0x573266 /* version ID value */
/*
diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c
index c506dc9..d244eaf 100644
--- a/src/backend/utils/cache/relfilenodemap.c
+++ b/src/backend/utils/cache/relfilenodemap.c
@@ -22,9 +22,9 @@
#include "miscadmin.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
-#include "utils/fmgroids.h"
#include "utils/rel.h"
#include "utils/relfilenodemap.h"
#include "utils/relmapper.h"
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 36aee74..d69c0ff 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -53,13 +53,13 @@
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
#include "catalog/pg_range.h"
+#include "catalog/pg_replication_origin.h"
#include "catalog/pg_rewrite.h"
#include "catalog/pg_seclabel.h"
#include "catalog/pg_sequence.h"
#include "catalog/pg_shdepend.h"
#include "catalog/pg_shdescription.h"
#include "catalog/pg_shseclabel.h"
-#include "catalog/pg_replication_origin.h"
#include "catalog/pg_statistic.h"
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_statistic_ext_data.h"
@@ -75,11 +75,10 @@
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
#include "lib/qunique.h"
-#include "utils/rel.h"
#include "utils/catcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
-
/*---------------------------------------------------------------------------
Adding system caches:
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 29c5ec7..cc38669 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -46,9 +46,9 @@
#include "storage/fd.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
+#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/procsignal.h"
-#include "storage/proc.h"
#include "storage/sinvaladt.h"
#include "storage/smgr.h"
#include "storage/sync.h"
@@ -64,7 +64,6 @@
#include "utils/syscache.h"
#include "utils/timeout.h"
-
static HeapTuple GetDatabaseTuple(const char *dbname);
static HeapTuple GetDatabaseTupleByOid(Oid dboid);
static void PerformAuthentication(Port *port);
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
index 10222d5..d253678 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
@@ -12,12 +12,13 @@
*/
#include "postgres.h"
+
#include "fmgr.h"
#include "mb/pg_wchar.h"
-#include "../../Unicode/utf8_to_koi8r.map"
#include "../../Unicode/koi8r_to_utf8.map"
-#include "../../Unicode/utf8_to_koi8u.map"
#include "../../Unicode/koi8u_to_utf8.map"
+#include "../../Unicode/utf8_to_koi8r.map"
+#include "../../Unicode/utf8_to_koi8u.map"
PG_MODULE_MAGIC;
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
index e33ca42..34ddcba 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
@@ -12,12 +12,14 @@
*/
#include "postgres.h"
+
#include "fmgr.h"
#include "mb/pg_wchar.h"
#include "../../Unicode/iso8859_10_to_utf8.map"
#include "../../Unicode/iso8859_13_to_utf8.map"
#include "../../Unicode/iso8859_14_to_utf8.map"
#include "../../Unicode/iso8859_15_to_utf8.map"
+#include "../../Unicode/iso8859_16_to_utf8.map"
#include "../../Unicode/iso8859_2_to_utf8.map"
#include "../../Unicode/iso8859_3_to_utf8.map"
#include "../../Unicode/iso8859_4_to_utf8.map"
@@ -39,7 +41,6 @@
#include "../../Unicode/utf8_to_iso8859_7.map"
#include "../../Unicode/utf8_to_iso8859_8.map"
#include "../../Unicode/utf8_to_iso8859_9.map"
-#include "../../Unicode/iso8859_16_to_utf8.map"
PG_MODULE_MAGIC;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 994bf37..4b3769b 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -38,10 +38,10 @@
#include "catalog/pg_authid.h"
#include "commands/async.h"
#include "commands/prepare.h"
+#include "commands/trigger.h"
#include "commands/user.h"
#include "commands/vacuum.h"
#include "commands/variable.h"
-#include "commands/trigger.h"
#include "common/string.h"
#include "funcapi.h"
#include "jit/jit.h"
@@ -72,18 +72,18 @@
#include "replication/walsender.h"
#include "storage/bufmgr.h"
#include "storage/dsm_impl.h"
-#include "storage/standby.h"
#include "storage/fd.h"
#include "storage/large_object.h"
#include "storage/pg_shmem.h"
-#include "storage/proc.h"
#include "storage/predicate.h"
+#include "storage/proc.h"
+#include "storage/standby.h"
#include "tcop/tcopprot.h"
#include "tsearch/ts_cache.h"
#include "utils/builtins.h"
#include "utils/bytea.h"
-#include "utils/guc_tables.h"
#include "utils/float.h"
+#include "utils/guc_tables.h"
#include "utils/memutils.h"
#include "utils/pg_locale.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index 2d17839..8cab0e1 100644
--- a/src/backend/utils/misc/pg_config.c
+++ b/src/backend/utils/misc/pg_config.c
@@ -14,12 +14,12 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
#include "catalog/pg_type.h"
#include "common/config_info.h"
-#include "utils/builtins.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "port.h"
+#include "utils/builtins.h"
Datum
pg_config(PG_FUNCTION_ARGS)
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index b429218..3d0916f 100644
--- a/src/backend/utils/misc/pg_controldata.c
+++ b/src/backend/utils/misc/pg_controldata.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/transam.h"
-#include "access/xlog_internal.h"
#include "access/xlog.h"
+#include "access/xlog_internal.h"
#include "catalog/pg_control.h"
#include "catalog/pg_type.h"
#include "common/controldata_utils.h"
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index 67ba95c..6c851dd 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -28,8 +28,8 @@
#include "libpq/libpq.h"
#include "miscadmin.h"
-#include "utils/ps_status.h"
#include "utils/guc.h"
+#include "utils/ps_status.h"
extern char **environ;
bool update_process_title = true;
diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 5636081..327dca6 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -22,10 +22,9 @@
#include "access/htup_details.h"
#include "catalog/pg_authid.h"
+#include "miscadmin.h"
#include "utils/inval.h"
#include "utils/syscache.h"
-#include "miscadmin.h"
-
/*
* In common cases the same roleid (ie, the session or current ID) will
diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c
index 50deb35..db1dac3 100644
--- a/src/backend/utils/mmgr/slab.c
+++ b/src/backend/utils/mmgr/slab.c
@@ -52,10 +52,9 @@
#include "postgres.h"
+#include "lib/ilist.h"
#include "utils/memdebug.h"
#include "utils/memutils.h"
-#include "lib/ilist.h"
-
/*
* SlabContext is a specialized implementation of MemoryContext.
diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c
index deb9af5..16d464d 100644
--- a/src/backend/utils/time/combocid.c
+++ b/src/backend/utils/time/combocid.c
@@ -41,15 +41,14 @@
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/xact.h"
+#include "miscadmin.h"
#include "storage/shmem.h"
#include "utils/combocid.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-
/* Hash table to lookup combo cids by cmin and cmax */
static HTAB *comboHash = NULL;
--
1.8.3.1
Re: Ordering of header file inclusion
On Sun, Nov 10, 2019 at 5:30 PM vignesh C <vignesh21@gmail.com> wrote:
On Fri, Nov 8, 2019 at 2:22 PM Kuntal Ghosh <kuntalghosh.2007@gmail.com> wrote:
On Sat, Nov 2, 2019 at 7:42 AM vignesh C <vignesh21@gmail.com> wrote:
Thanks Amit for committing the changes.
I found couple of more inconsistencies, the attached patch includes
the fix for the same.Thanks for the patch. It seems you've to rebase the patch as it
doesn't apply on the latest HEAD. Apart from that, the changes looks
good to me.Thanks Kuntal for reviewing the patch. I have attached the patch which
has been rebased on the latest HEAD.
Thanks for the latest patch. I will look into this today.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Sun, Nov 10, 2019 at 5:30 PM vignesh C <vignesh21@gmail.com> wrote:
[review_latest_patch]:
Do we want to consider the ordering of map file inclusions as well
(see the changes pointed out below)? If so, what all we should
validate, is compilation of these modules sufficient? Tom, anyone, do
you have any opinion on this?
1.
utf8_and_cyrillic.c
#include "fmgr.h"
#include "mb/pg_wchar.h"
-#include "../../Unicode/utf8_to_koi8r.map"
#include "../../Unicode/koi8r_to_utf8.map"
-#include "../../Unicode/utf8_to_koi8u.map"
#include "../../Unicode/koi8u_to_utf8.map"
+#include "../../Unicode/utf8_to_koi8r.map"
+#include "../../Unicode/utf8_to_koi8u.map"PG_MODULE_MAGIC;
2.
utf8_and_iso8859.c
..
#include "../../Unicode/iso8859_13_to_utf8.map"
#include "../../Unicode/iso8859_14_to_utf8.map"
#include "../../Unicode/iso8859_15_to_utf8.map"
+#include "../../Unicode/iso8859_16_to_utf8.map"
#include "../../Unicode/iso8859_2_to_utf8.map"
#include "../../Unicode/iso8859_3_to_utf8.map"
#include "../../Unicode/iso8859_4_to_utf8.map"
@@ -39,7 +41,6 @@
#include "../../Unicode/utf8_to_iso8859_7.map"
#include "../../Unicode/utf8_to_iso8859_8.map"
#include "../../Unicode/utf8_to_iso8859_9.map"
-#include "../../Unicode/iso8859_16_to_utf8.map"--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Mon, Nov 11, 2019 at 11:36 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Sun, Nov 10, 2019 at 5:30 PM vignesh C <vignesh21@gmail.com> wrote:
[review_latest_patch]:
Do we want to consider the ordering of map file inclusions as well
(see the changes pointed out below)? If so, what all we should
validate, is compilation of these modules sufficient? Tom, anyone, do
you have any opinion on this?
Even I don't know how to validate the above changes by some test
application, other than by compiling.
1.
utf8_and_cyrillic.c#include "fmgr.h" #include "mb/pg_wchar.h" -#include "../../Unicode/utf8_to_koi8r.map" #include "../../Unicode/koi8r_to_utf8.map" -#include "../../Unicode/utf8_to_koi8u.map" #include "../../Unicode/koi8u_to_utf8.map" +#include "../../Unicode/utf8_to_koi8r.map" +#include "../../Unicode/utf8_to_koi8u.map"PG_MODULE_MAGIC;
2. utf8_and_iso8859.c .. #include "../../Unicode/iso8859_13_to_utf8.map" #include "../../Unicode/iso8859_14_to_utf8.map" #include "../../Unicode/iso8859_15_to_utf8.map" +#include "../../Unicode/iso8859_16_to_utf8.map" #include "../../Unicode/iso8859_2_to_utf8.map" #include "../../Unicode/iso8859_3_to_utf8.map" #include "../../Unicode/iso8859_4_to_utf8.map" @@ -39,7 +41,6 @@ #include "../../Unicode/utf8_to_iso8859_7.map" #include "../../Unicode/utf8_to_iso8859_8.map" #include "../../Unicode/utf8_to_iso8859_9.map" -#include "../../Unicode/iso8859_16_to_utf8.map"
Thanks Amit for your comments. Please find the updated patch which
does not include the changes mentioned above. I will post a separate
patch for these changes based on the response from others.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Attachments:
0001-Make-the-order-of-the-header-file-includes-consistent-backend-nov12th.patchtext/x-patch; charset=UTF-8; name=0001-Make-the-order-of-the-header-file-includes-consistent-backend-nov12th.patchDownload
From 01228364a04c1a4dd260f6b30ef33b8cd6657064 Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Tue, 12 Nov 2019 06:14:34 +0530
Subject: [PATCH] Make the order of the header file includes consistent in
backend modules.
The basic rule we follow here is to always first include 'postgres.h' or
'postgres_fe.h' whichever is applicable, then system header includes and
then Postgres header includes. In this, we also follow that all the
Postgres header includes are in order based on their ASCII value. We
generally follow these rules, but the code has deviated in many places.
This commit makes it consistent for backend modules.
Author: Vignesh C
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
---
src/backend/access/brin/brin_minmax.c | 5 ++--
src/backend/access/brin/brin_pageops.c | 3 +--
src/backend/access/brin/brin_tuple.c | 3 +--
src/backend/access/brin/brin_validate.c | 3 +--
src/backend/access/gin/ginbtree.c | 2 +-
src/backend/access/gin/ginfast.c | 10 ++++----
src/backend/access/gin/gininsert.c | 5 ++--
src/backend/access/gin/ginvalidate.c | 3 +--
src/backend/access/gist/gist.c | 3 +--
src/backend/access/gist/gistget.c | 4 +--
src/backend/access/gist/gistutil.c | 5 ++--
src/backend/access/hash/hash.c | 2 --
src/backend/access/hash/hash_xlog.c | 6 ++---
src/backend/access/hash/hashinsert.c | 4 +--
src/backend/access/hash/hashpage.c | 3 +--
src/backend/access/hash/hashsearch.c | 2 +-
src/backend/access/hash/hashutil.c | 2 +-
src/backend/access/heap/heapam_handler.c | 5 +---
src/backend/access/heap/pruneheap.c | 4 +--
src/backend/access/heap/rewriteheap.c | 12 ++-------
src/backend/access/nbtree/nbtxlog.c | 2 +-
src/backend/access/spgist/spgquadtreeproc.c | 3 +--
src/backend/access/transam/clog.c | 2 +-
src/backend/access/transam/parallel.c | 3 +--
src/backend/access/transam/rmgr.c | 4 +--
src/backend/access/transam/slru.c | 3 +--
src/backend/access/transam/twophase.c | 3 +--
src/backend/access/transam/xact.c | 3 +--
src/backend/access/transam/xlog.c | 6 ++---
src/backend/access/transam/xlogfuncs.c | 7 +++--
src/backend/access/transam/xloginsert.c | 2 +-
src/backend/access/transam/xlogreader.c | 3 +--
src/backend/catalog/aclchk.c | 5 ++--
src/backend/catalog/catalog.c | 3 +--
src/backend/catalog/index.c | 7 +++--
src/backend/catalog/objectaddress.c | 10 ++++----
src/backend/catalog/partition.c | 3 +--
src/backend/catalog/pg_enum.c | 3 +--
src/backend/catalog/pg_publication.c | 9 +++----
src/backend/catalog/pg_shdepend.c | 7 +++--
src/backend/catalog/pg_subscription.c | 10 ++------
src/backend/catalog/pg_type.c | 2 +-
src/backend/catalog/storage.c | 3 +--
src/backend/commands/alter.c | 5 ++--
src/backend/commands/cluster.c | 5 ++--
src/backend/commands/copy.c | 3 +--
src/backend/commands/createas.c | 3 +--
src/backend/commands/dbcommands.c | 3 +--
src/backend/commands/event_trigger.c | 6 ++---
src/backend/commands/functioncmds.c | 2 +-
src/backend/commands/lockcmds.c | 4 +--
src/backend/commands/opclasscmds.c | 3 +--
src/backend/commands/policy.c | 2 +-
src/backend/commands/publicationcmds.c | 10 +++-----
src/backend/commands/schemacmds.c | 3 +--
src/backend/commands/subscriptioncmds.c | 12 ++-------
src/backend/commands/tablecmds.c | 2 --
src/backend/commands/tablespace.c | 3 +--
src/backend/commands/variable.c | 4 +--
src/backend/commands/view.c | 3 +--
src/backend/executor/execAmi.c | 2 --
src/backend/executor/execExprInterp.c | 5 ++--
src/backend/executor/execGrouping.c | 2 +-
src/backend/executor/execParallel.c | 4 +--
src/backend/executor/execProcnode.c | 3 +--
src/backend/executor/execTuples.c | 3 +--
src/backend/executor/nodeAgg.c | 3 +--
src/backend/executor/nodeBitmapHeapscan.c | 3 +--
src/backend/executor/nodeCustom.c | 3 +--
src/backend/executor/nodeHash.c | 3 +--
src/backend/executor/nodeSubplan.c | 3 +--
src/backend/executor/nodeTableFuncscan.c | 3 +--
src/backend/executor/nodeWindowAgg.c | 2 +-
src/backend/jit/jit.c | 7 ++---
src/backend/jit/llvm/llvmjit.c | 18 +++++--------
src/backend/jit/llvm/llvmjit_expr.c | 3 +--
src/backend/libpq/be-secure.c | 5 ++--
src/backend/libpq/hba.c | 2 +-
src/backend/nodes/nodeFuncs.c | 3 +--
src/backend/optimizer/geqo/geqo_cx.c | 2 +-
src/backend/optimizer/geqo/geqo_erx.c | 2 +-
src/backend/optimizer/path/clausesel.c | 3 +--
src/backend/optimizer/plan/initsplan.c | 3 +--
src/backend/optimizer/plan/planagg.c | 3 +--
src/backend/optimizer/plan/planner.c | 7 +++--
src/backend/optimizer/prep/preptlist.c | 3 +--
src/backend/optimizer/util/pathnode.c | 3 +--
src/backend/optimizer/util/plancat.c | 7 +++--
src/backend/parser/parse_clause.c | 12 ++++-----
src/backend/parser/parse_expr.c | 3 +--
src/backend/parser/parse_node.c | 3 +--
src/backend/parser/parse_relation.c | 3 +--
src/backend/parser/parse_target.c | 3 +--
src/backend/parser/parse_type.c | 3 +--
src/backend/parser/scansup.c | 3 +--
src/backend/partitioning/partbounds.c | 2 +-
src/backend/partitioning/partdesc.c | 4 +--
src/backend/postmaster/bgworker.c | 2 +-
src/backend/postmaster/bgwriter.c | 3 +--
src/backend/postmaster/fork_process.c | 3 ++-
src/backend/postmaster/pgstat.c | 4 +--
src/backend/replication/basebackup.c | 3 +--
.../libpqwalreceiver/libpqwalreceiver.c | 4 +--
src/backend/replication/logical/decode.c | 7 ++---
src/backend/replication/logical/launcher.c | 16 +++---------
src/backend/replication/logical/logical.c | 10 +++-----
src/backend/replication/logical/logicalfuncs.c | 30 ++++++++--------------
src/backend/replication/logical/message.c | 9 ++-----
src/backend/replication/logical/origin.c | 18 +++++--------
src/backend/replication/logical/snapbuild.c | 15 ++++-------
src/backend/replication/logical/tablesync.c | 13 +++-------
src/backend/replication/pgoutput/pgoutput.c | 5 +---
src/backend/replication/slotfuncs.c | 2 +-
src/backend/rewrite/rowsecurity.c | 2 +-
src/backend/statistics/dependencies.c | 4 +--
src/backend/statistics/mvdistinct.c | 7 +++--
src/backend/storage/buffer/buf_init.c | 3 +--
src/backend/storage/buffer/buf_table.c | 3 +--
src/backend/storage/file/buffile.c | 4 +--
src/backend/storage/file/copydir.c | 4 +--
src/backend/storage/file/fd.c | 3 +--
src/backend/storage/ipc/dsm_impl.c | 6 ++---
src/backend/storage/ipc/ipci.c | 2 +-
src/backend/storage/ipc/procsignal.c | 3 +--
src/backend/storage/ipc/sinvaladt.c | 3 +--
src/backend/storage/lmgr/lwlock.c | 2 +-
src/backend/storage/lmgr/proc.c | 3 +--
src/backend/storage/lmgr/s_lock.c | 3 +--
src/backend/storage/page/checksum.c | 1 -
src/backend/storage/smgr/md.c | 8 +++---
src/backend/storage/sync/sync.c | 8 +++---
src/backend/tcop/postgres.c | 7 +++--
src/backend/tcop/utility.c | 7 +++--
src/backend/tsearch/wparser.c | 3 +--
src/backend/utils/adt/acl.c | 5 ++--
src/backend/utils/adt/datetime.c | 1 -
src/backend/utils/adt/format_type.c | 2 +-
src/backend/utils/adt/int8.c | 3 +--
src/backend/utils/adt/json.c | 4 +--
src/backend/utils/adt/jsonb.c | 4 +--
src/backend/utils/adt/jsonpath_exec.c | 5 ++--
src/backend/utils/adt/misc.c | 7 +++--
src/backend/utils/adt/oracle_compat.c | 3 +--
src/backend/utils/adt/rangetypes_gist.c | 3 +--
src/backend/utils/adt/regproc.c | 4 +--
src/backend/utils/adt/ri_triggers.c | 3 +--
src/backend/utils/adt/ruleutils.c | 3 +--
src/backend/utils/adt/tsquery.c | 2 +-
src/backend/utils/adt/tsquery_cleanup.c | 2 +-
src/backend/utils/adt/tsquery_gist.c | 2 +-
src/backend/utils/adt/tsquery_util.c | 2 +-
src/backend/utils/adt/tsrank.c | 3 +--
src/backend/utils/adt/txid.c | 3 +--
src/backend/utils/adt/varchar.c | 3 +--
src/backend/utils/cache/evtcache.c | 4 +--
src/backend/utils/cache/relcache.c | 3 +--
src/backend/utils/cache/relfilenodemap.c | 2 +-
src/backend/utils/cache/syscache.c | 5 ++--
src/backend/utils/init/postinit.c | 3 +--
src/backend/utils/misc/guc.c | 8 +++---
src/backend/utils/misc/pg_config.c | 6 ++---
src/backend/utils/misc/pg_controldata.c | 2 +-
src/backend/utils/misc/ps_status.c | 2 +-
src/backend/utils/misc/superuser.c | 3 +--
src/backend/utils/mmgr/slab.c | 3 +--
src/backend/utils/time/combocid.c | 3 +--
166 files changed, 281 insertions(+), 465 deletions(-)
diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c
index ad0d18e..655c0b5 100644
--- a/src/backend/access/brin/brin_minmax.c
+++ b/src/backend/access/brin/brin_minmax.c
@@ -10,19 +10,18 @@
*/
#include "postgres.h"
-#include "access/genam.h"
#include "access/brin_internal.h"
#include "access/brin_tuple.h"
+#include "access/genam.h"
#include "access/stratnum.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_amop.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/datum.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-
typedef struct MinmaxOpaque
{
Oid cached_subtype;
diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c
index f907b4b..c4cbe84 100644
--- a/src/backend/access/brin/brin_pageops.c
+++ b/src/backend/access/brin/brin_pageops.c
@@ -10,8 +10,8 @@
*/
#include "postgres.h"
-#include "access/brin_pageops.h"
#include "access/brin_page.h"
+#include "access/brin_pageops.h"
#include "access/brin_revmap.h"
#include "access/brin_xlog.h"
#include "access/xloginsert.h"
@@ -22,7 +22,6 @@
#include "storage/smgr.h"
#include "utils/rel.h"
-
/*
* Maximum size of an entry in a BRIN_PAGETYPE_REGULAR page. We can tolerate
* a single item per page, unlike other index AMs.
diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c
index 2b38617..6d24e53 100644
--- a/src/backend/access/brin/brin_tuple.c
+++ b/src/backend/access/brin/brin_tuple.c
@@ -31,14 +31,13 @@
*/
#include "postgres.h"
-#include "access/htup_details.h"
#include "access/brin_tuple.h"
+#include "access/htup_details.h"
#include "access/tupdesc.h"
#include "access/tupmacs.h"
#include "utils/datum.h"
#include "utils/memutils.h"
-
static inline void brin_deconstruct_tuple(BrinDesc *brdesc,
char *tp, bits8 *nullbits, bool nulls,
Datum *values, bool *allnulls, bool *hasnulls);
diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index 0129338..02337a7 100644
--- a/src/backend/access/brin/brin_validate.c
+++ b/src/backend/access/brin/brin_validate.c
@@ -22,9 +22,8 @@
#include "catalog/pg_opfamily.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
-
+#include "utils/syscache.h"
/*
* Validator for a BRIN opclass.
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 4c29261..20adfa2 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -17,8 +17,8 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
#include "access/xloginsert.h"
-#include "storage/predicate.h"
#include "miscadmin.h"
+#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index 439a91b..3d2153b 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -20,19 +20,19 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/xlog.h"
-#include "commands/vacuum.h"
+#include "access/xloginsert.h"
#include "catalog/pg_am.h"
+#include "commands/vacuum.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/acl.h"
#include "postmaster/autovacuum.h"
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
/* GUC parameter */
int gin_pending_list_limit = 0;
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index d290581..1ad6228 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -16,18 +16,17 @@
#include "access/gin_private.h"
#include "access/ginxlog.h"
-#include "access/xloginsert.h"
#include "access/tableam.h"
+#include "access/xloginsert.h"
#include "catalog/index.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
-#include "storage/smgr.h"
#include "storage/indexfsm.h"
#include "storage/predicate.h"
+#include "storage/smgr.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
typedef struct
{
GinState ginstate;
diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 63bd7f2..5d96f29 100644
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -23,9 +23,8 @@
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/regproc.h"
-
+#include "utils/syscache.h"
/*
* Validator for a GIN opclass.
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 0cc8791..8d9c8d0 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -18,15 +18,14 @@
#include "access/gistscan.h"
#include "catalog/pg_collation.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
/* non-export function prototypes */
static void gistfixsplit(GISTInsertState *state, GISTSTATE *giststate);
static bool gistinserttuple(GISTInsertState *state, GISTInsertStack *stack,
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 22d790d..98b6892 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -17,11 +17,11 @@
#include "access/genam.h"
#include "access/gist_private.h"
#include "access/relscan.h"
+#include "lib/pairingheap.h"
#include "miscadmin.h"
+#include "pgstat.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
-#include "pgstat.h"
-#include "lib/pairingheap.h"
#include "utils/float.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
index a23dec7..553a6d6 100644
--- a/src/backend/access/gist/gistutil.c
+++ b/src/backend/access/gist/gistutil.c
@@ -22,10 +22,9 @@
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
#include "utils/float.h"
-#include "utils/syscache.h"
-#include "utils/snapmgr.h"
#include "utils/lsyscache.h"
-
+#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
* Write itup vector to page, has no control of free space.
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 6c05836..a0597a0 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -31,8 +31,6 @@
#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
#include "utils/rel.h"
-#include "miscadmin.h"
-
/* Working state for hashbuild and its callback */
typedef struct
diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c
index 86e7210..c1d248a 100644
--- a/src/backend/access/hash/hash_xlog.c
+++ b/src/backend/access/hash/hash_xlog.c
@@ -17,11 +17,11 @@
#include "access/bufmask.h"
#include "access/hash.h"
#include "access/hash_xlog.h"
-#include "access/xlogutils.h"
-#include "access/xlog.h"
#include "access/transam.h"
-#include "storage/procarray.h"
+#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* replay a hash index meta page
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 89876d2..e0ca1b0 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -18,10 +18,10 @@
#include "access/hash.h"
#include "access/hash_xlog.h"
#include "miscadmin.h"
-#include "utils/rel.h"
-#include "storage/lwlock.h"
#include "storage/buf_internals.h"
+#include "storage/lwlock.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static void _hash_vacuum_one_page(Relation rel, Relation hrel,
Buffer metabuf, Buffer buf);
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 838ee68..63697bf 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -32,9 +32,8 @@
#include "access/hash_xlog.h"
#include "miscadmin.h"
#include "storage/lmgr.h"
-#include "storage/smgr.h"
#include "storage/predicate.h"
-
+#include "storage/smgr.h"
static bool _hash_alloc_buckets(Relation rel, BlockNumber firstblock,
uint32 nblocks);
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 79ae499..725e614 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -18,8 +18,8 @@
#include "access/relscan.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "utils/rel.h"
#include "storage/predicate.h"
+#include "utils/rel.h"
static bool _hash_readpage(IndexScanDesc scan, Buffer *bufP,
ScanDirection dir);
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 3fb92ea..c5005f4 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -17,9 +17,9 @@
#include "access/hash.h"
#include "access/reloptions.h"
#include "access/relscan.h"
+#include "storage/buf_internals.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
-#include "storage/buf_internals.h"
#define CALC_NEW_BUCKET(old_bucket, lowmask) \
old_bucket | (lowmask + 1)
diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
index 7081172..92073fe 100644
--- a/src/backend/access/heap/heapam_handler.c
+++ b/src/backend/access/heap/heapam_handler.c
@@ -19,8 +19,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/heaptoast.h"
@@ -35,10 +33,10 @@
#include "catalog/storage_xlog.h"
#include "commands/progress.h"
#include "executor/executor.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "storage/predicate.h"
#include "storage/procarray.h"
@@ -46,7 +44,6 @@
#include "utils/builtins.h"
#include "utils/rel.h"
-
static void reform_and_rewrite_tuple(HeapTuple tuple,
Relation OldHeap, Relation NewHeap,
Datum *values, bool *isnull, RewriteState rwstate);
diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
index a0d2217..6d62a96 100644
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@ -16,15 +16,15 @@
#include "access/heapam.h"
#include "access/heapam_xlog.h"
-#include "access/transam.h"
#include "access/htup_details.h"
+#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
-#include "utils/snapmgr.h"
#include "utils/rel.h"
+#include "utils/snapmgr.h"
/* Working data for heap_page_prune and subroutines */
typedef struct
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
index d41dbcf..d285b1f 100644
--- a/src/backend/access/heap/rewriteheap.c
+++ b/src/backend/access/heap/rewriteheap.c
@@ -105,8 +105,6 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam.h"
#include "access/heapam_xlog.h"
#include "access/heaptoast.h"
@@ -114,25 +112,19 @@
#include "access/transam.h"
#include "access/xact.h"
#include "access/xloginsert.h"
-
#include "catalog/catalog.h"
-
#include "lib/ilist.h"
-
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "replication/logical.h"
#include "replication/slot.h"
-
#include "storage/bufmgr.h"
#include "storage/fd.h"
+#include "storage/procarray.h"
#include "storage/smgr.h"
-
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "storage/procarray.h"
-
/*
* State associated with a rewrite operation. This is opaque to the user
* of the rewrite facility.
diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index dd5315c..44f6283 100644
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -20,8 +20,8 @@
#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlogutils.h"
-#include "storage/procarray.h"
#include "miscadmin.h"
+#include "storage/procarray.h"
/*
* _bt_restore_page -- re-enter all the index tuples on a page
diff --git a/src/backend/access/spgist/spgquadtreeproc.c b/src/backend/access/spgist/spgquadtreeproc.c
index e50108e..992c558 100644
--- a/src/backend/access/spgist/spgquadtreeproc.c
+++ b/src/backend/access/spgist/spgquadtreeproc.c
@@ -16,14 +16,13 @@
#include "postgres.h"
#include "access/spgist.h"
-#include "access/stratnum.h"
#include "access/spgist_private.h"
+#include "access/stratnum.h"
#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/float.h"
#include "utils/geo_decls.h"
-
Datum
spg_quad_config(PG_FUNCTION_ARGS)
{
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index 595c860..7f7eb21 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -39,8 +39,8 @@
#include "access/xloginsert.h"
#include "access/xlogutils.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "storage/proc.h"
/*
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
index 55d129a..d147236 100644
--- a/src/backend/access/transam/parallel.c
+++ b/src/backend/access/transam/parallel.c
@@ -19,9 +19,9 @@
#include "access/session.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_enum.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
+#include "catalog/pg_enum.h"
#include "commands/async.h"
#include "executor/execParallel.h"
#include "libpq/libpq.h"
@@ -43,7 +43,6 @@
#include "utils/snapmgr.h"
#include "utils/typcache.h"
-
/*
* We don't want to waste a lot of memory on an error queue which, most of
* the time, will process only a handful of small messages. However, it is
diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c
index 9368b56..58091f6 100644
--- a/src/backend/access/transam/rmgr.c
+++ b/src/backend/access/transam/rmgr.c
@@ -7,14 +7,14 @@
*/
#include "postgres.h"
+#include "access/brin_xlog.h"
#include "access/clog.h"
#include "access/commit_ts.h"
+#include "access/generic_xlog.h"
#include "access/ginxlog.h"
#include "access/gistxlog.h"
-#include "access/generic_xlog.h"
#include "access/hash_xlog.h"
#include "access/heapam_xlog.h"
-#include "access/brin_xlog.h"
#include "access/multixact.h"
#include "access/nbtxlog.h"
#include "access/spgxlog.h"
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index e38f919..59bad09 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -54,11 +54,10 @@
#include "access/slru.h"
#include "access/transam.h"
#include "access/xlog.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "storage/fd.h"
#include "storage/shmem.h"
-#include "miscadmin.h"
-
#define SlruFileName(ctl, path, seg) \
snprintf(path, MAXPGPATH, "%s/%04X", (ctl)->Dir, seg)
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 546bd43..712e842 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -85,8 +85,8 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "access/xloginsert.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
+#include "access/xlogutils.h"
#include "catalog/pg_type.h"
#include "catalog/storage.h"
#include "funcapi.h"
@@ -108,7 +108,6 @@
#include "utils/memutils.h"
#include "utils/timestamp.h"
-
/*
* Directory where Two-phase commit files reside within PGDATA
*/
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index e5e2902..8fe38c3 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -40,6 +40,7 @@
#include "libpq/be-fsstubs.h"
#include "libpq/pqsignal.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "replication/logical.h"
#include "replication/logicallauncher.h"
@@ -65,8 +66,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
-
/*
* User-tweakable parameters
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 55d01a8..3b766e6 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -42,15 +42,16 @@
#include "commands/tablespace.h"
#include "common/controldata_utils.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "port/atomics.h"
#include "postmaster/bgwriter.h"
-#include "postmaster/walwriter.h"
#include "postmaster/startup.h"
+#include "postmaster/walwriter.h"
#include "replication/basebackup.h"
#include "replication/logical.h"
-#include "replication/slot.h"
#include "replication/origin.h"
+#include "replication/slot.h"
#include "replication/snapbuild.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
@@ -74,7 +75,6 @@
#include "utils/relmapper.h"
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-#include "pg_trace.h"
extern uint32 bootstrap_data_checksum_version;
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index 8f17988..1fccf29 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -27,17 +27,16 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "replication/walreceiver.h"
+#include "storage/fd.h"
+#include "storage/ipc.h"
#include "storage/smgr.h"
#include "utils/builtins.h"
+#include "utils/guc.h"
#include "utils/memutils.h"
#include "utils/numeric.h"
-#include "utils/guc.h"
#include "utils/pg_lsn.h"
#include "utils/timestamp.h"
#include "utils/tuplestore.h"
-#include "storage/fd.h"
-#include "storage/ipc.h"
-
/*
* Store label file and tablespace map during non-exclusive backups.
diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c
index 3ec67d4..aa9dca0 100644
--- a/src/backend/access/transam/xloginsert.c
+++ b/src/backend/access/transam/xloginsert.c
@@ -26,11 +26,11 @@
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "miscadmin.h"
+#include "pg_trace.h"
#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/proc.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/* Buffer size required to store a compressed version of backup block image */
#define PGLZ_MAX_BLCKSZ PGLZ_MAX_OUTPUT(BLCKSZ)
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index 6d85819..7f24f0c 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -18,9 +18,9 @@
#include "postgres.h"
#include "access/transam.h"
-#include "access/xlogrecord.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
+#include "access/xlogrecord.h"
#include "catalog/pg_control.h"
#include "common/pg_lzcompress.h"
#include "replication/origin.h"
@@ -30,7 +30,6 @@
#include "utils/memutils.h"
#endif
-
static void report_invalid_record(XLogReaderState *state, const char *fmt,...)
pg_attribute_printf(2, 3);
static bool allocate_recordbuf(XLogReaderState *state, uint32 reclength);
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 88ce37c..bed10f9 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -52,12 +52,12 @@
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_tablespace.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_transform.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
#include "catalog/pg_ts_template.h"
-#include "catalog/pg_transform.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
@@ -76,7 +76,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
/*
* Internal format used by ALTER DEFAULT PRIVILEGES.
*/
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 1af31c2..6b10469 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -31,9 +31,9 @@
#include "catalog/pg_auth_members.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_pltemplate.h"
-#include "catalog/pg_db_role_setting.h"
#include "catalog/pg_replication_origin.h"
#include "catalog/pg_shdepend.h"
#include "catalog/pg_shdescription.h"
@@ -50,7 +50,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
/*
* IsSystemRelation
* True iff the relation is either a system catalog or a toast table.
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 7c34509..67f637d 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -43,11 +43,11 @@
#include "catalog/pg_am.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
-#include "catalog/pg_description.h"
#include "catalog/pg_depend.h"
+#include "catalog/pg_description.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_tablespace.h"
#include "catalog/pg_trigger.h"
#include "catalog/pg_type.h"
@@ -76,10 +76,9 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_rusage.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/snapmgr.h"
-
/* Potentially set by pg_upgrade_support functions */
Oid binary_upgrade_next_index_pg_class_oid = InvalidOid;
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index b8cbe6a..ae3002b 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -29,13 +29,13 @@
#include "catalog/pg_attrdef.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_cast.h"
-#include "catalog/pg_default_acl.h"
-#include "catalog/pg_enum.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/pg_collation.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_conversion.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_default_acl.h"
+#include "catalog/pg_enum.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_extension.h"
#include "catalog/pg_foreign_data_wrapper.h"
#include "catalog/pg_foreign_server.h"
@@ -44,10 +44,10 @@
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
#include "catalog/pg_opclass.h"
-#include "catalog/pg_opfamily.h"
#include "catalog/pg_operator.h"
-#include "catalog/pg_proc.h"
+#include "catalog/pg_opfamily.h"
#include "catalog/pg_policy.h"
+#include "catalog/pg_proc.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
#include "catalog/pg_rewrite.h"
diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
index 53af14e..5dfa449 100644
--- a/src/backend/catalog/partition.c
+++ b/src/backend/catalog/partition.c
@@ -16,9 +16,9 @@
#include "access/genam.h"
#include "access/htup_details.h"
+#include "access/sysattr.h"
#include "access/table.h"
#include "access/tupconvert.h"
-#include "access/sysattr.h"
#include "catalog/indexing.h"
#include "catalog/partition.h"
#include "catalog/pg_inherits.h"
@@ -32,7 +32,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static Oid get_partition_parent_worker(Relation inhRel, Oid relid);
static void get_partition_ancestors_worker(Relation inhRel, Oid relid,
List **ancestors);
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index d0ff802..be0f065 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -22,9 +22,9 @@
#include "catalog/indexing.h"
#include "catalog/pg_enum.h"
#include "catalog/pg_type.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
#include "nodes/value.h"
+#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/fmgroids.h"
@@ -32,7 +32,6 @@
#include "utils/memutils.h"
#include "utils/syscache.h"
-
/* Potentially set by pg_upgrade_support functions */
Oid binary_upgrade_next_pg_enum_oid = InvalidOid;
diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index fd5da7d..d442c8e 100644
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -14,15 +14,11 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/index.h"
@@ -30,10 +26,11 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
-
+#include "catalog/pg_type.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index fb7f8dd..59f97bf 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -34,8 +34,8 @@
#include "catalog/pg_largeobject.h"
#include "catalog/pg_largeobject_metadata.h"
#include "catalog/pg_namespace.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_shdepend.h"
@@ -47,9 +47,9 @@
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
#include "commands/alter.h"
-#include "commands/dbcommands.h"
#include "commands/collationcmds.h"
#include "commands/conversioncmds.h"
+#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/extension.h"
@@ -60,13 +60,12 @@
#include "commands/subscriptioncmds.h"
#include "commands/tablecmds.h"
#include "commands/typecmds.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
+#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/fmgroids.h"
#include "utils/syscache.h"
-
typedef enum
{
LOCAL_OBJECT,
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index afee283..68d88ff 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -14,23 +14,18 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/indexing.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "catalog/pg_type.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
-
#include "storage/lmgr.h"
-
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
@@ -38,7 +33,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static List *textarray_to_stringlist(ArrayType *textarray);
/*
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 2a51501..a8c1de5 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-#include "catalog/catalog.h"
#include "catalog/binary_upgrade.h"
+#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/objectaccess.h"
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index 625af8d..056ea3d 100644
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -19,8 +19,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/visibilitymap.h"
#include "access/xact.h"
#include "access/xlog.h"
@@ -28,6 +26,7 @@
#include "access/xlogutils.h"
#include "catalog/storage.h"
#include "catalog/storage_xlog.h"
+#include "miscadmin.h"
#include "storage/freespace.h"
#include "storage/smgr.h"
#include "utils/memutils.h"
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 562e3d3..d425ef9 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -34,8 +34,8 @@
#include "catalog/pg_opclass.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
-#include "catalog/pg_subscription.h"
#include "catalog/pg_statistic_ext.h"
+#include "catalog/pg_subscription.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
@@ -57,8 +57,8 @@
#include "commands/trigger.h"
#include "commands/typecmds.h"
#include "commands/user.h"
-#include "parser/parse_func.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
#include "rewrite/rewriteDefine.h"
#include "tcop/utility.h"
#include "utils/builtins.h"
@@ -67,7 +67,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static Oid AlterObjectNamespace_internal(Relation rel, Oid objid, Oid nspOid);
/*
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index a23128d..b8c349f 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -22,17 +22,17 @@
#include "access/multixact.h"
#include "access/relscan.h"
#include "access/tableam.h"
-#include "access/transam.h"
#include "access/toast_internals.h"
+#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_am.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/heap.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_am.h"
#include "catalog/toasting.h"
#include "commands/cluster.h"
#include "commands/progress.h"
@@ -55,7 +55,6 @@
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-
/*
* This struct is used to pass around the information on tables to be
* clustered. We need this so we can make a list of them when invoked without
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index e17d8c7..42a147b 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -39,8 +39,8 @@
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
-#include "optimizer/optimizer.h"
#include "nodes/makefuncs.h"
+#include "optimizer/optimizer.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
#include "parser/parse_expr.h"
@@ -58,7 +58,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
#define OCTVALUE(c) ((c) - '0')
diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c
index b7d2206..2bf7083 100644
--- a/src/backend/commands/createas.c
+++ b/src/backend/commands/createas.c
@@ -25,8 +25,8 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -51,7 +51,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
typedef struct
{
DestReceiver pub; /* publicly-known function pointers */
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 4ad62e6..6f28859 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -53,8 +53,8 @@
#include "replication/slot.h"
#include "storage/copydir.h"
#include "storage/fd.h"
-#include "storage/lmgr.h"
#include "storage/ipc.h"
+#include "storage/lmgr.h"
#include "storage/md.h"
#include "storage/procarray.h"
#include "storage/smgr.h"
@@ -65,7 +65,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
typedef struct
{
Oid src_dboid; /* source (template) DB */
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index 0301ae1..6b022af 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -33,11 +33,12 @@
#include "commands/extension.h"
#include "commands/trigger.h"
#include "funcapi.h"
-#include "parser/parse_func.h"
-#include "pgstat.h"
#include "lib/ilist.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
+#include "pgstat.h"
#include "tcop/deparse_utility.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/evtcache.h"
@@ -46,7 +47,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
typedef struct EventTriggerQueryState
{
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 40f1f9a..94411b5 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -34,8 +34,8 @@
#include "access/genam.h"
#include "access/htup_details.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index bae3b38..2621e36 100644
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -20,13 +20,13 @@
#include "catalog/pg_inherits.h"
#include "commands/lockcmds.h"
#include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
#include "parser/parse_clause.h"
+#include "rewrite/rewriteHandler.h"
#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "rewrite/rewriteHandler.h"
-#include "nodes/nodeFuncs.h"
static void LockTableRecurse(Oid reloid, LOCKMODE lockmode, bool nowait, Oid userid);
static AclResult LockTableAclCheck(Oid relid, LOCKMODE lockmode, Oid userid);
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index 6a1ccde..cb7a6bd 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -19,8 +19,8 @@
#include "access/genam.h"
#include "access/hash.h"
-#include "access/nbtree.h"
#include "access/htup_details.h"
+#include "access/nbtree.h"
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/catalog.h"
@@ -50,7 +50,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterOpFamilyAdd(AlterOpFamilyStmt *stmt,
Oid amoid, Oid opfamilyoid,
int maxOpNumber, int maxProcNumber,
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index 1df7662..36093dc 100644
--- a/src/backend/commands/policy.c
+++ b/src/backend/commands/policy.c
@@ -16,8 +16,8 @@
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index f115d4b..fbf11c8 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -14,29 +14,25 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/publicationcmds.h"
-
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 6cf94a3..7cf3cc1 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -21,8 +21,8 @@
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_namespace.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterSchemaOwner_internal(HeapTuple tup, Relation rel, Oid newOwnerId);
/*
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 1419195..5408edc 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -14,38 +14,30 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/subscriptioncmds.h"
-
#include "executor/executor.h"
-
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
-
#include "replication/logicallauncher.h"
#include "replication/origin.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
#include "replication/worker_internal.h"
-
#include "storage/lmgr.h"
-
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 5597be6..496c206 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -20,7 +20,6 @@
#include "access/multixact.h"
#include "access/reloptions.h"
#include "access/relscan.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/tupconvert.h"
@@ -100,7 +99,6 @@
#include "utils/timestamp.h"
#include "utils/typcache.h"
-
/*
* ON COMMIT action list
*/
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 84efb41..570dcb2 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -51,8 +51,8 @@
#include <sys/stat.h>
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -84,7 +84,6 @@
#include "utils/rel.h"
#include "utils/varlena.h"
-
/* GUC variables */
char *default_tablespace = NULL;
char *temp_tablespaces = NULL;
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 1119e21..a0bd8c3 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -24,14 +24,14 @@
#include "access/xlog.h"
#include "catalog/pg_authid.h"
#include "commands/variable.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
/*
* DATESTYLE
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index bea890f..9fa433a 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -26,8 +26,8 @@
#include "parser/analyze.h"
#include "parser/parse_relation.h"
#include "rewrite/rewriteDefine.h"
-#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteHandler.h"
+#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteSupport.h"
#include "utils/acl.h"
#include "utils/builtins.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc);
/*---------------------------------------------------------------------
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 1f18e5d..779d3dc 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -28,7 +28,6 @@
#include "executor/nodeGather.h"
#include "executor/nodeGatherMerge.h"
#include "executor/nodeGroup.h"
-#include "executor/nodeGroup.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
#include "executor/nodeIndexonlyscan.h"
@@ -62,7 +61,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static bool IndexSupportsBackwardScan(Oid indexid);
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
index 0cd6f65..dbed597 100644
--- a/src/backend/executor/execExprInterp.c
+++ b/src/backend/executor/execExprInterp.c
@@ -62,22 +62,21 @@
#include "executor/execExpr.h"
#include "executor/nodeSubplan.h"
#include "funcapi.h"
-#include "utils/array.h"
-#include "utils/memutils.h"
#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
#include "parser/parsetree.h"
#include "pgstat.h"
+#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datum.h"
#include "utils/expandedrecord.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/timestamp.h"
#include "utils/typcache.h"
#include "utils/xml.h"
-
/*
* Use computed-goto-based opcode dispatch when computed gotos are available.
* But use a separate symbol so that it's easy to adjust locally in this file
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index 6349c11..7bc5e40 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -21,8 +21,8 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "miscadmin.h"
-#include "utils/lsyscache.h"
#include "utils/hashutils.h"
+#include "utils/lsyscache.h"
#include "utils/memutils.h"
static uint32 TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple);
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 53cd2fc..b256642 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -31,14 +31,15 @@
#include "executor/nodeForeignscan.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
-#include "executor/nodeIndexscan.h"
#include "executor/nodeIndexonlyscan.h"
+#include "executor/nodeIndexscan.h"
#include "executor/nodeSeqscan.h"
#include "executor/nodeSort.h"
#include "executor/nodeSubplan.h"
#include "executor/tqueue.h"
#include "jit/jit.h"
#include "nodes/nodeFuncs.h"
+#include "pgstat.h"
#include "storage/spin.h"
#include "tcop/tcopprot.h"
#include "utils/datum.h"
@@ -46,7 +47,6 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
-#include "pgstat.h"
/*
* Magic numbers for parallel executor communication. We use constants
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index c227282..7a6e285 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -113,9 +113,8 @@
#include "executor/nodeValuesscan.h"
#include "executor/nodeWindowAgg.h"
#include "executor/nodeWorktablescan.h"
-#include "nodes/nodeFuncs.h"
#include "miscadmin.h"
-
+#include "nodes/nodeFuncs.h"
static TupleTableSlot *ExecProcNodeFirst(PlanState *node);
static TupleTableSlot *ExecProcNodeInstr(PlanState *node);
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 46d55d9..360d3c8 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -60,8 +60,8 @@
#include "access/heaptoast.h"
#include "access/htup_details.h"
#include "access/tupdesc_details.h"
-#include "funcapi.h"
#include "catalog/pg_type.h"
+#include "funcapi.h"
#include "nodes/nodeFuncs.h"
#include "storage/bufmgr.h"
#include "utils/builtins.h"
@@ -69,7 +69,6 @@
#include "utils/lsyscache.h"
#include "utils/typcache.h"
-
static TupleDesc ExecTypeFromTLInternal(List *targetList,
bool skipjunk);
static pg_attribute_always_inline void slot_deform_heap_tuple(TupleTableSlot *slot, HeapTuple tuple, uint32 *offp,
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 58c376a..6ee24ea 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -231,13 +231,12 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/datum.h"
#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-#include "utils/datum.h"
-
static void select_current_set(AggState *aggstate, int setno, bool is_hash);
static void initialize_phase(AggState *aggstate, int newphase);
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index f62105f..256d61a 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -49,9 +49,8 @@
#include "storage/predicate.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "utils/spccache.h"
#include "utils/snapmgr.h"
-
+#include "utils/spccache.h"
static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node);
static inline void BitmapDoneInitializingSharedState(ParallelBitmapHeapState *pstate);
diff --git a/src/backend/executor/nodeCustom.c b/src/backend/executor/nodeCustom.c
index 6dd0916..ccaa68b 100644
--- a/src/backend/executor/nodeCustom.c
+++ b/src/backend/executor/nodeCustom.c
@@ -13,16 +13,15 @@
#include "access/parallel.h"
#include "executor/executor.h"
#include "executor/nodeCustom.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
#include "nodes/extensible.h"
#include "nodes/plannodes.h"
-#include "miscadmin.h"
#include "parser/parsetree.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-
static TupleTableSlot *ExecCustomScan(PlanState *pstate);
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 224cbb3..d6f4eda 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -38,11 +38,10 @@
#include "pgstat.h"
#include "port/atomics.h"
#include "utils/dynahash.h"
-#include "utils/memutils.h"
#include "utils/lsyscache.h"
+#include "utils/memutils.h"
#include "utils/syscache.h"
-
static void ExecHashIncreaseNumBatches(HashJoinTable hashtable);
static void ExecHashIncreaseNumBuckets(HashJoinTable hashtable);
static void ExecParallelHashIncreaseNumBatches(HashJoinTable hashtable);
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 1991b90..2c364bd 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -32,14 +32,13 @@
#include "access/htup_details.h"
#include "executor/executor.h"
#include "executor/nodeSubplan.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "miscadmin.h"
#include "utils/array.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-
static Datum ExecHashSubPlan(SubPlanState *node,
ExprContext *econtext,
bool *isNull);
diff --git a/src/backend/executor/nodeTableFuncscan.c b/src/backend/executor/nodeTableFuncscan.c
index d264337..21cf3ca 100644
--- a/src/backend/executor/nodeTableFuncscan.c
+++ b/src/backend/executor/nodeTableFuncscan.c
@@ -22,17 +22,16 @@
*/
#include "postgres.h"
-#include "nodes/execnodes.h"
#include "executor/executor.h"
#include "executor/nodeTableFuncscan.h"
#include "executor/tablefunc.h"
#include "miscadmin.h"
+#include "nodes/execnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/xml.h"
-
static TupleTableSlot *TableFuncNext(TableFuncScanState *node);
static bool TableFuncRecheck(TableFuncScanState *node, TupleTableSlot *slot);
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index b5d3f3c..f1b9407 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -46,8 +46,8 @@
#include "parser/parse_coerce.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/expandeddatum.h"
#include "utils/datum.h"
+#include "utils/expandeddatum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/regproc.h"
diff --git a/src/backend/jit/jit.c b/src/backend/jit/jit.c
index 43e65b1..e066f72 100644
--- a/src/backend/jit/jit.c
+++ b/src/backend/jit/jit.c
@@ -17,19 +17,16 @@
*/
#include "postgres.h"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-
-#include "fmgr.h"
#include "executor/execExpr.h"
+#include "fmgr.h"
#include "jit/jit.h"
#include "miscadmin.h"
-#include "utils/resowner_private.h"
#include "utils/fmgrprotos.h"
-
+#include "utils/resowner_private.h"
/* GUCs */
bool jit_enabled = true;
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index 82c4afb..1c851e0 100644
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -13,17 +13,6 @@
#include "postgres.h"
-#include "jit/llvmjit.h"
-#include "jit/llvmjit_emit.h"
-
-#include "miscadmin.h"
-
-#include "utils/memutils.h"
-#include "utils/resowner_private.h"
-#include "portability/instr_time.h"
-#include "storage/ipc.h"
-
-
#include <llvm-c/Analysis.h>
#include <llvm-c/BitReader.h>
#include <llvm-c/BitWriter.h>
@@ -39,6 +28,13 @@
#include <llvm-c/Transforms/Utils.h>
#endif
+#include "jit/llvmjit.h"
+#include "jit/llvmjit_emit.h"
+#include "miscadmin.h"
+#include "portability/instr_time.h"
+#include "storage/ipc.h"
+#include "utils/memutils.h"
+#include "utils/resowner_private.h"
/* Handle of a module emitted via ORC JIT */
typedef struct LLVMJitHandle
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index d093246..a9d3621 100644
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -23,10 +23,10 @@
#include "access/tupconvert.h"
#include "catalog/objectaccess.h"
#include "catalog/pg_type.h"
+#include "executor/execExpr.h"
#include "executor/execdebug.h"
#include "executor/nodeAgg.h"
#include "executor/nodeSubplan.h"
-#include "executor/execExpr.h"
#include "funcapi.h"
#include "jit/llvmjit.h"
#include "jit/llvmjit_emit.h"
@@ -46,7 +46,6 @@
#include "utils/typcache.h"
#include "utils/xml.h"
-
typedef struct CompiledExprState
{
LLVMJitContext *context;
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index b90eb0a..c276207 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -32,11 +32,10 @@
#include "libpq/libpq.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "tcop/tcopprot.h"
-#include "utils/memutils.h"
#include "storage/ipc.h"
#include "storage/proc.h"
-
+#include "tcop/tcopprot.h"
+#include "utils/memutils.h"
char *ssl_library;
char *ssl_cert_file;
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 2221c04..7f59a29 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -39,10 +39,10 @@
#include "storage/fd.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/varlena.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/varlena.h"
#ifdef USE_LDAP
#ifdef WIN32
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index b655931..bcada74 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -17,14 +17,13 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "miscadmin.h"
-#include "nodes/makefuncs.h"
#include "nodes/execnodes.h"
+#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "nodes/pathnodes.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-
static bool expression_returns_set_walker(Node *node, void *context);
static int leftmostLoc(int loc1, int loc2);
static bool fix_opfuncids_walker(Node *node, void *context);
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index a546908..3b8d2fe 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -35,8 +35,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(CX)
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index fbabe2e..3b92f42 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -32,8 +32,8 @@
#include "postgres.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
#if defined(ERX)
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 4bf777d..fe02050 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -21,11 +21,10 @@
#include "optimizer/optimizer.h"
#include "optimizer/pathnode.h"
#include "optimizer/plancat.h"
+#include "statistics/statistics.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/selfuncs.h"
-#include "statistics/statistics.h"
-
/*
* Data structure for accumulating info about possible range-query
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 274fea0..fa63a38 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -14,8 +14,8 @@
*/
#include "postgres.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/clauses.h"
@@ -34,7 +34,6 @@
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
-
/* These parameters are set by GUC */
int from_collapse_limit;
int join_collapse_limit;
diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c
index 9381939..974f620 100644
--- a/src/backend/optimizer/plan/planagg.c
+++ b/src/backend/optimizer/plan/planagg.c
@@ -41,13 +41,12 @@
#include "optimizer/planmain.h"
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_clause.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
static bool find_minmax_aggs_walker(Node *node, List **context);
static bool build_minmax_path(PlannerInfo *root, MinMaxAggInfo *mminfo,
Oid eqop, Oid sortop, bool nulls_first);
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 17c5f08..7fe11b5 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -31,10 +31,10 @@
#include "executor/executor.h"
#include "executor/nodeAgg.h"
#include "foreign/fdwapi.h"
-#include "miscadmin.h"
#include "jit/jit.h"
#include "lib/bipartite_match.h"
#include "lib/knapsack.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#ifdef OPTIMIZER_DEBUG
@@ -55,17 +55,16 @@
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
#include "parser/parse_agg.h"
+#include "parser/parsetree.h"
#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "storage/dsm_impl.h"
+#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/selfuncs.h"
-#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
/* GUC parameters */
double cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION;
int force_parallel_mode = FORCE_PARALLEL_OFF;
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 792ae39..0da43ef 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -47,12 +47,11 @@
#include "optimizer/optimizer.h"
#include "optimizer/prep.h"
#include "optimizer/tlist.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteHandler.h"
#include "utils/rel.h"
-
static List *expand_targetlist(List *tlist, int command_type,
Index result_relation, Relation rel);
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 34acb73..60c93ee 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -16,8 +16,8 @@
#include <math.h>
-#include "miscadmin.h"
#include "foreign/fdwapi.h"
+#include "miscadmin.h"
#include "nodes/extensible.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/appendinfo.h"
@@ -35,7 +35,6 @@
#include "utils/memutils.h"
#include "utils/selfuncs.h"
-
typedef enum
{
COSTS_EQUAL, /* path costs are fuzzily equal */
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index e5f9e04..5e889d1 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -20,9 +20,9 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/nbtree.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/table.h"
+#include "access/tableam.h"
#include "access/transam.h"
#include "access/xlog.h"
#include "catalog/catalog.h"
@@ -40,9 +40,9 @@
#include "optimizer/optimizer.h"
#include "optimizer/plancat.h"
#include "optimizer/prep.h"
-#include "partitioning/partdesc.h"
#include "parser/parse_relation.h"
#include "parser/parsetree.h"
+#include "partitioning/partdesc.h"
#include "rewrite/rewriteManip.h"
#include "statistics/statistics.h"
#include "storage/bufmgr.h"
@@ -50,9 +50,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
-
+#include "utils/syscache.h"
/* GUC parameter */
int constraint_exclusion = CONSTRAINT_EXCLUSION_PARTITION;
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 260ccd4..fe41918 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -15,8 +15,6 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/nbtree.h"
#include "access/table.h"
@@ -29,12 +27,11 @@
#include "catalog/pg_constraint.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
-#include "parser/parsetree.h"
-#include "parser/parser.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -44,14 +41,15 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
+#include "parser/parsetree.h"
#include "rewrite/rewriteManip.h"
#include "utils/builtins.h"
-#include "utils/guc.h"
#include "utils/catcache.h"
+#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
-
+#include "utils/syscache.h"
/* Convenience macro for the most common makeNamespaceItem() case */
#define makeDefaultNSItem(rte) makeNamespaceItem(rte, true, true, false, true)
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 76f3dd7..eb91da2 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -22,6 +22,7 @@
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/analyze.h"
+#include "parser/parse_agg.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
@@ -31,14 +32,12 @@
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
-#include "parser/parse_agg.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/lsyscache.h"
#include "utils/timestamp.h"
#include "utils/xml.h"
-
/* GUC parameters */
bool operator_precedence_warning = false;
bool Transform_null_equals = false;
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 1baf7ef..bc832e7 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -20,17 +20,16 @@
#include "mb/pg_wchar.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_relation.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/int8.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/varbit.h"
-
static void pcb_error_callback(void *arg);
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 4dd8150..47188fc 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -26,10 +26,10 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_enr.h"
#include "parser/parse_relation.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
@@ -37,7 +37,6 @@
#include "utils/syscache.h"
#include "utils/varlena.h"
-
#define MAX_FUZZY_DISTANCE 3
static RangeTblEntry *scanNameSpaceForRefname(ParseState *pstate,
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 2901025..30d419e 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -20,19 +20,18 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
#include "parser/parse_expr.h"
#include "parser/parse_func.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_type.h"
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/typcache.h"
-
static void markTargetListOrigin(ParseState *pstate, TargetEntry *tle,
Var *var, int levelsup);
static Node *transformAssignmentIndirection(ParseState *pstate,
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 7932a96..78fef26 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -19,14 +19,13 @@
#include "catalog/pg_type.h"
#include "lib/stringinfo.h"
#include "nodes/makefuncs.h"
-#include "parser/parser.h"
#include "parser/parse_type.h"
+#include "parser/parser.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-
static int32 typenameTypeMod(ParseState *pstate, const TypeName *typeName,
Type typ);
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index 53e3ae2..7745e8d 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -17,9 +17,8 @@
#include <ctype.h>
-#include "parser/scansup.h"
#include "mb/pg_wchar.h"
-
+#include "parser/scansup.h"
/* ----------------
* scanstr
diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c
index 4bc8810..cfb44e2 100644
--- a/src/backend/partitioning/partbounds.c
+++ b/src/backend/partitioning/partbounds.c
@@ -36,8 +36,8 @@
#include "utils/lsyscache.h"
#include "utils/partcache.h"
#include "utils/rel.h"
-#include "utils/snapmgr.h"
#include "utils/ruleutils.h"
+#include "utils/snapmgr.h"
#include "utils/syscache.h"
/*
diff --git a/src/backend/partitioning/partdesc.c b/src/backend/partitioning/partdesc.c
index b207b76..6ede084 100644
--- a/src/backend/partitioning/partdesc.c
+++ b/src/backend/partitioning/partdesc.c
@@ -25,13 +25,13 @@
#include "storage/bufmgr.h"
#include "storage/sinval.h"
#include "utils/builtins.h"
-#include "utils/inval.h"
#include "utils/fmgroids.h"
#include "utils/hsearch.h"
+#include "utils/inval.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-#include "utils/rel.h"
#include "utils/partcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
typedef struct PartitionDirectoryData
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index b66b517..5f8a007 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -14,8 +14,8 @@
#include <unistd.h>
-#include "libpq/pqsignal.h"
#include "access/parallel.h"
+#include "libpq/pqsignal.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "port/atomics.h"
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index 8ec16a3..74f8ff8 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -44,8 +44,8 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "postmaster/bgwriter.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
+#include "storage/bufmgr.h"
#include "storage/condition_variable.h"
#include "storage/fd.h"
#include "storage/ipc.h"
@@ -60,7 +60,6 @@
#include "utils/resowner.h"
#include "utils/timestamp.h"
-
/*
* GUC parameters
*/
diff --git a/src/backend/postmaster/fork_process.c b/src/backend/postmaster/fork_process.c
index a9138f5..59385c5 100644
--- a/src/backend/postmaster/fork_process.c
+++ b/src/backend/postmaster/fork_process.c
@@ -10,7 +10,6 @@
* src/backend/postmaster/fork_process.c
*/
#include "postgres.h"
-#include "postmaster/fork_process.h"
#include <fcntl.h>
#include <time.h>
@@ -21,6 +20,8 @@
#include <openssl/rand.h>
#endif
+#include "postmaster/fork_process.h"
+
#ifndef WIN32
/*
* Wrapper for fork(). Return values are the same as those for fork():
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 011076c..fabcf31 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -32,8 +32,6 @@
#include <sys/select.h>
#endif
-#include "pgstat.h"
-
#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
@@ -48,6 +46,7 @@
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/autovacuum.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
@@ -69,7 +68,6 @@
#include "utils/snapmgr.h"
#include "utils/timestamp.h"
-
/* ----------
* Timer definitions.
* ----------
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index d0f210d..1fa4551 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -24,8 +24,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
#include "nodes/pg_list.h"
-#include "pgtar.h"
#include "pgstat.h"
+#include "pgtar.h"
#include "port.h"
#include "postmaster/syslogger.h"
#include "replication/basebackup.h"
@@ -42,7 +42,6 @@
#include "utils/relcache.h"
#include "utils/timestamp.h"
-
typedef struct
{
const char *label;
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 6eba08a..545d2fc 100644
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -19,14 +19,14 @@
#include <unistd.h>
#include <sys/time.h>
-#include "libpq-fe.h"
-#include "pqexpbuffer.h"
#include "access/xlog.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "libpq-fe.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "pqexpbuffer.h"
#include "replication/walreceiver.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
index c53e7e2..bc532d0 100644
--- a/src/backend/replication/logical/decode.c
+++ b/src/backend/replication/logical/decode.c
@@ -31,19 +31,16 @@
#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog_internal.h"
-#include "access/xlogutils.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-
+#include "access/xlogutils.h"
#include "catalog/pg_control.h"
-
#include "replication/decode.h"
#include "replication/logical.h"
#include "replication/message.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
#include "storage/standby.h"
typedef struct XLogRecordBuffer
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index 186057b..1f8821c 100644
--- a/src/backend/replication/logical/launcher.c
+++ b/src/backend/replication/logical/launcher.c
@@ -17,43 +17,35 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/heapam.h"
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "funcapi.h"
#include "libpq/pqsignal.h"
-
+#include "miscadmin.h"
+#include "pgstat.h"
#include "postmaster/bgworker.h"
#include "postmaster/fork_process.h"
#include "postmaster/postmaster.h"
-
#include "replication/logicallauncher.h"
#include "replication/logicalworker.h"
#include "replication/slot.h"
#include "replication/walreceiver.h"
#include "replication/worker_internal.h"
-
#include "storage/ipc.h"
#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/procsignal.h"
-
#include "tcop/tcopprot.h"
-
#include "utils/memutils.h"
#include "utils/pg_lsn.h"
#include "utils/ps_status.h"
-#include "utils/timeout.h"
#include "utils/snapmgr.h"
+#include "utils/timeout.h"
/* max sleep time between cycles (3min) */
#define DEFAULT_NAPTIME_PER_CYCLE 180000L
diff --git a/src/backend/replication/logical/logical.c b/src/backend/replication/logical/logical.c
index da265f5..7e06615 100644
--- a/src/backend/replication/logical/logical.c
+++ b/src/backend/replication/logical/logical.c
@@ -28,21 +28,17 @@
#include "postgres.h"
-#include "fmgr.h"
-#include "miscadmin.h"
-
#include "access/xact.h"
#include "access/xlog_internal.h"
-
+#include "fmgr.h"
+#include "miscadmin.h"
#include "replication/decode.h"
#include "replication/logical.h"
-#include "replication/reorderbuffer.h"
#include "replication/origin.h"
+#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
#include "storage/proc.h"
#include "storage/procarray.h"
-
#include "utils/memutils.h"
/* data for errcontext callback */
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c
index d1cf80d..aa2106b 100644
--- a/src/backend/replication/logical/logicalfuncs.c
+++ b/src/backend/replication/logical/logicalfuncs.c
@@ -17,36 +17,28 @@
#include <unistd.h>
-#include "fmgr.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
+#include "access/xact.h"
#include "access/xlog_internal.h"
#include "access/xlogutils.h"
-
-#include "access/xact.h"
-
#include "catalog/pg_type.h"
-
-#include "nodes/makefuncs.h"
-
+#include "fmgr.h"
+#include "funcapi.h"
#include "mb/pg_wchar.h"
-
+#include "miscadmin.h"
+#include "nodes/makefuncs.h"
+#include "replication/decode.h"
+#include "replication/logical.h"
+#include "replication/logicalfuncs.h"
+#include "replication/message.h"
+#include "storage/fd.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/inval.h"
+#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/pg_lsn.h"
#include "utils/regproc.h"
#include "utils/resowner.h"
-#include "utils/lsyscache.h"
-
-#include "replication/decode.h"
-#include "replication/logical.h"
-#include "replication/logicalfuncs.h"
-#include "replication/message.h"
-
-#include "storage/fd.h"
/* private date for writing out data */
typedef struct DecodingOutputState
diff --git a/src/backend/replication/logical/message.c b/src/backend/replication/logical/message.c
index 0681cb4..1652546 100644
--- a/src/backend/replication/logical/message.c
+++ b/src/backend/replication/logical/message.c
@@ -31,17 +31,12 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/xact.h"
-
#include "catalog/indexing.h"
-
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-
-#include "replication/message.h"
#include "replication/logical.h"
-
+#include "replication/message.h"
#include "utils/memutils.h"
/*
diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c
index fad2194..fffc330 100644
--- a/src/backend/replication/logical/origin.c
+++ b/src/backend/replication/logical/origin.c
@@ -70,33 +70,29 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/indexing.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "nodes/execnodes.h"
-
-#include "replication/origin.h"
-#include "replication/logical.h"
#include "pgstat.h"
+#include "replication/logical.h"
+#include "replication/origin.h"
+#include "storage/condition_variable.h"
+#include "storage/copydir.h"
#include "storage/fd.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
-#include "storage/condition_variable.h"
-#include "storage/copydir.h"
-
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/pg_lsn.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
/*
* Replay progress of a single remote node.
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index 0bd1d0f..5112eca 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -120,29 +120,24 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "miscadmin.h"
-
#include "access/heapam_xlog.h"
#include "access/transam.h"
#include "access/xact.h"
-
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "replication/logical.h"
#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
-
-#include "utils/builtins.h"
-#include "utils/memutils.h"
-#include "utils/snapshot.h"
-#include "utils/snapmgr.h"
-
#include "storage/block.h" /* debugging output */
#include "storage/fd.h"
#include "storage/lmgr.h"
#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/standby.h"
+#include "utils/builtins.h"
+#include "utils/memutils.h"
+#include "utils/snapmgr.h"
+#include "utils/snapshot.h"
/*
* This struct contains the current state of the snapshot building
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
index 7881079..e01d18c 100644
--- a/src/backend/replication/logical/tablesync.c
+++ b/src/backend/replication/logical/tablesync.c
@@ -85,30 +85,23 @@
#include "postgres.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/pg_subscription_rel.h"
#include "catalog/pg_type.h"
-
#include "commands/copy.h"
-
+#include "miscadmin.h"
#include "parser/parse_relation.h"
-
+#include "pgstat.h"
#include "replication/logicallauncher.h"
#include "replication/logicalrelation.h"
#include "replication/walreceiver.h"
#include "replication/worker_internal.h"
-
-#include "utils/snapmgr.h"
#include "storage/ipc.h"
-
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/snapmgr.h"
static bool table_states_valid = false;
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index 9c08757..3483c1b 100644
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -13,16 +13,13 @@
#include "postgres.h"
#include "catalog/pg_publication.h"
-
#include "fmgr.h"
-
#include "replication/logical.h"
#include "replication/logicalproto.h"
#include "replication/origin.h"
#include "replication/pgoutput.h"
-
-#include "utils/inval.h"
#include "utils/int8.h"
+#include "utils/inval.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
#include "utils/varlena.h"
diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c
index 42da631..46e6dd4 100644
--- a/src/backend/replication/slotfuncs.c
+++ b/src/backend/replication/slotfuncs.c
@@ -17,9 +17,9 @@
#include "funcapi.h"
#include "miscadmin.h"
#include "replication/decode.h"
-#include "replication/slot.h"
#include "replication/logical.h"
#include "replication/logicalfuncs.h"
+#include "replication/slot.h"
#include "utils/builtins.h"
#include "utils/inval.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c
index 1c44714..df7bde3 100644
--- a/src/backend/rewrite/rowsecurity.c
+++ b/src/backend/rewrite/rowsecurity.c
@@ -51,12 +51,12 @@
#include "rewrite/rewriteHandler.h"
#include "rewrite/rewriteManip.h"
#include "rewrite/rowsecurity.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/rel.h"
#include "utils/rls.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
static void get_policies_for_relation(Relation relation,
CmdType cmd, Oid user_id,
diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 585cad2..9493b2d 100644
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -20,10 +20,10 @@
#include "catalog/pg_statistic_ext_data.h"
#include "lib/stringinfo.h"
#include "nodes/nodeFuncs.h"
-#include "optimizer/clauses.h"
-#include "optimizer/optimizer.h"
#include "nodes/nodes.h"
#include "nodes/pathnodes.h"
+#include "optimizer/clauses.h"
+#include "optimizer/optimizer.h"
#include "statistics/extended_stats_internal.h"
#include "statistics/statistics.h"
#include "utils/bytea.h"
diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c
index f3383c0..4ccfc5f 100644
--- a/src/backend/statistics/mvdistinct.c
+++ b/src/backend/statistics/mvdistinct.c
@@ -28,14 +28,13 @@
#include "access/htup_details.h"
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_statistic_ext_data.h"
+#include "lib/stringinfo.h"
+#include "statistics/extended_stats_internal.h"
+#include "statistics/statistics.h"
#include "utils/fmgrprotos.h"
#include "utils/lsyscache.h"
-#include "lib/stringinfo.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
-#include "statistics/extended_stats_internal.h"
-#include "statistics/statistics.h"
-
static double ndistinct_for_combination(double totalrows, int numrows,
HeapTuple *rows, VacAttrStats **stats,
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index ccd2c31..1eb08cd 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -14,9 +14,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
-
+#include "storage/bufmgr.h"
BufferDescPadded *BufferDescriptors;
char *BufferBlocks;
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index e546585..7e44b51 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -21,9 +21,8 @@
*/
#include "postgres.h"
-#include "storage/bufmgr.h"
#include "storage/buf_internals.h"
-
+#include "storage/bufmgr.h"
/* entry for buffer lookup hashtable */
typedef struct
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index b40e6f3..440ff77 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -45,9 +45,9 @@
#include "executor/instrument.h"
#include "miscadmin.h"
#include "pgstat.h"
-#include "storage/fd.h"
-#include "storage/buffile.h"
#include "storage/buf_internals.h"
+#include "storage/buffile.h"
+#include "storage/fd.h"
#include "utils/resowner.h"
/*
diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c
index ca1c9cd..c94ce5b 100644
--- a/src/backend/storage/file/copydir.c
+++ b/src/backend/storage/file/copydir.c
@@ -22,10 +22,10 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "storage/copydir.h"
-#include "storage/fd.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "storage/copydir.h"
+#include "storage/fd.h"
/*
* copydir: copy a directory
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index fe2bb8f..f18bcb2 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -79,11 +79,11 @@
#include <sys/resource.h> /* for getrlimit */
#endif
-#include "miscadmin.h"
#include "access/xact.h"
#include "access/xlog.h"
#include "catalog/pg_tablespace.h"
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
#include "portability/mem.h"
#include "storage/fd.h"
@@ -91,7 +91,6 @@
#include "utils/guc.h"
#include "utils/resowner_private.h"
-
/* Define PG_FLUSH_DATA_WORKS if we have an implementation for pg_flush_data */
#if defined(HAVE_SYNC_FILE_RANGE)
#define PG_FLUSH_DATA_WORKS 1
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
index 2879b84..d550093 100644
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -47,7 +47,6 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include <fcntl.h>
#include <unistd.h>
@@ -61,15 +60,16 @@
#ifdef HAVE_SYS_SHM_H
#include <sys/shm.h>
#endif
+
#include "common/file_perm.h"
+#include "miscadmin.h"
#include "pgstat.h"
-
#include "portability/mem.h"
+#include "postmaster/postmaster.h"
#include "storage/dsm_impl.h"
#include "storage/fd.h"
#include "utils/guc.h"
#include "utils/memutils.h"
-#include "postmaster/postmaster.h"
#ifdef USE_DSM_POSIX
static bool dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 8853706..4829953 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -29,10 +29,10 @@
#include "postmaster/bgwriter.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
+#include "replication/origin.h"
#include "replication/slot.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
-#include "replication/origin.h"
#include "storage/bufmgr.h"
#include "storage/dsm.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 7605b2c..fde97a1 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -21,14 +21,13 @@
#include "commands/async.h"
#include "miscadmin.h"
#include "replication/walsender.h"
-#include "storage/latch.h"
#include "storage/ipc.h"
+#include "storage/latch.h"
#include "storage/proc.h"
#include "storage/shmem.h"
#include "storage/sinval.h"
#include "tcop/tcopprot.h"
-
/*
* The SIGUSR1 signal is multiplexed to support signalling multiple event
* types. The specific reason is communicated via flags in shared memory.
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index db080c8..0c58b39 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -17,6 +17,7 @@
#include <signal.h>
#include <unistd.h>
+#include "access/transam.h"
#include "miscadmin.h"
#include "storage/backendid.h"
#include "storage/ipc.h"
@@ -25,8 +26,6 @@
#include "storage/shmem.h"
#include "storage/sinvaladt.h"
#include "storage/spin.h"
-#include "access/transam.h"
-
/*
* Conceptually, the shared cache invalidation messages are stored in an
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index fb0bf44..18e3843 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -77,8 +77,8 @@
#include "postgres.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/postmaster.h"
#include "replication/slot.h"
#include "storage/ipc.h"
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index b3c54a6..fff0628 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -45,7 +45,6 @@
#include "replication/syncrep.h"
#include "replication/walsender.h"
#include "storage/condition_variable.h"
-#include "storage/standby.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
#include "storage/pmsignal.h"
@@ -53,10 +52,10 @@
#include "storage/procarray.h"
#include "storage/procsignal.h"
#include "storage/spin.h"
+#include "storage/standby.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-
/* GUC variables */
int DeadlockTimeout = 1000;
int StatementTimeout = 0;
diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
index 2e6c55b..04befb7 100644
--- a/src/backend/storage/lmgr/s_lock.c
+++ b/src/backend/storage/lmgr/s_lock.c
@@ -50,9 +50,8 @@
#include <time.h>
#include <unistd.h>
-#include "storage/s_lock.h"
#include "port/atomics.h"
-
+#include "storage/s_lock.h"
#define MIN_SPINS_PER_DELAY 10
#define MAX_SPINS_PER_DELAY 1000
diff --git a/src/backend/storage/page/checksum.c b/src/backend/storage/page/checksum.c
index 1eb7ef6..8f7a110 100644
--- a/src/backend/storage/page/checksum.c
+++ b/src/backend/storage/page/checksum.c
@@ -14,7 +14,6 @@
#include "postgres.h"
#include "storage/checksum.h"
-
/*
* The actual code is in storage/checksum_impl.h. This is done so that
* external programs can incorporate the checksum code by #include'ing
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 07f3c93..8a9eaf6 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -25,21 +25,21 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pg_trace.h"
#include "pgstat.h"
#include "postmaster/bgwriter.h"
-#include "storage/fd.h"
#include "storage/bufmgr.h"
+#include "storage/fd.h"
#include "storage/md.h"
#include "storage/relfilenode.h"
#include "storage/smgr.h"
#include "storage/sync.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-#include "pg_trace.h"
/*
* The magnetic disk storage manager keeps track of open file
diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
index f329c3f..3485e6f 100644
--- a/src/backend/storage/sync/sync.c
+++ b/src/backend/storage/sync/sync.c
@@ -18,19 +18,19 @@
#include <fcntl.h>
#include <sys/file.h>
-#include "miscadmin.h"
-#include "pgstat.h"
-#include "access/xlogutils.h"
#include "access/xlog.h"
+#include "access/xlogutils.h"
#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "pgstat.h"
#include "portability/instr_time.h"
#include "postmaster/bgwriter.h"
#include "storage/bufmgr.h"
#include "storage/ipc.h"
#include "storage/md.h"
#include "utils/hsearch.h"
-#include "utils/memutils.h"
#include "utils/inval.h"
+#include "utils/memutils.h"
static MemoryContext pendingOpsCxt; /* context for the pending ops state */
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 82894ea..d7a72c0 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -47,14 +47,15 @@
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
#include "libpq/pqsignal.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "nodes/print.h"
#include "optimizer/optimizer.h"
-#include "pgstat.h"
-#include "pg_trace.h"
#include "parser/analyze.h"
#include "parser/parser.h"
#include "pg_getopt.h"
+#include "pg_trace.h"
+#include "pgstat.h"
#include "postmaster/autovacuum.h"
#include "postmaster/postmaster.h"
#include "replication/logicallauncher.h"
@@ -77,8 +78,6 @@
#include "utils/snapmgr.h"
#include "utils/timeout.h"
#include "utils/timestamp.h"
-#include "mb/pg_wchar.h"
-
/* ----------------
* global variables
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index e984545..6787d8e 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -28,8 +28,8 @@
#include "commands/alter.h"
#include "commands/async.h"
#include "commands/cluster.h"
-#include "commands/comment.h"
#include "commands/collationcmds.h"
+#include "commands/comment.h"
#include "commands/conversioncmds.h"
#include "commands/copy.h"
#include "commands/createas.h"
@@ -39,8 +39,8 @@
#include "commands/event_trigger.h"
#include "commands/explain.h"
#include "commands/extension.h"
-#include "commands/matview.h"
#include "commands/lockcmds.h"
+#include "commands/matview.h"
#include "commands/policy.h"
#include "commands/portalcmds.h"
#include "commands/prepare.h"
@@ -68,9 +68,8 @@
#include "utils/acl.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/rel.h"
-
+#include "utils/syscache.h"
/* Hook for plugins to get control in ProcessUtility() */
ProcessUtility_hook_type ProcessUtility_hook = NULL;
diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c
index a3372a8..083292c 100644
--- a/src/backend/tsearch/wparser.c
+++ b/src/backend/tsearch/wparser.c
@@ -13,17 +13,16 @@
*/
#include "postgres.h"
-#include "funcapi.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
+#include "funcapi.h"
#include "tsearch/ts_cache.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/jsonapi.h"
#include "utils/varlena.h"
-
/******sql-level interface******/
typedef struct
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 79bc750..4ccb3c0 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -19,10 +19,10 @@
#include "access/htup_details.h"
#include "catalog/catalog.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/proclang.h"
#include "commands/tablespace.h"
@@ -41,7 +41,6 @@
#include "utils/syscache.h"
#include "utils/varlena.h"
-
typedef struct
{
const char *name;
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index e38bd93..c911d72 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -31,7 +31,6 @@
#include "utils/memutils.h"
#include "utils/tzparser.h"
-
static int DecodeNumber(int flen, char *field, bool haveTextMonth,
int fmask, int *tmask,
struct pg_tm *tm, fsec_t *fsec, bool *is2digits);
diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c
index 6ae2a31..b6befd6 100644
--- a/src/backend/utils/adt/format_type.c
+++ b/src/backend/utils/adt/format_type.c
@@ -20,11 +20,11 @@
#include "access/htup_details.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/numeric.h"
#include "utils/syscache.h"
-#include "mb/pg_wchar.h"
static char *printTypmod(const char *typname, int32 typmod, Oid typmodout);
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 93acabc..a40ae40 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -23,9 +23,8 @@
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "optimizer/optimizer.h"
-#include "utils/int8.h"
#include "utils/builtins.h"
-
+#include "utils/int8.h"
#define MAXINT8LEN 25
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index d4ba3bd..e2e16eb 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -27,11 +27,11 @@
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
-#include "utils/typcache.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
+#include "utils/typcache.h"
/*
* The context of the parser is maintained by the recursive descent
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 74b4bbe..9927d08 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -12,20 +12,20 @@
*/
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/transam.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
-#include "utils/lsyscache.h"
#include "utils/json.h"
#include "utils/jsonapi.h"
#include "utils/jsonb.h"
+#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index e2c1bfb..fb5947a 100644
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -66,18 +66,17 @@
#include "miscadmin.h"
#include "regex/regex.h"
#include "utils/builtins.h"
+#include "utils/date.h"
#include "utils/datetime.h"
#include "utils/datum.h"
-#include "utils/formatting.h"
#include "utils/float.h"
+#include "utils/formatting.h"
#include "utils/guc.h"
#include "utils/json.h"
#include "utils/jsonpath.h"
-#include "utils/date.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-
/*
* Represents "base object" and it's "id" for .keyvalue() evaluation.
*/
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index d330a88..27474a6 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -29,18 +29,17 @@
#include "common/keywords.h"
#include "funcapi.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "parser/scansup.h"
+#include "pgstat.h"
#include "postmaster/syslogger.h"
#include "rewrite/rewriteHandler.h"
#include "storage/fd.h"
-#include "utils/lsyscache.h"
-#include "utils/ruleutils.h"
#include "tcop/tcopprot.h"
#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/ruleutils.h"
#include "utils/timestamp.h"
-
/*
* Common subroutine for num_nulls() and num_nonnulls().
* Returns true if successful, false if function should return NULL.
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index 0fdfee5..9557732 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -16,10 +16,9 @@
#include "postgres.h"
#include "common/int.h"
+#include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/formatting.h"
-#include "mb/pg_wchar.h"
-
static text *dotrim(const char *string, int stringlen,
const char *set, int setlen,
diff --git a/src/backend/utils/adt/rangetypes_gist.c b/src/backend/utils/adt/rangetypes_gist.c
index cf73f4d..96b22b7 100644
--- a/src/backend/utils/adt/rangetypes_gist.c
+++ b/src/backend/utils/adt/rangetypes_gist.c
@@ -16,12 +16,11 @@
#include "access/gist.h"
#include "access/stratnum.h"
+#include "utils/datum.h"
#include "utils/float.h"
#include "utils/fmgrprotos.h"
-#include "utils/datum.h"
#include "utils/rangetypes.h"
-
/*
* Range class properties used to segregate different classes of ranges in
* GiST. Each unique combination of properties is a class. CLS_EMPTY cannot
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 17a7f6c..4b1decf 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -33,11 +33,11 @@
#include "miscadmin.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
+#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
-#include "utils/acl.h"
#include "utils/regproc.h"
+#include "utils/syscache.h"
#include "utils/varlena.h"
static char *format_operator_internal(Oid operator_oid, bool force_qualify);
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index caf27f8..22b07df 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -36,9 +36,9 @@
#include "executor/executor.h"
#include "executor/spi.h"
#include "lib/ilist.h"
+#include "miscadmin.h"
#include "parser/parse_coerce.h"
#include "parser/parse_relation.h"
-#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "utils/acl.h"
#include "utils/builtins.h"
@@ -54,7 +54,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
/*
* Local definitions
*/
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 3e64390..c1de869 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -50,9 +50,9 @@
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
-#include "parser/parse_node.h"
#include "parser/parse_agg.h"
#include "parser/parse_func.h"
+#include "parser/parse_node.h"
#include "parser/parse_oper.h"
#include "parser/parser.h"
#include "parser/parsetree.h"
@@ -74,7 +74,6 @@
#include "utils/varlena.h"
#include "utils/xml.h"
-
/* ----------
* Pretty formatting constants
* ----------
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index ab2b49f..4f574b3 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -16,8 +16,8 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_locale.h"
+#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
index af07563..217de77 100644
--- a/src/backend/utils/adt/tsquery_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -15,8 +15,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
typedef struct NODE
{
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
index 91200ee..282fb2d 100644
--- a/src/backend/utils/adt/tsquery_gist.c
+++ b/src/backend/utils/adt/tsquery_gist.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "access/stratnum.h"
#include "access/gist.h"
+#include "access/stratnum.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
index de46a00..7cb19db 100644
--- a/src/backend/utils/adt/tsquery_util.c
+++ b/src/backend/utils/adt/tsquery_util.c
@@ -14,8 +14,8 @@
#include "postgres.h"
-#include "tsearch/ts_utils.h"
#include "miscadmin.h"
+#include "tsearch/ts_utils.h"
/*
* Build QTNode tree for a tsquery given in QueryItem array format.
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
index e28859d..2d8359d 100644
--- a/src/backend/utils/adt/tsrank.c
+++ b/src/backend/utils/adt/tsrank.c
@@ -16,11 +16,10 @@
#include <limits.h>
#include <math.h>
+#include "miscadmin.h"
#include "tsearch/ts_utils.h"
#include "utils/array.h"
#include "utils/builtins.h"
-#include "miscadmin.h"
-
static const float weights[] = {0.1f, 0.2f, 0.4f, 1.0f};
diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c
index e220c5f..06bf5a9 100644
--- a/src/backend/utils/adt/txid.c
+++ b/src/backend/utils/adt/txid.c
@@ -26,16 +26,15 @@
#include "access/xact.h"
#include "access/xlog.h"
#include "funcapi.h"
-#include "miscadmin.h"
#include "lib/qunique.h"
#include "libpq/pqformat.h"
+#include "miscadmin.h"
#include "postmaster/postmaster.h"
#include "storage/lwlock.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
#include "utils/snapmgr.h"
-
/* txid will be signed int8 in database, so must limit to 63 bits */
#define MAX_TXID ((uint64) PG_INT64_MAX)
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index e63a4e5..2aed411 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -18,6 +18,7 @@
#include "catalog/pg_collation.h"
#include "catalog/pg_type.h"
#include "libpq/pqformat.h"
+#include "mb/pg_wchar.h"
#include "nodes/nodeFuncs.h"
#include "nodes/supportnodes.h"
#include "utils/array.h"
@@ -26,8 +27,6 @@
#include "utils/lsyscache.h"
#include "utils/pg_locale.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
-
/* common code for bpchartypmodin and varchartypmodin */
static int32
diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c
index 419bde5..1b0f738 100644
--- a/src/backend/utils/cache/evtcache.c
+++ b/src/backend/utils/cache/evtcache.c
@@ -16,17 +16,17 @@
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "catalog/pg_event_trigger.h"
#include "catalog/indexing.h"
+#include "catalog/pg_event_trigger.h"
#include "catalog/pg_type.h"
#include "commands/trigger.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
#include "utils/evtcache.h"
+#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/memutils.h"
-#include "utils/hsearch.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 585dcee..ad1ff01 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -47,8 +47,8 @@
#include "catalog/pg_am.h"
#include "catalog/pg_amproc.h"
#include "catalog/pg_attrdef.h"
-#include "catalog/pg_authid.h"
#include "catalog/pg_auth_members.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_database.h"
#include "catalog/pg_namespace.h"
@@ -90,7 +90,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
#define RELCACHE_INIT_FILEMAGIC 0x573266 /* version ID value */
/*
diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c
index c506dc9..d244eaf 100644
--- a/src/backend/utils/cache/relfilenodemap.c
+++ b/src/backend/utils/cache/relfilenodemap.c
@@ -22,9 +22,9 @@
#include "miscadmin.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
-#include "utils/fmgroids.h"
#include "utils/rel.h"
#include "utils/relfilenodemap.h"
#include "utils/relmapper.h"
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 36aee74..d69c0ff 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -53,13 +53,13 @@
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
#include "catalog/pg_range.h"
+#include "catalog/pg_replication_origin.h"
#include "catalog/pg_rewrite.h"
#include "catalog/pg_seclabel.h"
#include "catalog/pg_sequence.h"
#include "catalog/pg_shdepend.h"
#include "catalog/pg_shdescription.h"
#include "catalog/pg_shseclabel.h"
-#include "catalog/pg_replication_origin.h"
#include "catalog/pg_statistic.h"
#include "catalog/pg_statistic_ext.h"
#include "catalog/pg_statistic_ext_data.h"
@@ -75,11 +75,10 @@
#include "catalog/pg_type.h"
#include "catalog/pg_user_mapping.h"
#include "lib/qunique.h"
-#include "utils/rel.h"
#include "utils/catcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
-
/*---------------------------------------------------------------------------
Adding system caches:
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 29c5ec7..cc38669 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -46,9 +46,9 @@
#include "storage/fd.h"
#include "storage/ipc.h"
#include "storage/lmgr.h"
+#include "storage/proc.h"
#include "storage/procarray.h"
#include "storage/procsignal.h"
-#include "storage/proc.h"
#include "storage/sinvaladt.h"
#include "storage/smgr.h"
#include "storage/sync.h"
@@ -64,7 +64,6 @@
#include "utils/syscache.h"
#include "utils/timeout.h"
-
static HeapTuple GetDatabaseTuple(const char *dbname);
static HeapTuple GetDatabaseTupleByOid(Oid dboid);
static void PerformAuthentication(Port *port);
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 994bf37..4b3769b 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -38,10 +38,10 @@
#include "catalog/pg_authid.h"
#include "commands/async.h"
#include "commands/prepare.h"
+#include "commands/trigger.h"
#include "commands/user.h"
#include "commands/vacuum.h"
#include "commands/variable.h"
-#include "commands/trigger.h"
#include "common/string.h"
#include "funcapi.h"
#include "jit/jit.h"
@@ -72,18 +72,18 @@
#include "replication/walsender.h"
#include "storage/bufmgr.h"
#include "storage/dsm_impl.h"
-#include "storage/standby.h"
#include "storage/fd.h"
#include "storage/large_object.h"
#include "storage/pg_shmem.h"
-#include "storage/proc.h"
#include "storage/predicate.h"
+#include "storage/proc.h"
+#include "storage/standby.h"
#include "tcop/tcopprot.h"
#include "tsearch/ts_cache.h"
#include "utils/builtins.h"
#include "utils/bytea.h"
-#include "utils/guc_tables.h"
#include "utils/float.h"
+#include "utils/guc_tables.h"
#include "utils/memutils.h"
#include "utils/pg_locale.h"
#include "utils/pg_lsn.h"
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index 2d17839..8cab0e1 100644
--- a/src/backend/utils/misc/pg_config.c
+++ b/src/backend/utils/misc/pg_config.c
@@ -14,12 +14,12 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
#include "catalog/pg_type.h"
#include "common/config_info.h"
-#include "utils/builtins.h"
+#include "funcapi.h"
+#include "miscadmin.h"
#include "port.h"
+#include "utils/builtins.h"
Datum
pg_config(PG_FUNCTION_ARGS)
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index b429218..3d0916f 100644
--- a/src/backend/utils/misc/pg_controldata.c
+++ b/src/backend/utils/misc/pg_controldata.c
@@ -17,8 +17,8 @@
#include "access/htup_details.h"
#include "access/transam.h"
-#include "access/xlog_internal.h"
#include "access/xlog.h"
+#include "access/xlog_internal.h"
#include "catalog/pg_control.h"
#include "catalog/pg_type.h"
#include "common/controldata_utils.h"
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index 67ba95c..6c851dd 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -28,8 +28,8 @@
#include "libpq/libpq.h"
#include "miscadmin.h"
-#include "utils/ps_status.h"
#include "utils/guc.h"
+#include "utils/ps_status.h"
extern char **environ;
bool update_process_title = true;
diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 5636081..327dca6 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -22,10 +22,9 @@
#include "access/htup_details.h"
#include "catalog/pg_authid.h"
+#include "miscadmin.h"
#include "utils/inval.h"
#include "utils/syscache.h"
-#include "miscadmin.h"
-
/*
* In common cases the same roleid (ie, the session or current ID) will
diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c
index 50deb35..db1dac3 100644
--- a/src/backend/utils/mmgr/slab.c
+++ b/src/backend/utils/mmgr/slab.c
@@ -52,10 +52,9 @@
#include "postgres.h"
+#include "lib/ilist.h"
#include "utils/memdebug.h"
#include "utils/memutils.h"
-#include "lib/ilist.h"
-
/*
* SlabContext is a specialized implementation of MemoryContext.
diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c
index deb9af5..16d464d 100644
--- a/src/backend/utils/time/combocid.c
+++ b/src/backend/utils/time/combocid.c
@@ -41,15 +41,14 @@
#include "postgres.h"
-#include "miscadmin.h"
#include "access/htup_details.h"
#include "access/xact.h"
+#include "miscadmin.h"
#include "storage/shmem.h"
#include "utils/combocid.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-
/* Hash table to lookup combo cids by cmin and cmax */
static HTAB *comboHash = NULL;
--
1.8.3.1
Re: Ordering of header file inclusion
On Tue, Nov 12, 2019 at 6:33 AM vignesh C <vignesh21@gmail.com> wrote:
Thanks Amit for your comments. Please find the updated patch which
does not include the changes mentioned above.
Thanks for working on this. I have pushed your latest patch.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Tue, Nov 12, 2019 at 11:19 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Tue, Nov 12, 2019 at 6:33 AM vignesh C <vignesh21@gmail.com> wrote:
Thanks Amit for your comments. Please find the updated patch which
does not include the changes mentioned above.Thanks for working on this. I have pushed your latest patch.
Thanks Amit for pushing the patch. I have re-verified and found that
changes need to be done in few more places. The main changes are made
in the header file and plpython source files. The attached patch
handles the same. I have verified make check and make check-world
including --with-python & --with-perl in the following:
CentOS Linux release 7.7.1908
Red Hat Enterprise Linux Server release 7.1
I have verified including --llvm in CentOS Linux release 7.7.1908.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Attachments:
0001-Make-the-order-of-the-header-file-includes-consistent-remaining-files.patchtext/x-patch; charset=UTF-8; name=0001-Make-the-order-of-the-header-file-includes-consistent-remaining-files.patchDownload
From 93903fcfd13435d31ad5c1b2080c978dbf24b57d Mon Sep 17 00:00:00 2001
From: vignesh <vignesh@localhost.localdomain>
Date: Fri, 15 Nov 2019 09:53:29 +0530
Subject: [PATCH] Make the order of the header file includes consistent.
The basic rule we follow here is to always first include 'postgres.h' or
'postgres_fe.h' whichever is applicable, then system header includes and
then Postgres header includes. In this, we also follow that all the
Postgres header includes are in order based on their ASCII value. We
generally follow these rules, but the code has deviated in many places.
This commit makes it consistent.
Author: Vignesh C
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
---
contrib/bloom/bloom.h | 2 +-
contrib/btree_gist/btree_gist.h | 2 +-
contrib/btree_gist/btree_utils_num.h | 8 ++++----
contrib/btree_gist/btree_utils_var.h | 3 +--
contrib/postgres_fdw/postgres_fdw.h | 3 +--
src/backend/libpq/auth.c | 1 -
src/bin/pg_basebackup/receivelog.h | 3 +--
src/bin/pg_basebackup/streamutil.h | 3 +--
src/bin/pg_dump/pg_backup_archiver.h | 4 +---
src/bin/pg_rewind/datapagemap.h | 3 +--
src/bin/pg_rewind/filemap.h | 5 ++---
src/bin/pg_rewind/pg_rewind.h | 4 +---
src/bin/pg_waldump/pg_waldump.c | 2 +-
src/bin/psql/command.c | 16 +++++++---------
src/bin/psql/command.h | 3 +--
src/bin/psql/common.h | 2 +-
src/bin/psql/prompt.h | 2 +-
src/bin/psql/settings.h | 3 +--
src/bin/psql/tab-complete.c | 6 +++---
src/bin/scripts/common.h | 2 +-
src/include/access/gin_private.h | 2 +-
src/include/access/hio.h | 3 +--
src/include/access/htup_details.h | 2 +-
src/include/access/relation.h | 3 +--
src/include/access/table.h | 3 +--
src/include/access/twophase.h | 2 +-
src/include/catalog/pg_constraint.h | 3 +--
src/include/catalog/pg_conversion.h | 3 +--
src/include/catalog/pg_operator.h | 3 +--
src/include/catalog/pg_proc.h | 3 +--
src/include/catalog/pg_publication.h | 3 +--
src/include/catalog/pg_replication_origin.h | 3 +--
src/include/catalog/pg_subscription_rel.h | 3 +--
src/include/catalog/pg_type.h | 3 +--
src/include/commands/event_trigger.h | 2 +-
src/include/executor/nodeBitmapHeapscan.h | 2 +-
src/include/executor/nodeIndexonlyscan.h | 2 +-
src/include/executor/tuptable.h | 2 +-
src/include/funcapi.h | 3 +--
src/include/jit/llvmjit.h | 4 +---
src/include/nodes/execnodes.h | 7 +++----
src/include/replication/decode.h | 2 +-
src/include/replication/logical.h | 3 +--
src/include/replication/walreceiver.h | 2 +-
src/include/rewrite/rewriteHandler.h | 2 +-
src/include/statistics/extended_stats_internal.h | 3 +--
src/include/storage/buf_internals.h | 3 +--
src/include/storage/condition_variable.h | 2 +-
src/include/storage/lock.h | 3 +--
src/include/storage/lwlock.h | 2 +-
src/include/storage/standby.h | 2 +-
src/include/tsearch/ts_locale.h | 2 +-
src/include/utils/date.h | 2 +-
src/include/utils/jsonpath.h | 2 +-
src/include/utils/pg_lsn.h | 2 +-
src/include/utils/xml.h | 2 +-
src/interfaces/ecpg/ecpglib/descriptor.c | 2 +-
src/interfaces/ecpg/ecpglib/ecpglib_extern.h | 6 +++---
src/interfaces/ecpg/ecpglib/misc.c | 2 +-
src/interfaces/ecpg/include/ecpglib.h | 5 +++--
src/interfaces/ecpg/preproc/preproc_extern.h | 3 +--
src/pl/plperl/plperl.c | 5 ++---
src/pl/plpython/plpy_cursorobject.c | 8 ++------
src/pl/plpython/plpy_elog.c | 6 +-----
src/pl/plpython/plpy_exec.c | 16 ++++++----------
src/pl/plpython/plpy_main.c | 16 ++++++----------
src/pl/plpython/plpy_planobject.c | 7 ++-----
src/pl/plpython/plpy_plpymodule.c | 12 ++++--------
src/pl/plpython/plpy_procedure.c | 12 ++++--------
src/pl/plpython/plpy_resultobject.c | 6 ++----
src/pl/plpython/plpy_spi.c | 12 ++++--------
src/pl/plpython/plpy_spi.h | 3 +--
src/pl/plpython/plpy_subxactobject.c | 10 +++-------
src/pl/plpython/plpy_subxactobject.h | 3 +--
src/pl/plpython/plpy_typeio.c | 12 ++++--------
src/pl/plpython/plpy_typeio.h | 3 +--
src/pl/plpython/plpy_util.c | 10 +++-------
.../modules/test_ginpostinglist/test_ginpostinglist.c | 2 +-
78 files changed, 125 insertions(+), 208 deletions(-)
diff --git a/contrib/bloom/bloom.h b/contrib/bloom/bloom.h
index 010148e..a717998 100644
--- a/contrib/bloom/bloom.h
+++ b/contrib/bloom/bloom.h
@@ -17,8 +17,8 @@
#include "access/generic_xlog.h"
#include "access/itup.h"
#include "access/xlog.h"
-#include "nodes/pathnodes.h"
#include "fmgr.h"
+#include "nodes/pathnodes.h"
/* Support procedures numbers */
#define BLOOM_HASH_PROC 1
diff --git a/contrib/btree_gist/btree_gist.h b/contrib/btree_gist/btree_gist.h
index 011285a..14c7c8e 100644
--- a/contrib/btree_gist/btree_gist.h
+++ b/contrib/btree_gist/btree_gist.h
@@ -4,8 +4,8 @@
#ifndef __BTREE_GIST_H__
#define __BTREE_GIST_H__
-#include "fmgr.h"
#include "access/nbtree.h"
+#include "fmgr.h"
#define BtreeGistNotEqualStrategyNumber 6
diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h
index 50907b3..1fedfbe 100644
--- a/contrib/btree_gist/btree_utils_num.h
+++ b/contrib/btree_gist/btree_utils_num.h
@@ -4,13 +4,13 @@
#ifndef __BTREE_UTILS_NUM_H__
#define __BTREE_UTILS_NUM_H__
-#include "btree_gist.h"
-#include "access/gist.h"
-#include "utils/rel.h"
-
#include <math.h>
#include <float.h>
+#include "access/gist.h"
+#include "btree_gist.h"
+#include "utils/rel.h"
+
typedef char GBT_NUMKEY;
/* Better readable key */
diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h
index 1f2ca43..2f8def6 100644
--- a/contrib/btree_gist/btree_utils_var.h
+++ b/contrib/btree_gist/btree_utils_var.h
@@ -4,9 +4,8 @@
#ifndef __BTREE_UTILS_VAR_H__
#define __BTREE_UTILS_VAR_H__
-#include "btree_gist.h"
-
#include "access/gist.h"
+#include "btree_gist.h"
#include "mb/pg_wchar.h"
/* Variable length key */
diff --git a/contrib/postgres_fdw/postgres_fdw.h b/contrib/postgres_fdw/postgres_fdw.h
index 6acb7dc..bdefe0c 100644
--- a/contrib/postgres_fdw/postgres_fdw.h
+++ b/contrib/postgres_fdw/postgres_fdw.h
@@ -15,11 +15,10 @@
#include "foreign/foreign.h"
#include "lib/stringinfo.h"
+#include "libpq-fe.h"
#include "nodes/pathnodes.h"
#include "utils/relcache.h"
-#include "libpq-fe.h"
-
/*
* FDW-specific planner information kept in RelOptInfo.fdw_private for a
* postgres_fdw foreign table. For a baserel, this struct is created by
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 909d736..c12b810 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -39,7 +39,6 @@
#include "utils/memutils.h"
#include "utils/timestamp.h"
-
/*----------------------------------------------------------------
* Global authentication functions
*----------------------------------------------------------------
diff --git a/src/bin/pg_basebackup/receivelog.h b/src/bin/pg_basebackup/receivelog.h
index b6e2743..edf1ce6 100644
--- a/src/bin/pg_basebackup/receivelog.h
+++ b/src/bin/pg_basebackup/receivelog.h
@@ -12,11 +12,10 @@
#ifndef RECEIVELOG_H
#define RECEIVELOG_H
+#include "access/xlogdefs.h"
#include "libpq-fe.h"
#include "walmethods.h"
-#include "access/xlogdefs.h"
-
/*
* Called before trying to read more data or when a segment is
* finished. Return true to stop streaming.
diff --git a/src/bin/pg_basebackup/streamutil.h b/src/bin/pg_basebackup/streamutil.h
index a756eee..1edfc94 100644
--- a/src/bin/pg_basebackup/streamutil.h
+++ b/src/bin/pg_basebackup/streamutil.h
@@ -12,10 +12,9 @@
#ifndef STREAMUTIL_H
#define STREAMUTIL_H
-#include "libpq-fe.h"
-
#include "access/xlogdefs.h"
#include "datatype/timestamp.h"
+#include "libpq-fe.h"
extern const char *progname;
extern char *connection_string;
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index fa2c6ef..6768f92 100644
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -24,12 +24,10 @@
#ifndef __PG_BACKUP_ARCHIVE__
#define __PG_BACKUP_ARCHIVE__
-
#include <time.h>
-#include "pg_backup.h"
-
#include "libpq-fe.h"
+#include "pg_backup.h"
#include "pqexpbuffer.h"
#define LOBBUFSIZE 16384
diff --git a/src/bin/pg_rewind/datapagemap.h b/src/bin/pg_rewind/datapagemap.h
index c2baaae..d5bcfa6 100644
--- a/src/bin/pg_rewind/datapagemap.h
+++ b/src/bin/pg_rewind/datapagemap.h
@@ -9,9 +9,8 @@
#ifndef DATAPAGEMAP_H
#define DATAPAGEMAP_H
-#include "storage/relfilenode.h"
#include "storage/block.h"
-
+#include "storage/relfilenode.h"
struct datapagemap
{
diff --git a/src/bin/pg_rewind/filemap.h b/src/bin/pg_rewind/filemap.h
index 5882284..0aa822d 100644
--- a/src/bin/pg_rewind/filemap.h
+++ b/src/bin/pg_rewind/filemap.h
@@ -8,10 +8,9 @@
#ifndef FILEMAP_H
#define FILEMAP_H
-#include "storage/relfilenode.h"
-#include "storage/block.h"
-
#include "datapagemap.h"
+#include "storage/block.h"
+#include "storage/relfilenode.h"
/*
* For every file found in the local or remote system, we have a file entry
diff --git a/src/bin/pg_rewind/pg_rewind.h b/src/bin/pg_rewind/pg_rewind.h
index aa3a0ce..360b2b3 100644
--- a/src/bin/pg_rewind/pg_rewind.h
+++ b/src/bin/pg_rewind/pg_rewind.h
@@ -11,15 +11,13 @@
#ifndef PG_REWIND_H
#define PG_REWIND_H
-#include "datapagemap.h"
-
#include "access/timeline.h"
#include "common/logging.h"
+#include "datapagemap.h"
#include "libpq-fe.h"
#include "storage/block.h"
#include "storage/relfilenode.h"
-
/* Configuration options */
extern char *datadir_target;
extern char *datadir_source;
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index 1524e5e..d6695f7 100644
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -16,10 +16,10 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/transam.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-#include "access/transam.h"
#include "common/fe_memutils.h"
#include "common/logging.h"
#include "getopt_long.h"
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index b981ae8..a9299a9 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -6,7 +6,6 @@
* src/bin/psql/command.c
*/
#include "postgres_fe.h"
-#include "command.h"
#include <ctype.h>
#include <time.h>
@@ -24,22 +23,21 @@
#endif
#include "catalog/pg_class_d.h"
-#include "portability/instr_time.h"
-
-#include "libpq-fe.h"
-#include "pqexpbuffer.h"
-#include "common/logging.h"
-#include "fe_utils/print.h"
-#include "fe_utils/string_utils.h"
-
+#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "copy.h"
#include "crosstabview.h"
#include "describe.h"
+#include "fe_utils/print.h"
+#include "fe_utils/string_utils.h"
#include "help.h"
#include "input.h"
#include "large_obj.h"
+#include "libpq-fe.h"
#include "mainloop.h"
+#include "portability/instr_time.h"
+#include "pqexpbuffer.h"
#include "psqlscanslash.h"
#include "settings.h"
#include "variables.h"
diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h
index 33791b6..6d39b90 100644
--- a/src/bin/psql/command.h
+++ b/src/bin/psql/command.h
@@ -8,10 +8,9 @@
#ifndef COMMAND_H
#define COMMAND_H
+#include "fe_utils/conditional.h"
#include "fe_utils/print.h"
#include "fe_utils/psqlscan.h"
-#include "fe_utils/conditional.h"
-
typedef enum _backslashResult
{
diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h
index 282a520..292dc54 100644
--- a/src/bin/psql/common.h
+++ b/src/bin/psql/common.h
@@ -10,9 +10,9 @@
#include <setjmp.h>
-#include "libpq-fe.h"
#include "fe_utils/print.h"
#include "fe_utils/psqlscan.h"
+#include "libpq-fe.h"
extern bool openQueryOutputFile(const char *fname, FILE **fout, bool *is_pipe);
extern bool setQFout(const char *fname);
diff --git a/src/bin/psql/prompt.h b/src/bin/psql/prompt.h
index 905ee3d..683e361 100644
--- a/src/bin/psql/prompt.h
+++ b/src/bin/psql/prompt.h
@@ -8,9 +8,9 @@
#ifndef PROMPT_H
#define PROMPT_H
+#include "fe_utils/conditional.h"
/* enum promptStatus_t is now defined by psqlscan.h */
#include "fe_utils/psqlscan.h"
-#include "fe_utils/conditional.h"
char *get_prompt(promptStatus_t status, ConditionalStack cstack);
diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
index 5be5091..7cd6d5f 100644
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -8,9 +8,8 @@
#ifndef SETTINGS_H
#define SETTINGS_H
-
-#include "variables.h"
#include "fe_utils/print.h"
+#include "variables.h"
#define DEFAULT_CSV_FIELD_SEP ','
#define DEFAULT_FIELD_SEP "|"
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 98c917b..8a6bfa5 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -33,8 +33,9 @@
*/
#include "postgres_fe.h"
-#include "tab-complete.h"
+
#include "input.h"
+#include "tab-complete.h"
/* If we don't have this, we might as well forget about the whole thing: */
#ifdef USE_READLINE
@@ -43,10 +44,9 @@
#include "catalog/pg_am_d.h"
#include "catalog/pg_class_d.h"
-
+#include "common.h"
#include "libpq-fe.h"
#include "pqexpbuffer.h"
-#include "common.h"
#include "settings.h"
#include "stringutils.h"
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index f36b26a..b8580f9 100644
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -10,8 +10,8 @@
#define COMMON_H
#include "common/username.h"
-#include "libpq-fe.h"
#include "getopt_long.h" /* pgrminclude ignore */
+#include "libpq-fe.h"
#include "pqexpbuffer.h" /* pgrminclude ignore */
enum trivalue
diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index 78fcd82..7d0cbcc 100644
--- a/src/include/access/gin_private.h
+++ b/src/include/access/gin_private.h
@@ -15,8 +15,8 @@
#include "access/ginblock.h"
#include "access/itup.h"
#include "fmgr.h"
-#include "storage/bufmgr.h"
#include "lib/rbtree.h"
+#include "storage/bufmgr.h"
/*
* Storage type for GIN's reloptions
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index dbaabcc..ad6da6d 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -15,9 +15,8 @@
#define HIO_H
#include "access/htup.h"
-#include "utils/relcache.h"
#include "storage/buf.h"
-
+#include "utils/relcache.h"
/*
* state for bulk inserts --- private to heapam.c and hio.c
diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h
index 66d61fd..7e94719 100644
--- a/src/include/access/htup_details.h
+++ b/src/include/access/htup_details.h
@@ -15,9 +15,9 @@
#define HTUP_DETAILS_H
#include "access/htup.h"
+#include "access/transam.h"
#include "access/tupdesc.h"
#include "access/tupmacs.h"
-#include "access/transam.h"
#include "storage/bufpage.h"
/*
diff --git a/src/include/access/relation.h b/src/include/access/relation.h
index 38acaa5..0a1de35 100644
--- a/src/include/access/relation.h
+++ b/src/include/access/relation.h
@@ -15,9 +15,8 @@
#define ACCESS_RELATION_H
#include "nodes/primnodes.h"
-#include "utils/relcache.h"
#include "storage/lockdefs.h"
-
+#include "utils/relcache.h"
extern Relation relation_open(Oid relationId, LOCKMODE lockmode);
extern Relation try_relation_open(Oid relationId, LOCKMODE lockmode);
diff --git a/src/include/access/table.h b/src/include/access/table.h
index cb9b438..071b254 100644
--- a/src/include/access/table.h
+++ b/src/include/access/table.h
@@ -15,9 +15,8 @@
#define TABLE_H
#include "nodes/primnodes.h"
-#include "utils/relcache.h"
#include "storage/lockdefs.h"
-
+#include "utils/relcache.h"
extern Relation table_open(Oid relationId, LOCKMODE lockmode);
extern Relation table_openrv(const RangeVar *relation, LOCKMODE lockmode);
diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h
index 1093085..02b5315 100644
--- a/src/include/access/twophase.h
+++ b/src/include/access/twophase.h
@@ -14,8 +14,8 @@
#ifndef TWOPHASE_H
#define TWOPHASE_H
-#include "access/xlogdefs.h"
#include "access/xact.h"
+#include "access/xlogdefs.h"
#include "datatype/timestamp.h"
#include "storage/lock.h"
diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h
index c1e60c7..cbb5d9a 100644
--- a/src/include/catalog/pg_constraint.h
+++ b/src/include/catalog/pg_constraint.h
@@ -18,10 +18,9 @@
#ifndef PG_CONSTRAINT_H
#define PG_CONSTRAINT_H
+#include "catalog/dependency.h"
#include "catalog/genbki.h"
#include "catalog/pg_constraint_d.h"
-
-#include "catalog/dependency.h"
#include "nodes/pg_list.h"
/* ----------------
diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h
index 49c7070..fc523c2 100644
--- a/src/include/catalog/pg_conversion.h
+++ b/src/include/catalog/pg_conversion.h
@@ -18,9 +18,8 @@
#define PG_CONVERSION_H
#include "catalog/genbki.h"
-#include "catalog/pg_conversion_d.h"
-
#include "catalog/objectaddress.h"
+#include "catalog/pg_conversion_d.h"
/* ----------------
* pg_conversion definition. cpp turns this into
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index 7c4f686..3157fc5 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -19,9 +19,8 @@
#define PG_OPERATOR_H
#include "catalog/genbki.h"
-#include "catalog/pg_operator_d.h"
-
#include "catalog/objectaddress.h"
+#include "catalog/pg_operator_d.h"
#include "nodes/pg_list.h"
/* ----------------
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index dc29c06..e6c1909 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -18,9 +18,8 @@
#define PG_PROC_H
#include "catalog/genbki.h"
-#include "catalog/pg_proc_d.h"
-
#include "catalog/objectaddress.h"
+#include "catalog/pg_proc_d.h"
#include "nodes/pg_list.h"
/* ----------------
diff --git a/src/include/catalog/pg_publication.h b/src/include/catalog/pg_publication.h
index 20a2f0a..ea22aa6 100644
--- a/src/include/catalog/pg_publication.h
+++ b/src/include/catalog/pg_publication.h
@@ -18,9 +18,8 @@
#define PG_PUBLICATION_H
#include "catalog/genbki.h"
-#include "catalog/pg_publication_d.h"
-
#include "catalog/objectaddress.h"
+#include "catalog/pg_publication_d.h"
/* ----------------
* pg_publication definition. cpp turns this into
diff --git a/src/include/catalog/pg_replication_origin.h b/src/include/catalog/pg_replication_origin.h
index b768584..613d07e 100644
--- a/src/include/catalog/pg_replication_origin.h
+++ b/src/include/catalog/pg_replication_origin.h
@@ -18,11 +18,10 @@
#ifndef PG_REPLICATION_ORIGIN_H
#define PG_REPLICATION_ORIGIN_H
+#include "access/xlogdefs.h"
#include "catalog/genbki.h"
#include "catalog/pg_replication_origin_d.h"
-#include "access/xlogdefs.h"
-
/* ----------------
* pg_replication_origin. cpp turns this into
* typedef struct FormData_pg_replication_origin
diff --git a/src/include/catalog/pg_subscription_rel.h b/src/include/catalog/pg_subscription_rel.h
index f7df814..21b4ac2 100644
--- a/src/include/catalog/pg_subscription_rel.h
+++ b/src/include/catalog/pg_subscription_rel.h
@@ -18,10 +18,9 @@
#ifndef PG_SUBSCRIPTION_REL_H
#define PG_SUBSCRIPTION_REL_H
+#include "access/xlogdefs.h"
#include "catalog/genbki.h"
#include "catalog/pg_subscription_rel_d.h"
-
-#include "access/xlogdefs.h"
#include "nodes/pg_list.h"
/* ----------------
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 2a584b4..0c273a0 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -19,9 +19,8 @@
#define PG_TYPE_H
#include "catalog/genbki.h"
-#include "catalog/pg_type_d.h"
-
#include "catalog/objectaddress.h"
+#include "catalog/pg_type_d.h"
#include "nodes/nodes.h"
/* ----------------
diff --git a/src/include/commands/event_trigger.h b/src/include/commands/event_trigger.h
index 575e924..6eeb720 100644
--- a/src/include/commands/event_trigger.h
+++ b/src/include/commands/event_trigger.h
@@ -17,8 +17,8 @@
#include "catalog/objectaddress.h"
#include "catalog/pg_event_trigger.h"
#include "nodes/parsenodes.h"
-#include "utils/aclchk_internal.h"
#include "tcop/deparse_utility.h"
+#include "utils/aclchk_internal.h"
typedef struct EventTriggerData
{
diff --git a/src/include/executor/nodeBitmapHeapscan.h b/src/include/executor/nodeBitmapHeapscan.h
index 112def1..2c31d6f 100644
--- a/src/include/executor/nodeBitmapHeapscan.h
+++ b/src/include/executor/nodeBitmapHeapscan.h
@@ -14,8 +14,8 @@
#ifndef NODEBITMAPHEAPSCAN_H
#define NODEBITMAPHEAPSCAN_H
-#include "nodes/execnodes.h"
#include "access/parallel.h"
+#include "nodes/execnodes.h"
extern BitmapHeapScanState *ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags);
extern void ExecEndBitmapHeapScan(BitmapHeapScanState *node);
diff --git a/src/include/executor/nodeIndexonlyscan.h b/src/include/executor/nodeIndexonlyscan.h
index 644166b..d85cd12 100644
--- a/src/include/executor/nodeIndexonlyscan.h
+++ b/src/include/executor/nodeIndexonlyscan.h
@@ -14,8 +14,8 @@
#ifndef NODEINDEXONLYSCAN_H
#define NODEINDEXONLYSCAN_H
-#include "nodes/execnodes.h"
#include "access/parallel.h"
+#include "nodes/execnodes.h"
extern IndexOnlyScanState *ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags);
extern void ExecEndIndexOnlyScan(IndexOnlyScanState *node);
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index b7f9772..04feaba 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -15,9 +15,9 @@
#define TUPTABLE_H
#include "access/htup.h"
+#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/tupdesc.h"
-#include "access/htup_details.h"
#include "storage/buf.h"
/*----------
diff --git a/src/include/funcapi.h b/src/include/funcapi.h
index 1a88b52..1aa1f4d 100644
--- a/src/include/funcapi.h
+++ b/src/include/funcapi.h
@@ -17,11 +17,10 @@
#ifndef FUNCAPI_H
#define FUNCAPI_H
-#include "fmgr.h"
#include "access/tupdesc.h"
#include "executor/executor.h"
#include "executor/tuptable.h"
-
+#include "fmgr.h"
/*-------------------------------------------------------------------------
* Support to ease writing Functions returning composite types
diff --git a/src/include/jit/llvmjit.h b/src/include/jit/llvmjit.h
index 6178864..8b441df 100644
--- a/src/include/jit/llvmjit.h
+++ b/src/include/jit/llvmjit.h
@@ -30,12 +30,10 @@ extern "C"
{
#endif
-
+#include "access/tupdesc.h"
#include "fmgr.h"
#include "jit/jit.h"
#include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-
typedef struct LLVMJitContext
{
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 44f7608..6eb6472 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -20,18 +20,17 @@
#include "lib/pairingheap.h"
#include "nodes/params.h"
#include "nodes/plannodes.h"
+#include "nodes/tidbitmap.h"
#include "partitioning/partdefs.h"
+#include "storage/condition_variable.h"
#include "utils/hsearch.h"
#include "utils/queryenvironment.h"
#include "utils/reltrigger.h"
#include "utils/sharedtuplestore.h"
#include "utils/snapshot.h"
#include "utils/sortsupport.h"
-#include "utils/tuplestore.h"
#include "utils/tuplesort.h"
-#include "nodes/tidbitmap.h"
-#include "storage/condition_variable.h"
-
+#include "utils/tuplestore.h"
struct PlanState; /* forward references in this file */
struct PartitionRoutingInfo;
diff --git a/src/include/replication/decode.h b/src/include/replication/decode.h
index 89689a0..3f87724 100644
--- a/src/include/replication/decode.h
+++ b/src/include/replication/decode.h
@@ -11,8 +11,8 @@
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-#include "replication/reorderbuffer.h"
#include "replication/logical.h"
+#include "replication/reorderbuffer.h"
void LogicalDecodingProcessRecord(LogicalDecodingContext *ctx,
XLogReaderState *record);
diff --git a/src/include/replication/logical.h b/src/include/replication/logical.h
index 31c796b..6879a2e 100644
--- a/src/include/replication/logical.h
+++ b/src/include/replication/logical.h
@@ -9,11 +9,10 @@
#ifndef LOGICAL_H
#define LOGICAL_H
-#include "replication/slot.h"
-
#include "access/xlog.h"
#include "access/xlogreader.h"
#include "replication/output_plugin.h"
+#include "replication/slot.h"
struct LogicalDecodingContext;
diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h
index e12a934..41714ea 100644
--- a/src/include/replication/walreceiver.h
+++ b/src/include/replication/walreceiver.h
@@ -15,11 +15,11 @@
#include "access/xlog.h"
#include "access/xlogdefs.h"
#include "getaddrinfo.h" /* for NI_MAXHOST */
+#include "pgtime.h"
#include "replication/logicalproto.h"
#include "replication/walsender.h"
#include "storage/latch.h"
#include "storage/spin.h"
-#include "pgtime.h"
#include "utils/tuplestore.h"
/* user-settable parameters */
diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h
index c55fe81..e5b66e1 100644
--- a/src/include/rewrite/rewriteHandler.h
+++ b/src/include/rewrite/rewriteHandler.h
@@ -14,8 +14,8 @@
#ifndef REWRITEHANDLER_H
#define REWRITEHANDLER_H
-#include "utils/relcache.h"
#include "nodes/parsenodes.h"
+#include "utils/relcache.h"
extern List *QueryRewrite(Query *parsetree);
extern void AcquireRewriteLocks(Query *parsetree,
diff --git a/src/include/statistics/extended_stats_internal.h b/src/include/statistics/extended_stats_internal.h
index fcf4e8a..8ff1ef3 100644
--- a/src/include/statistics/extended_stats_internal.h
+++ b/src/include/statistics/extended_stats_internal.h
@@ -14,9 +14,8 @@
#ifndef EXTENDED_STATS_INTERNAL_H
#define EXTENDED_STATS_INTERNAL_H
-#include "utils/sortsupport.h"
#include "statistics/statistics.h"
-
+#include "utils/sortsupport.h"
typedef struct
{
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index 6ffe184..d540c0a 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -15,17 +15,16 @@
#ifndef BUFMGR_INTERNALS_H
#define BUFMGR_INTERNALS_H
+#include "port/atomics.h"
#include "storage/buf.h"
#include "storage/bufmgr.h"
#include "storage/latch.h"
#include "storage/lwlock.h"
#include "storage/shmem.h"
#include "storage/smgr.h"
-#include "port/atomics.h"
#include "storage/spin.h"
#include "utils/relcache.h"
-
/*
* Buffer state is a single 32-bit variable where following data is combined.
*
diff --git a/src/include/storage/condition_variable.h b/src/include/storage/condition_variable.h
index ee06e05..0aad8cc 100644
--- a/src/include/storage/condition_variable.h
+++ b/src/include/storage/condition_variable.h
@@ -22,8 +22,8 @@
#ifndef CONDITION_VARIABLE_H
#define CONDITION_VARIABLE_H
-#include "storage/s_lock.h"
#include "storage/proclist_types.h"
+#include "storage/s_lock.h"
typedef struct
{
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 6efb7a9..e8b50fe 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -18,12 +18,11 @@
#error "lock.h may not be included from frontend code"
#endif
-#include "storage/lockdefs.h"
#include "storage/backendid.h"
+#include "storage/lockdefs.h"
#include "storage/lwlock.h"
#include "storage/shmem.h"
-
/* struct PGPROC is declared in proc.h, but must forward-reference it */
typedef struct PGPROC PGPROC;
diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h
index f627dfe..f9450da 100644
--- a/src/include/storage/lwlock.h
+++ b/src/include/storage/lwlock.h
@@ -18,9 +18,9 @@
#error "lwlock.h may not be included from frontend code"
#endif
+#include "port/atomics.h"
#include "storage/proclist_types.h"
#include "storage/s_lock.h"
-#include "port/atomics.h"
struct PGPROC;
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h
index a3f8f82..6ba90c6 100644
--- a/src/include/storage/standby.h
+++ b/src/include/storage/standby.h
@@ -14,10 +14,10 @@
#ifndef STANDBY_H
#define STANDBY_H
-#include "storage/standbydefs.h"
#include "storage/lock.h"
#include "storage/procsignal.h"
#include "storage/relfilenode.h"
+#include "storage/standbydefs.h"
/* User-settable GUC parameters */
extern int vacuum_defer_cleanup_age;
diff --git a/src/include/tsearch/ts_locale.h b/src/include/tsearch/ts_locale.h
index 9e8cd77..b7db7b2 100644
--- a/src/include/tsearch/ts_locale.h
+++ b/src/include/tsearch/ts_locale.h
@@ -15,8 +15,8 @@
#include <ctype.h>
#include <limits.h>
-#include "utils/pg_locale.h"
#include "mb/pg_wchar.h"
+#include "utils/pg_locale.h"
/*
* towlower() and friends should be in <wctype.h>, but some pre-C99 systems
diff --git a/src/include/utils/date.h b/src/include/utils/date.h
index 7352b1f..6015983 100644
--- a/src/include/utils/date.h
+++ b/src/include/utils/date.h
@@ -16,9 +16,9 @@
#include <math.h>
+#include "datatype/timestamp.h"
#include "fmgr.h"
#include "pgtime.h"
-#include "datatype/timestamp.h"
typedef int32 DateADT;
diff --git a/src/include/utils/jsonpath.h b/src/include/utils/jsonpath.h
index 0f2b08e..9af9ffd 100644
--- a/src/include/utils/jsonpath.h
+++ b/src/include/utils/jsonpath.h
@@ -15,8 +15,8 @@
#define JSONPATH_H
#include "fmgr.h"
-#include "utils/jsonb.h"
#include "nodes/pg_list.h"
+#include "utils/jsonb.h"
typedef struct
{
diff --git a/src/include/utils/pg_lsn.h b/src/include/utils/pg_lsn.h
index 70d8640..8b371c5 100644
--- a/src/include/utils/pg_lsn.h
+++ b/src/include/utils/pg_lsn.h
@@ -15,8 +15,8 @@
#ifndef PG_LSN_H
#define PG_LSN_H
-#include "fmgr.h"
#include "access/xlogdefs.h"
+#include "fmgr.h"
#define DatumGetLSN(X) ((XLogRecPtr) DatumGetInt64(X))
#define LSNGetDatum(X) (Int64GetDatum((int64) (X)))
diff --git a/src/include/utils/xml.h b/src/include/utils/xml.h
index 90d08b1..69e9a9c 100644
--- a/src/include/utils/xml.h
+++ b/src/include/utils/xml.h
@@ -15,10 +15,10 @@
#ifndef XML_H
#define XML_H
+#include "executor/tablefunc.h"
#include "fmgr.h"
#include "nodes/execnodes.h"
#include "nodes/primnodes.h"
-#include "executor/tablefunc.h"
typedef struct varlena xmltype;
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index 7bd0534..f71f539 100644
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -12,9 +12,9 @@
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "ecpgtype.h"
+#include "sql3types.h"
#include "sqlca.h"
#include "sqlda.h"
-#include "sql3types.h"
static void descriptor_free(struct descriptor *desc);
diff --git a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h
index 4bf55fe..1a98dea 100644
--- a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h
+++ b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h
@@ -3,12 +3,12 @@
#ifndef _ECPG_ECPGLIB_EXTERN_H
#define _ECPG_ECPGLIB_EXTERN_H
+#include "ecpg_config.h"
+#include "ecpgtype.h"
#include "libpq-fe.h"
#include "sqlca.h"
-#include "sqlda-native.h"
#include "sqlda-compat.h"
-#include "ecpg_config.h"
-#include "ecpgtype.h"
+#include "sqlda-native.h"
#ifndef CHAR_BIT
#include <limits.h>
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index c4b2183..a07d0df 100644
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -11,11 +11,11 @@
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "ecpgtype.h"
+#include "pg_config_paths.h"
#include "pgtypes_date.h"
#include "pgtypes_interval.h"
#include "pgtypes_numeric.h"
#include "pgtypes_timestamp.h"
-#include "pg_config_paths.h"
#include "sqlca.h"
#ifndef LONG_LONG_MIN
diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h
index c65073f..0024010 100644
--- a/src/interfaces/ecpg/include/ecpglib.h
+++ b/src/interfaces/ecpg/include/ecpglib.h
@@ -7,11 +7,12 @@
#ifndef _ECPGLIB_H
#define _ECPGLIB_H
-#include "libpq-fe.h"
+#include <string.h>
+
#include "ecpg_config.h"
#include "ecpgtype.h"
+#include "libpq-fe.h"
#include "sqlca.h"
-#include <string.h>
/*
* This is a small extract from c.h since we don't want to leak all postgres
diff --git a/src/interfaces/ecpg/preproc/preproc_extern.h b/src/interfaces/ecpg/preproc/preproc_extern.h
index 323fd5c..51d5f94 100644
--- a/src/interfaces/ecpg/preproc/preproc_extern.h
+++ b/src/interfaces/ecpg/preproc/preproc_extern.h
@@ -3,9 +3,8 @@
#ifndef _ECPG_PREPROC_EXTERN_H
#define _ECPG_PREPROC_EXTERN_H
-#include "type.h"
-
#include "common/keywords.h"
+#include "type.h"
#ifndef CHAR_BIT
#include <limits.h>
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 90f7cf1..0b224b9 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -44,11 +44,10 @@
#define TEXTDOMAIN PG_TEXTDOMAIN("plperl")
/* perl stuff */
-#include "plperl.h"
-#include "plperl_helpers.h"
-
/* string literal macros defining chunks of perl code */
#include "perlchunks.h"
+#include "plperl.h"
+#include "plperl_helpers.h"
/* defines PLPERL_SET_OPMASK */
#include "plperl_opmask.h"
diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c
index b44ce7e..4c37ff8 100644
--- a/src/pl/plpython/plpy_cursorobject.c
+++ b/src/pl/plpython/plpy_cursorobject.c
@@ -11,19 +11,15 @@
#include "access/xact.h"
#include "catalog/pg_type.h"
#include "mb/pg_wchar.h"
-#include "utils/memutils.h"
-
-#include "plpython.h"
-
#include "plpy_cursorobject.h"
-
#include "plpy_elog.h"
#include "plpy_main.h"
#include "plpy_planobject.h"
#include "plpy_procedure.h"
#include "plpy_resultobject.h"
#include "plpy_spi.h"
-
+#include "plpython.h"
+#include "utils/memutils.h"
static PyObject *PLy_cursor_query(const char *query);
static void PLy_cursor_dealloc(PyObject *arg);
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
index 15cc444..eb56282 100644
--- a/src/pl/plpython/plpy_elog.c
+++ b/src/pl/plpython/plpy_elog.c
@@ -7,14 +7,10 @@
#include "postgres.h"
#include "lib/stringinfo.h"
-
-#include "plpython.h"
-
#include "plpy_elog.h"
-
#include "plpy_main.h"
#include "plpy_procedure.h"
-
+#include "plpython.h"
PyObject *PLy_exc_error = NULL;
PyObject *PLy_exc_fatal = NULL;
diff --git a/src/pl/plpython/plpy_exec.c b/src/pl/plpython/plpy_exec.c
index 1aec1b2..c6f6a6f 100644
--- a/src/pl/plpython/plpy_exec.c
+++ b/src/pl/plpython/plpy_exec.c
@@ -12,20 +12,16 @@
#include "commands/trigger.h"
#include "executor/spi.h"
#include "funcapi.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
-#include "utils/rel.h"
-#include "utils/typcache.h"
-
-#include "plpython.h"
-
-#include "plpy_exec.h"
-
#include "plpy_elog.h"
+#include "plpy_exec.h"
#include "plpy_main.h"
#include "plpy_procedure.h"
#include "plpy_subxactobject.h"
-
+#include "plpython.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/rel.h"
+#include "utils/typcache.h"
/* saved state for a set-returning function */
typedef struct PLySRFState
diff --git a/src/pl/plpython/plpy_main.c b/src/pl/plpython/plpy_main.c
index 6edfcf2..faaec55 100644
--- a/src/pl/plpython/plpy_main.c
+++ b/src/pl/plpython/plpy_main.c
@@ -12,21 +12,17 @@
#include "commands/trigger.h"
#include "executor/spi.h"
#include "miscadmin.h"
-#include "utils/guc.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/syscache.h"
-
-#include "plpython.h"
-
-#include "plpy_main.h"
-
#include "plpy_elog.h"
#include "plpy_exec.h"
+#include "plpy_main.h"
#include "plpy_plpymodule.h"
#include "plpy_procedure.h"
#include "plpy_subxactobject.h"
-
+#include "plpython.h"
+#include "utils/guc.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
+#include "utils/syscache.h"
/*
* exported functions
diff --git a/src/pl/plpython/plpy_planobject.c b/src/pl/plpython/plpy_planobject.c
index 96ea24c..c23e79f 100644
--- a/src/pl/plpython/plpy_planobject.c
+++ b/src/pl/plpython/plpy_planobject.c
@@ -6,16 +6,13 @@
#include "postgres.h"
-#include "plpython.h"
-
-#include "plpy_planobject.h"
-
#include "plpy_cursorobject.h"
#include "plpy_elog.h"
+#include "plpy_planobject.h"
#include "plpy_spi.h"
+#include "plpython.h"
#include "utils/memutils.h"
-
static void PLy_plan_dealloc(PyObject *arg);
static PyObject *PLy_plan_cursor(PyObject *self, PyObject *args);
static PyObject *PLy_plan_execute(PyObject *self, PyObject *args);
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
index c80b350..e308c61 100644
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -8,21 +8,17 @@
#include "access/xact.h"
#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
-#include "utils/snapmgr.h"
-
-#include "plpython.h"
-
-#include "plpy_plpymodule.h"
-
#include "plpy_cursorobject.h"
#include "plpy_elog.h"
#include "plpy_main.h"
#include "plpy_planobject.h"
+#include "plpy_plpymodule.h"
#include "plpy_resultobject.h"
#include "plpy_spi.h"
#include "plpy_subxactobject.h"
-
+#include "plpython.h"
+#include "utils/builtins.h"
+#include "utils/snapmgr.h"
HTAB *PLy_spi_exceptions = NULL;
diff --git a/src/pl/plpython/plpy_procedure.c b/src/pl/plpython/plpy_procedure.c
index 6e08c03..9e15839 100644
--- a/src/pl/plpython/plpy_procedure.c
+++ b/src/pl/plpython/plpy_procedure.c
@@ -11,6 +11,10 @@
#include "funcapi.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
+#include "plpy_elog.h"
+#include "plpy_main.h"
+#include "plpy_procedure.h"
+#include "plpython.h"
#include "utils/builtins.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
@@ -18,14 +22,6 @@
#include "utils/memutils.h"
#include "utils/syscache.h"
-#include "plpython.h"
-
-#include "plpy_procedure.h"
-
-#include "plpy_elog.h"
-#include "plpy_main.h"
-
-
static HTAB *PLy_procedure_cache = NULL;
static PLyProcedure *PLy_procedure_create(HeapTuple procTup, Oid fn_oid, bool is_trigger);
diff --git a/src/pl/plpython/plpy_resultobject.c b/src/pl/plpython/plpy_resultobject.c
index 20cf3ed..b31dbda 100644
--- a/src/pl/plpython/plpy_resultobject.c
+++ b/src/pl/plpython/plpy_resultobject.c
@@ -6,11 +6,9 @@
#include "postgres.h"
-#include "plpython.h"
-
-#include "plpy_resultobject.h"
#include "plpy_elog.h"
-
+#include "plpy_resultobject.h"
+#include "plpython.h"
static void PLy_result_dealloc(PyObject *arg);
static PyObject *PLy_result_colnames(PyObject *self, PyObject *unused);
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
index ed2eee0..99c1b4f 100644
--- a/src/pl/plpython/plpy_spi.c
+++ b/src/pl/plpython/plpy_spi.c
@@ -14,20 +14,16 @@
#include "executor/spi.h"
#include "mb/pg_wchar.h"
#include "parser/parse_type.h"
-#include "utils/memutils.h"
-#include "utils/syscache.h"
-
-#include "plpython.h"
-
-#include "plpy_spi.h"
-
#include "plpy_elog.h"
#include "plpy_main.h"
#include "plpy_planobject.h"
#include "plpy_plpymodule.h"
#include "plpy_procedure.h"
#include "plpy_resultobject.h"
-
+#include "plpy_spi.h"
+#include "plpython.h"
+#include "utils/memutils.h"
+#include "utils/syscache.h"
static PyObject *PLy_spi_execute_query(char *query, long limit);
static PyObject *PLy_spi_execute_fetch_result(SPITupleTable *tuptable,
diff --git a/src/pl/plpython/plpy_spi.h b/src/pl/plpython/plpy_spi.h
index ec7b689..a5e2e60 100644
--- a/src/pl/plpython/plpy_spi.h
+++ b/src/pl/plpython/plpy_spi.h
@@ -5,9 +5,8 @@
#ifndef PLPY_SPI_H
#define PLPY_SPI_H
-#include "utils/resowner.h"
-
#include "plpython.h"
+#include "utils/resowner.h"
extern PyObject *PLy_spi_prepare(PyObject *self, PyObject *args);
extern PyObject *PLy_spi_execute(PyObject *self, PyObject *args);
diff --git a/src/pl/plpython/plpy_subxactobject.c b/src/pl/plpython/plpy_subxactobject.c
index 5dfb8a4..98d7c90 100644
--- a/src/pl/plpython/plpy_subxactobject.c
+++ b/src/pl/plpython/plpy_subxactobject.c
@@ -7,14 +7,10 @@
#include "postgres.h"
#include "access/xact.h"
-#include "utils/memutils.h"
-
-#include "plpython.h"
-
-#include "plpy_subxactobject.h"
-
#include "plpy_elog.h"
-
+#include "plpy_subxactobject.h"
+#include "plpython.h"
+#include "utils/memutils.h"
List *explicit_subtransactions = NIL;
diff --git a/src/pl/plpython/plpy_subxactobject.h b/src/pl/plpython/plpy_subxactobject.h
index 1ee85c0..5b6f863 100644
--- a/src/pl/plpython/plpy_subxactobject.h
+++ b/src/pl/plpython/plpy_subxactobject.h
@@ -6,9 +6,8 @@
#define PLPY_SUBXACTOBJECT
#include "nodes/pg_list.h"
-#include "utils/resowner.h"
-
#include "plpython.h"
+#include "utils/resowner.h"
/* a list of nested explicit subtransactions */
extern List *explicit_subtransactions;
diff --git a/src/pl/plpython/plpy_typeio.c b/src/pl/plpython/plpy_typeio.c
index e1a0524..e734b0d 100644
--- a/src/pl/plpython/plpy_typeio.c
+++ b/src/pl/plpython/plpy_typeio.c
@@ -11,20 +11,16 @@
#include "funcapi.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
+#include "plpy_elog.h"
+#include "plpy_main.h"
+#include "plpy_typeio.h"
+#include "plpython.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-#include "plpython.h"
-
-#include "plpy_typeio.h"
-
-#include "plpy_elog.h"
-#include "plpy_main.h"
-
-
/* conversion from Datums to Python objects */
static PyObject *PLyBool_FromBool(PLyDatumToOb *arg, Datum d);
static PyObject *PLyFloat_FromFloat4(PLyDatumToOb *arg, Datum d);
diff --git a/src/pl/plpython/plpy_typeio.h b/src/pl/plpython/plpy_typeio.h
index 3412a98..d11e6ae 100644
--- a/src/pl/plpython/plpy_typeio.h
+++ b/src/pl/plpython/plpy_typeio.h
@@ -7,9 +7,8 @@
#include "access/htup.h"
#include "fmgr.h"
-#include "utils/typcache.h"
-
#include "plpython.h"
+#include "utils/typcache.h"
struct PLyProcedure; /* avoid requiring plpy_procedure.h here */
diff --git a/src/pl/plpython/plpy_util.c b/src/pl/plpython/plpy_util.c
index 2128acb..4a7d726 100644
--- a/src/pl/plpython/plpy_util.c
+++ b/src/pl/plpython/plpy_util.c
@@ -7,14 +7,10 @@
#include "postgres.h"
#include "mb/pg_wchar.h"
-#include "utils/memutils.h"
-
-#include "plpython.h"
-
-#include "plpy_util.h"
-
#include "plpy_elog.h"
-
+#include "plpy_util.h"
+#include "plpython.h"
+#include "utils/memutils.h"
/*
* Convert a Python unicode object to a Python string/bytes object in
diff --git a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
index 7e9d7de..be318a6 100644
--- a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
+++ b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
@@ -12,8 +12,8 @@
*/
#include "postgres.h"
-#include "access/ginblock.h"
#include "access/gin_private.h"
+#include "access/ginblock.h"
#include "access/htup_details.h"
#include "fmgr.h"
--
1.8.3.1
Re: Ordering of header file inclusion
On Sat, Nov 16, 2019 at 7:01 AM vignesh C <vignesh21@gmail.com> wrote:
On Tue, Nov 12, 2019 at 11:19 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Tue, Nov 12, 2019 at 6:33 AM vignesh C <vignesh21@gmail.com> wrote:
Thanks Amit for your comments. Please find the updated patch which
does not include the changes mentioned above.Thanks for working on this. I have pushed your latest patch.
Thanks Amit for pushing the patch. I have re-verified and found that
changes need to be done in few more places. The main changes are made
in the header file and plpython source files. The attached patch
handles the same. I have verified make check and make check-world
including --with-python & --with-perl in the following:
CentOS Linux release 7.7.1908
Red Hat Enterprise Linux Server release 7.1I have verified including --llvm in CentOS Linux release 7.7.1908.
Thanks for finding the remaining places, the patch looks good to me.
I hope this covers the entire code. BTW, are you using some script to
find this or is this a result of manual inspection of code? I have
modified the commit message in the attached patch. I will commit this
early next week unless someone else wants to review it.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Attachments:
0001-Make-the-order-of-the-header-file-includes-consisten.patchapplication/octet-stream; name=0001-Make-the-order-of-the-header-file-includes-consisten.patchDownload
From 807fac0ea297b175af7f3d9389b8c15d242a53b1 Mon Sep 17 00:00:00 2001
From: Amit Kapila <akapila@postgresql.org>
Date: Thu, 21 Nov 2019 11:51:42 +0530
Subject: [PATCH] Make the order of the header file includes consistent.
Similar to commits 14aec03502, 7e735035f2 and dddf4cdc33, this commit
makes the order of header file inclusion consistent in more places.
Author: Vignesh C
Reviewed-by: Amit Kapila
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
---
contrib/bloom/bloom.h | 2 +-
contrib/btree_gist/btree_gist.h | 2 +-
contrib/btree_gist/btree_utils_num.h | 8 ++++----
contrib/btree_gist/btree_utils_var.h | 3 +--
contrib/postgres_fdw/postgres_fdw.h | 3 +--
src/backend/libpq/auth.c | 1 -
src/bin/pg_basebackup/receivelog.h | 3 +--
src/bin/pg_basebackup/streamutil.h | 3 +--
src/bin/pg_dump/pg_backup_archiver.h | 4 +---
src/bin/pg_rewind/datapagemap.h | 3 +--
src/bin/pg_rewind/filemap.h | 5 ++---
src/bin/pg_rewind/pg_rewind.h | 4 +---
src/bin/pg_waldump/pg_waldump.c | 2 +-
src/bin/psql/command.c | 16 +++++++---------
src/bin/psql/command.h | 3 +--
src/bin/psql/common.h | 2 +-
src/bin/psql/prompt.h | 2 +-
src/bin/psql/settings.h | 3 +--
src/bin/psql/tab-complete.c | 6 +++---
src/bin/scripts/common.h | 2 +-
src/include/access/gin_private.h | 2 +-
src/include/access/hio.h | 3 +--
src/include/access/htup_details.h | 2 +-
src/include/access/relation.h | 3 +--
src/include/access/table.h | 3 +--
src/include/access/twophase.h | 2 +-
src/include/catalog/pg_constraint.h | 3 +--
src/include/catalog/pg_conversion.h | 3 +--
src/include/catalog/pg_operator.h | 3 +--
src/include/catalog/pg_proc.h | 3 +--
src/include/catalog/pg_publication.h | 3 +--
src/include/catalog/pg_replication_origin.h | 3 +--
src/include/catalog/pg_subscription_rel.h | 3 +--
src/include/catalog/pg_type.h | 3 +--
src/include/commands/event_trigger.h | 2 +-
src/include/executor/nodeBitmapHeapscan.h | 2 +-
src/include/executor/nodeIndexonlyscan.h | 2 +-
src/include/executor/tuptable.h | 2 +-
src/include/funcapi.h | 3 +--
src/include/jit/llvmjit.h | 4 +---
src/include/nodes/execnodes.h | 7 +++----
src/include/replication/decode.h | 2 +-
src/include/replication/logical.h | 3 +--
src/include/replication/walreceiver.h | 2 +-
src/include/rewrite/rewriteHandler.h | 2 +-
src/include/statistics/extended_stats_internal.h | 3 +--
src/include/storage/buf_internals.h | 3 +--
src/include/storage/condition_variable.h | 2 +-
src/include/storage/lock.h | 3 +--
src/include/storage/lwlock.h | 2 +-
src/include/storage/standby.h | 2 +-
src/include/tsearch/ts_locale.h | 2 +-
src/include/utils/date.h | 2 +-
src/include/utils/jsonpath.h | 2 +-
src/include/utils/pg_lsn.h | 2 +-
src/include/utils/xml.h | 2 +-
src/interfaces/ecpg/ecpglib/descriptor.c | 2 +-
src/interfaces/ecpg/ecpglib/ecpglib_extern.h | 6 +++---
src/interfaces/ecpg/ecpglib/misc.c | 2 +-
src/interfaces/ecpg/include/ecpglib.h | 5 +++--
src/interfaces/ecpg/preproc/preproc_extern.h | 3 +--
src/pl/plperl/plperl.c | 5 ++---
src/pl/plpython/plpy_cursorobject.c | 8 ++------
src/pl/plpython/plpy_elog.c | 6 +-----
src/pl/plpython/plpy_exec.c | 16 ++++++----------
src/pl/plpython/plpy_main.c | 16 ++++++----------
src/pl/plpython/plpy_planobject.c | 7 ++-----
src/pl/plpython/plpy_plpymodule.c | 12 ++++--------
src/pl/plpython/plpy_procedure.c | 12 ++++--------
src/pl/plpython/plpy_resultobject.c | 6 ++----
src/pl/plpython/plpy_spi.c | 12 ++++--------
src/pl/plpython/plpy_spi.h | 3 +--
src/pl/plpython/plpy_subxactobject.c | 10 +++-------
src/pl/plpython/plpy_subxactobject.h | 3 +--
src/pl/plpython/plpy_typeio.c | 12 ++++--------
src/pl/plpython/plpy_typeio.h | 3 +--
src/pl/plpython/plpy_util.c | 10 +++-------
.../modules/test_ginpostinglist/test_ginpostinglist.c | 2 +-
78 files changed, 125 insertions(+), 208 deletions(-)
diff --git a/contrib/bloom/bloom.h b/contrib/bloom/bloom.h
index 010148e..a717998 100644
--- a/contrib/bloom/bloom.h
+++ b/contrib/bloom/bloom.h
@@ -17,8 +17,8 @@
#include "access/generic_xlog.h"
#include "access/itup.h"
#include "access/xlog.h"
-#include "nodes/pathnodes.h"
#include "fmgr.h"
+#include "nodes/pathnodes.h"
/* Support procedures numbers */
#define BLOOM_HASH_PROC 1
diff --git a/contrib/btree_gist/btree_gist.h b/contrib/btree_gist/btree_gist.h
index 011285a..14c7c8e 100644
--- a/contrib/btree_gist/btree_gist.h
+++ b/contrib/btree_gist/btree_gist.h
@@ -4,8 +4,8 @@
#ifndef __BTREE_GIST_H__
#define __BTREE_GIST_H__
-#include "fmgr.h"
#include "access/nbtree.h"
+#include "fmgr.h"
#define BtreeGistNotEqualStrategyNumber 6
diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h
index 50907b3..1fedfbe 100644
--- a/contrib/btree_gist/btree_utils_num.h
+++ b/contrib/btree_gist/btree_utils_num.h
@@ -4,13 +4,13 @@
#ifndef __BTREE_UTILS_NUM_H__
#define __BTREE_UTILS_NUM_H__
-#include "btree_gist.h"
-#include "access/gist.h"
-#include "utils/rel.h"
-
#include <math.h>
#include <float.h>
+#include "access/gist.h"
+#include "btree_gist.h"
+#include "utils/rel.h"
+
typedef char GBT_NUMKEY;
/* Better readable key */
diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h
index 1f2ca43..2f8def6 100644
--- a/contrib/btree_gist/btree_utils_var.h
+++ b/contrib/btree_gist/btree_utils_var.h
@@ -4,9 +4,8 @@
#ifndef __BTREE_UTILS_VAR_H__
#define __BTREE_UTILS_VAR_H__
-#include "btree_gist.h"
-
#include "access/gist.h"
+#include "btree_gist.h"
#include "mb/pg_wchar.h"
/* Variable length key */
diff --git a/contrib/postgres_fdw/postgres_fdw.h b/contrib/postgres_fdw/postgres_fdw.h
index 6acb7dc..bdefe0c 100644
--- a/contrib/postgres_fdw/postgres_fdw.h
+++ b/contrib/postgres_fdw/postgres_fdw.h
@@ -15,11 +15,10 @@
#include "foreign/foreign.h"
#include "lib/stringinfo.h"
+#include "libpq-fe.h"
#include "nodes/pathnodes.h"
#include "utils/relcache.h"
-#include "libpq-fe.h"
-
/*
* FDW-specific planner information kept in RelOptInfo.fdw_private for a
* postgres_fdw foreign table. For a baserel, this struct is created by
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 909d736..c12b810 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -39,7 +39,6 @@
#include "utils/memutils.h"
#include "utils/timestamp.h"
-
/*----------------------------------------------------------------
* Global authentication functions
*----------------------------------------------------------------
diff --git a/src/bin/pg_basebackup/receivelog.h b/src/bin/pg_basebackup/receivelog.h
index b6e2743..edf1ce6 100644
--- a/src/bin/pg_basebackup/receivelog.h
+++ b/src/bin/pg_basebackup/receivelog.h
@@ -12,11 +12,10 @@
#ifndef RECEIVELOG_H
#define RECEIVELOG_H
+#include "access/xlogdefs.h"
#include "libpq-fe.h"
#include "walmethods.h"
-#include "access/xlogdefs.h"
-
/*
* Called before trying to read more data or when a segment is
* finished. Return true to stop streaming.
diff --git a/src/bin/pg_basebackup/streamutil.h b/src/bin/pg_basebackup/streamutil.h
index a756eee..1edfc94 100644
--- a/src/bin/pg_basebackup/streamutil.h
+++ b/src/bin/pg_basebackup/streamutil.h
@@ -12,10 +12,9 @@
#ifndef STREAMUTIL_H
#define STREAMUTIL_H
-#include "libpq-fe.h"
-
#include "access/xlogdefs.h"
#include "datatype/timestamp.h"
+#include "libpq-fe.h"
extern const char *progname;
extern char *connection_string;
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index fa2c6ef..6768f92 100644
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -24,12 +24,10 @@
#ifndef __PG_BACKUP_ARCHIVE__
#define __PG_BACKUP_ARCHIVE__
-
#include <time.h>
-#include "pg_backup.h"
-
#include "libpq-fe.h"
+#include "pg_backup.h"
#include "pqexpbuffer.h"
#define LOBBUFSIZE 16384
diff --git a/src/bin/pg_rewind/datapagemap.h b/src/bin/pg_rewind/datapagemap.h
index c2baaae..d5bcfa6 100644
--- a/src/bin/pg_rewind/datapagemap.h
+++ b/src/bin/pg_rewind/datapagemap.h
@@ -9,9 +9,8 @@
#ifndef DATAPAGEMAP_H
#define DATAPAGEMAP_H
-#include "storage/relfilenode.h"
#include "storage/block.h"
-
+#include "storage/relfilenode.h"
struct datapagemap
{
diff --git a/src/bin/pg_rewind/filemap.h b/src/bin/pg_rewind/filemap.h
index 5882284..0aa822d 100644
--- a/src/bin/pg_rewind/filemap.h
+++ b/src/bin/pg_rewind/filemap.h
@@ -8,10 +8,9 @@
#ifndef FILEMAP_H
#define FILEMAP_H
-#include "storage/relfilenode.h"
-#include "storage/block.h"
-
#include "datapagemap.h"
+#include "storage/block.h"
+#include "storage/relfilenode.h"
/*
* For every file found in the local or remote system, we have a file entry
diff --git a/src/bin/pg_rewind/pg_rewind.h b/src/bin/pg_rewind/pg_rewind.h
index aa3a0ce..360b2b3 100644
--- a/src/bin/pg_rewind/pg_rewind.h
+++ b/src/bin/pg_rewind/pg_rewind.h
@@ -11,15 +11,13 @@
#ifndef PG_REWIND_H
#define PG_REWIND_H
-#include "datapagemap.h"
-
#include "access/timeline.h"
#include "common/logging.h"
+#include "datapagemap.h"
#include "libpq-fe.h"
#include "storage/block.h"
#include "storage/relfilenode.h"
-
/* Configuration options */
extern char *datadir_target;
extern char *datadir_source;
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index 1524e5e..d6695f7 100644
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -16,10 +16,10 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "access/transam.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-#include "access/transam.h"
#include "common/fe_memutils.h"
#include "common/logging.h"
#include "getopt_long.h"
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index b981ae8..a9299a9 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -6,7 +6,6 @@
* src/bin/psql/command.c
*/
#include "postgres_fe.h"
-#include "command.h"
#include <ctype.h>
#include <time.h>
@@ -24,22 +23,21 @@
#endif
#include "catalog/pg_class_d.h"
-#include "portability/instr_time.h"
-
-#include "libpq-fe.h"
-#include "pqexpbuffer.h"
-#include "common/logging.h"
-#include "fe_utils/print.h"
-#include "fe_utils/string_utils.h"
-
+#include "command.h"
#include "common.h"
+#include "common/logging.h"
#include "copy.h"
#include "crosstabview.h"
#include "describe.h"
+#include "fe_utils/print.h"
+#include "fe_utils/string_utils.h"
#include "help.h"
#include "input.h"
#include "large_obj.h"
+#include "libpq-fe.h"
#include "mainloop.h"
+#include "portability/instr_time.h"
+#include "pqexpbuffer.h"
#include "psqlscanslash.h"
#include "settings.h"
#include "variables.h"
diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h
index 33791b6..6d39b90 100644
--- a/src/bin/psql/command.h
+++ b/src/bin/psql/command.h
@@ -8,10 +8,9 @@
#ifndef COMMAND_H
#define COMMAND_H
+#include "fe_utils/conditional.h"
#include "fe_utils/print.h"
#include "fe_utils/psqlscan.h"
-#include "fe_utils/conditional.h"
-
typedef enum _backslashResult
{
diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h
index 282a520..292dc54 100644
--- a/src/bin/psql/common.h
+++ b/src/bin/psql/common.h
@@ -10,9 +10,9 @@
#include <setjmp.h>
-#include "libpq-fe.h"
#include "fe_utils/print.h"
#include "fe_utils/psqlscan.h"
+#include "libpq-fe.h"
extern bool openQueryOutputFile(const char *fname, FILE **fout, bool *is_pipe);
extern bool setQFout(const char *fname);
diff --git a/src/bin/psql/prompt.h b/src/bin/psql/prompt.h
index 905ee3d..683e361 100644
--- a/src/bin/psql/prompt.h
+++ b/src/bin/psql/prompt.h
@@ -8,9 +8,9 @@
#ifndef PROMPT_H
#define PROMPT_H
+#include "fe_utils/conditional.h"
/* enum promptStatus_t is now defined by psqlscan.h */
#include "fe_utils/psqlscan.h"
-#include "fe_utils/conditional.h"
char *get_prompt(promptStatus_t status, ConditionalStack cstack);
diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
index 5be5091..7cd6d5f 100644
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -8,9 +8,8 @@
#ifndef SETTINGS_H
#define SETTINGS_H
-
-#include "variables.h"
#include "fe_utils/print.h"
+#include "variables.h"
#define DEFAULT_CSV_FIELD_SEP ','
#define DEFAULT_FIELD_SEP "|"
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 98c917b..8a6bfa5 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -33,8 +33,9 @@
*/
#include "postgres_fe.h"
-#include "tab-complete.h"
+
#include "input.h"
+#include "tab-complete.h"
/* If we don't have this, we might as well forget about the whole thing: */
#ifdef USE_READLINE
@@ -43,10 +44,9 @@
#include "catalog/pg_am_d.h"
#include "catalog/pg_class_d.h"
-
+#include "common.h"
#include "libpq-fe.h"
#include "pqexpbuffer.h"
-#include "common.h"
#include "settings.h"
#include "stringutils.h"
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index f36b26a..b8580f9 100644
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -10,8 +10,8 @@
#define COMMON_H
#include "common/username.h"
-#include "libpq-fe.h"
#include "getopt_long.h" /* pgrminclude ignore */
+#include "libpq-fe.h"
#include "pqexpbuffer.h" /* pgrminclude ignore */
enum trivalue
diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index 78fcd82..7d0cbcc 100644
--- a/src/include/access/gin_private.h
+++ b/src/include/access/gin_private.h
@@ -15,8 +15,8 @@
#include "access/ginblock.h"
#include "access/itup.h"
#include "fmgr.h"
-#include "storage/bufmgr.h"
#include "lib/rbtree.h"
+#include "storage/bufmgr.h"
/*
* Storage type for GIN's reloptions
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index dbaabcc..ad6da6d 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -15,9 +15,8 @@
#define HIO_H
#include "access/htup.h"
-#include "utils/relcache.h"
#include "storage/buf.h"
-
+#include "utils/relcache.h"
/*
* state for bulk inserts --- private to heapam.c and hio.c
diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h
index 66d61fd..7e94719 100644
--- a/src/include/access/htup_details.h
+++ b/src/include/access/htup_details.h
@@ -15,9 +15,9 @@
#define HTUP_DETAILS_H
#include "access/htup.h"
+#include "access/transam.h"
#include "access/tupdesc.h"
#include "access/tupmacs.h"
-#include "access/transam.h"
#include "storage/bufpage.h"
/*
diff --git a/src/include/access/relation.h b/src/include/access/relation.h
index 38acaa5..0a1de35 100644
--- a/src/include/access/relation.h
+++ b/src/include/access/relation.h
@@ -15,9 +15,8 @@
#define ACCESS_RELATION_H
#include "nodes/primnodes.h"
-#include "utils/relcache.h"
#include "storage/lockdefs.h"
-
+#include "utils/relcache.h"
extern Relation relation_open(Oid relationId, LOCKMODE lockmode);
extern Relation try_relation_open(Oid relationId, LOCKMODE lockmode);
diff --git a/src/include/access/table.h b/src/include/access/table.h
index cb9b438..071b254 100644
--- a/src/include/access/table.h
+++ b/src/include/access/table.h
@@ -15,9 +15,8 @@
#define TABLE_H
#include "nodes/primnodes.h"
-#include "utils/relcache.h"
#include "storage/lockdefs.h"
-
+#include "utils/relcache.h"
extern Relation table_open(Oid relationId, LOCKMODE lockmode);
extern Relation table_openrv(const RangeVar *relation, LOCKMODE lockmode);
diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h
index 1093085..02b5315 100644
--- a/src/include/access/twophase.h
+++ b/src/include/access/twophase.h
@@ -14,8 +14,8 @@
#ifndef TWOPHASE_H
#define TWOPHASE_H
-#include "access/xlogdefs.h"
#include "access/xact.h"
+#include "access/xlogdefs.h"
#include "datatype/timestamp.h"
#include "storage/lock.h"
diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h
index c1e60c7..cbb5d9a 100644
--- a/src/include/catalog/pg_constraint.h
+++ b/src/include/catalog/pg_constraint.h
@@ -18,10 +18,9 @@
#ifndef PG_CONSTRAINT_H
#define PG_CONSTRAINT_H
+#include "catalog/dependency.h"
#include "catalog/genbki.h"
#include "catalog/pg_constraint_d.h"
-
-#include "catalog/dependency.h"
#include "nodes/pg_list.h"
/* ----------------
diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h
index 49c7070..fc523c2 100644
--- a/src/include/catalog/pg_conversion.h
+++ b/src/include/catalog/pg_conversion.h
@@ -18,9 +18,8 @@
#define PG_CONVERSION_H
#include "catalog/genbki.h"
-#include "catalog/pg_conversion_d.h"
-
#include "catalog/objectaddress.h"
+#include "catalog/pg_conversion_d.h"
/* ----------------
* pg_conversion definition. cpp turns this into
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index 7c4f686..3157fc5 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -19,9 +19,8 @@
#define PG_OPERATOR_H
#include "catalog/genbki.h"
-#include "catalog/pg_operator_d.h"
-
#include "catalog/objectaddress.h"
+#include "catalog/pg_operator_d.h"
#include "nodes/pg_list.h"
/* ----------------
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index dc29c06..e6c1909 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -18,9 +18,8 @@
#define PG_PROC_H
#include "catalog/genbki.h"
-#include "catalog/pg_proc_d.h"
-
#include "catalog/objectaddress.h"
+#include "catalog/pg_proc_d.h"
#include "nodes/pg_list.h"
/* ----------------
diff --git a/src/include/catalog/pg_publication.h b/src/include/catalog/pg_publication.h
index 20a2f0a..ea22aa6 100644
--- a/src/include/catalog/pg_publication.h
+++ b/src/include/catalog/pg_publication.h
@@ -18,9 +18,8 @@
#define PG_PUBLICATION_H
#include "catalog/genbki.h"
-#include "catalog/pg_publication_d.h"
-
#include "catalog/objectaddress.h"
+#include "catalog/pg_publication_d.h"
/* ----------------
* pg_publication definition. cpp turns this into
diff --git a/src/include/catalog/pg_replication_origin.h b/src/include/catalog/pg_replication_origin.h
index b768584..613d07e 100644
--- a/src/include/catalog/pg_replication_origin.h
+++ b/src/include/catalog/pg_replication_origin.h
@@ -18,11 +18,10 @@
#ifndef PG_REPLICATION_ORIGIN_H
#define PG_REPLICATION_ORIGIN_H
+#include "access/xlogdefs.h"
#include "catalog/genbki.h"
#include "catalog/pg_replication_origin_d.h"
-#include "access/xlogdefs.h"
-
/* ----------------
* pg_replication_origin. cpp turns this into
* typedef struct FormData_pg_replication_origin
diff --git a/src/include/catalog/pg_subscription_rel.h b/src/include/catalog/pg_subscription_rel.h
index f7df814..21b4ac2 100644
--- a/src/include/catalog/pg_subscription_rel.h
+++ b/src/include/catalog/pg_subscription_rel.h
@@ -18,10 +18,9 @@
#ifndef PG_SUBSCRIPTION_REL_H
#define PG_SUBSCRIPTION_REL_H
+#include "access/xlogdefs.h"
#include "catalog/genbki.h"
#include "catalog/pg_subscription_rel_d.h"
-
-#include "access/xlogdefs.h"
#include "nodes/pg_list.h"
/* ----------------
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 2a584b4..0c273a0 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -19,9 +19,8 @@
#define PG_TYPE_H
#include "catalog/genbki.h"
-#include "catalog/pg_type_d.h"
-
#include "catalog/objectaddress.h"
+#include "catalog/pg_type_d.h"
#include "nodes/nodes.h"
/* ----------------
diff --git a/src/include/commands/event_trigger.h b/src/include/commands/event_trigger.h
index 575e924..6eeb720 100644
--- a/src/include/commands/event_trigger.h
+++ b/src/include/commands/event_trigger.h
@@ -17,8 +17,8 @@
#include "catalog/objectaddress.h"
#include "catalog/pg_event_trigger.h"
#include "nodes/parsenodes.h"
-#include "utils/aclchk_internal.h"
#include "tcop/deparse_utility.h"
+#include "utils/aclchk_internal.h"
typedef struct EventTriggerData
{
diff --git a/src/include/executor/nodeBitmapHeapscan.h b/src/include/executor/nodeBitmapHeapscan.h
index 112def1..2c31d6f 100644
--- a/src/include/executor/nodeBitmapHeapscan.h
+++ b/src/include/executor/nodeBitmapHeapscan.h
@@ -14,8 +14,8 @@
#ifndef NODEBITMAPHEAPSCAN_H
#define NODEBITMAPHEAPSCAN_H
-#include "nodes/execnodes.h"
#include "access/parallel.h"
+#include "nodes/execnodes.h"
extern BitmapHeapScanState *ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags);
extern void ExecEndBitmapHeapScan(BitmapHeapScanState *node);
diff --git a/src/include/executor/nodeIndexonlyscan.h b/src/include/executor/nodeIndexonlyscan.h
index 644166b..d85cd12 100644
--- a/src/include/executor/nodeIndexonlyscan.h
+++ b/src/include/executor/nodeIndexonlyscan.h
@@ -14,8 +14,8 @@
#ifndef NODEINDEXONLYSCAN_H
#define NODEINDEXONLYSCAN_H
-#include "nodes/execnodes.h"
#include "access/parallel.h"
+#include "nodes/execnodes.h"
extern IndexOnlyScanState *ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags);
extern void ExecEndIndexOnlyScan(IndexOnlyScanState *node);
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index b7f9772..04feaba 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -15,9 +15,9 @@
#define TUPTABLE_H
#include "access/htup.h"
+#include "access/htup_details.h"
#include "access/sysattr.h"
#include "access/tupdesc.h"
-#include "access/htup_details.h"
#include "storage/buf.h"
/*----------
diff --git a/src/include/funcapi.h b/src/include/funcapi.h
index 1a88b52..1aa1f4d 100644
--- a/src/include/funcapi.h
+++ b/src/include/funcapi.h
@@ -17,11 +17,10 @@
#ifndef FUNCAPI_H
#define FUNCAPI_H
-#include "fmgr.h"
#include "access/tupdesc.h"
#include "executor/executor.h"
#include "executor/tuptable.h"
-
+#include "fmgr.h"
/*-------------------------------------------------------------------------
* Support to ease writing Functions returning composite types
diff --git a/src/include/jit/llvmjit.h b/src/include/jit/llvmjit.h
index 6178864..8b441df 100644
--- a/src/include/jit/llvmjit.h
+++ b/src/include/jit/llvmjit.h
@@ -30,12 +30,10 @@ extern "C"
{
#endif
-
+#include "access/tupdesc.h"
#include "fmgr.h"
#include "jit/jit.h"
#include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-
typedef struct LLVMJitContext
{
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 44f7608..6eb6472 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -20,18 +20,17 @@
#include "lib/pairingheap.h"
#include "nodes/params.h"
#include "nodes/plannodes.h"
+#include "nodes/tidbitmap.h"
#include "partitioning/partdefs.h"
+#include "storage/condition_variable.h"
#include "utils/hsearch.h"
#include "utils/queryenvironment.h"
#include "utils/reltrigger.h"
#include "utils/sharedtuplestore.h"
#include "utils/snapshot.h"
#include "utils/sortsupport.h"
-#include "utils/tuplestore.h"
#include "utils/tuplesort.h"
-#include "nodes/tidbitmap.h"
-#include "storage/condition_variable.h"
-
+#include "utils/tuplestore.h"
struct PlanState; /* forward references in this file */
struct PartitionRoutingInfo;
diff --git a/src/include/replication/decode.h b/src/include/replication/decode.h
index 89689a0..3f87724 100644
--- a/src/include/replication/decode.h
+++ b/src/include/replication/decode.h
@@ -11,8 +11,8 @@
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
-#include "replication/reorderbuffer.h"
#include "replication/logical.h"
+#include "replication/reorderbuffer.h"
void LogicalDecodingProcessRecord(LogicalDecodingContext *ctx,
XLogReaderState *record);
diff --git a/src/include/replication/logical.h b/src/include/replication/logical.h
index 31c796b..6879a2e 100644
--- a/src/include/replication/logical.h
+++ b/src/include/replication/logical.h
@@ -9,11 +9,10 @@
#ifndef LOGICAL_H
#define LOGICAL_H
-#include "replication/slot.h"
-
#include "access/xlog.h"
#include "access/xlogreader.h"
#include "replication/output_plugin.h"
+#include "replication/slot.h"
struct LogicalDecodingContext;
diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h
index e12a934..41714ea 100644
--- a/src/include/replication/walreceiver.h
+++ b/src/include/replication/walreceiver.h
@@ -15,11 +15,11 @@
#include "access/xlog.h"
#include "access/xlogdefs.h"
#include "getaddrinfo.h" /* for NI_MAXHOST */
+#include "pgtime.h"
#include "replication/logicalproto.h"
#include "replication/walsender.h"
#include "storage/latch.h"
#include "storage/spin.h"
-#include "pgtime.h"
#include "utils/tuplestore.h"
/* user-settable parameters */
diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h
index c55fe81..e5b66e1 100644
--- a/src/include/rewrite/rewriteHandler.h
+++ b/src/include/rewrite/rewriteHandler.h
@@ -14,8 +14,8 @@
#ifndef REWRITEHANDLER_H
#define REWRITEHANDLER_H
-#include "utils/relcache.h"
#include "nodes/parsenodes.h"
+#include "utils/relcache.h"
extern List *QueryRewrite(Query *parsetree);
extern void AcquireRewriteLocks(Query *parsetree,
diff --git a/src/include/statistics/extended_stats_internal.h b/src/include/statistics/extended_stats_internal.h
index fcf4e8a..8ff1ef3 100644
--- a/src/include/statistics/extended_stats_internal.h
+++ b/src/include/statistics/extended_stats_internal.h
@@ -14,9 +14,8 @@
#ifndef EXTENDED_STATS_INTERNAL_H
#define EXTENDED_STATS_INTERNAL_H
-#include "utils/sortsupport.h"
#include "statistics/statistics.h"
-
+#include "utils/sortsupport.h"
typedef struct
{
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index 6ffe184..d540c0a 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -15,17 +15,16 @@
#ifndef BUFMGR_INTERNALS_H
#define BUFMGR_INTERNALS_H
+#include "port/atomics.h"
#include "storage/buf.h"
#include "storage/bufmgr.h"
#include "storage/latch.h"
#include "storage/lwlock.h"
#include "storage/shmem.h"
#include "storage/smgr.h"
-#include "port/atomics.h"
#include "storage/spin.h"
#include "utils/relcache.h"
-
/*
* Buffer state is a single 32-bit variable where following data is combined.
*
diff --git a/src/include/storage/condition_variable.h b/src/include/storage/condition_variable.h
index ee06e05..0aad8cc 100644
--- a/src/include/storage/condition_variable.h
+++ b/src/include/storage/condition_variable.h
@@ -22,8 +22,8 @@
#ifndef CONDITION_VARIABLE_H
#define CONDITION_VARIABLE_H
-#include "storage/s_lock.h"
#include "storage/proclist_types.h"
+#include "storage/s_lock.h"
typedef struct
{
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 6efb7a9..e8b50fe 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -18,12 +18,11 @@
#error "lock.h may not be included from frontend code"
#endif
-#include "storage/lockdefs.h"
#include "storage/backendid.h"
+#include "storage/lockdefs.h"
#include "storage/lwlock.h"
#include "storage/shmem.h"
-
/* struct PGPROC is declared in proc.h, but must forward-reference it */
typedef struct PGPROC PGPROC;
diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h
index f627dfe..f9450da 100644
--- a/src/include/storage/lwlock.h
+++ b/src/include/storage/lwlock.h
@@ -18,9 +18,9 @@
#error "lwlock.h may not be included from frontend code"
#endif
+#include "port/atomics.h"
#include "storage/proclist_types.h"
#include "storage/s_lock.h"
-#include "port/atomics.h"
struct PGPROC;
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h
index a3f8f82..6ba90c6 100644
--- a/src/include/storage/standby.h
+++ b/src/include/storage/standby.h
@@ -14,10 +14,10 @@
#ifndef STANDBY_H
#define STANDBY_H
-#include "storage/standbydefs.h"
#include "storage/lock.h"
#include "storage/procsignal.h"
#include "storage/relfilenode.h"
+#include "storage/standbydefs.h"
/* User-settable GUC parameters */
extern int vacuum_defer_cleanup_age;
diff --git a/src/include/tsearch/ts_locale.h b/src/include/tsearch/ts_locale.h
index 9e8cd77..b7db7b2 100644
--- a/src/include/tsearch/ts_locale.h
+++ b/src/include/tsearch/ts_locale.h
@@ -15,8 +15,8 @@
#include <ctype.h>
#include <limits.h>
-#include "utils/pg_locale.h"
#include "mb/pg_wchar.h"
+#include "utils/pg_locale.h"
/*
* towlower() and friends should be in <wctype.h>, but some pre-C99 systems
diff --git a/src/include/utils/date.h b/src/include/utils/date.h
index 7352b1f..6015983 100644
--- a/src/include/utils/date.h
+++ b/src/include/utils/date.h
@@ -16,9 +16,9 @@
#include <math.h>
+#include "datatype/timestamp.h"
#include "fmgr.h"
#include "pgtime.h"
-#include "datatype/timestamp.h"
typedef int32 DateADT;
diff --git a/src/include/utils/jsonpath.h b/src/include/utils/jsonpath.h
index 0f2b08e..9af9ffd 100644
--- a/src/include/utils/jsonpath.h
+++ b/src/include/utils/jsonpath.h
@@ -15,8 +15,8 @@
#define JSONPATH_H
#include "fmgr.h"
-#include "utils/jsonb.h"
#include "nodes/pg_list.h"
+#include "utils/jsonb.h"
typedef struct
{
diff --git a/src/include/utils/pg_lsn.h b/src/include/utils/pg_lsn.h
index 70d8640..8b371c5 100644
--- a/src/include/utils/pg_lsn.h
+++ b/src/include/utils/pg_lsn.h
@@ -15,8 +15,8 @@
#ifndef PG_LSN_H
#define PG_LSN_H
-#include "fmgr.h"
#include "access/xlogdefs.h"
+#include "fmgr.h"
#define DatumGetLSN(X) ((XLogRecPtr) DatumGetInt64(X))
#define LSNGetDatum(X) (Int64GetDatum((int64) (X)))
diff --git a/src/include/utils/xml.h b/src/include/utils/xml.h
index 90d08b1..69e9a9c 100644
--- a/src/include/utils/xml.h
+++ b/src/include/utils/xml.h
@@ -15,10 +15,10 @@
#ifndef XML_H
#define XML_H
+#include "executor/tablefunc.h"
#include "fmgr.h"
#include "nodes/execnodes.h"
#include "nodes/primnodes.h"
-#include "executor/tablefunc.h"
typedef struct varlena xmltype;
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index 7bd0534..f71f539 100644
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -12,9 +12,9 @@
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "ecpgtype.h"
+#include "sql3types.h"
#include "sqlca.h"
#include "sqlda.h"
-#include "sql3types.h"
static void descriptor_free(struct descriptor *desc);
diff --git a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h
index 4bf55fe..1a98dea 100644
--- a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h
+++ b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h
@@ -3,12 +3,12 @@
#ifndef _ECPG_ECPGLIB_EXTERN_H
#define _ECPG_ECPGLIB_EXTERN_H
+#include "ecpg_config.h"
+#include "ecpgtype.h"
#include "libpq-fe.h"
#include "sqlca.h"
-#include "sqlda-native.h"
#include "sqlda-compat.h"
-#include "ecpg_config.h"
-#include "ecpgtype.h"
+#include "sqlda-native.h"
#ifndef CHAR_BIT
#include <limits.h>
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index c4b2183..a07d0df 100644
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -11,11 +11,11 @@
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "ecpgtype.h"
+#include "pg_config_paths.h"
#include "pgtypes_date.h"
#include "pgtypes_interval.h"
#include "pgtypes_numeric.h"
#include "pgtypes_timestamp.h"
-#include "pg_config_paths.h"
#include "sqlca.h"
#ifndef LONG_LONG_MIN
diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h
index c65073f..0024010 100644
--- a/src/interfaces/ecpg/include/ecpglib.h
+++ b/src/interfaces/ecpg/include/ecpglib.h
@@ -7,11 +7,12 @@
#ifndef _ECPGLIB_H
#define _ECPGLIB_H
-#include "libpq-fe.h"
+#include <string.h>
+
#include "ecpg_config.h"
#include "ecpgtype.h"
+#include "libpq-fe.h"
#include "sqlca.h"
-#include <string.h>
/*
* This is a small extract from c.h since we don't want to leak all postgres
diff --git a/src/interfaces/ecpg/preproc/preproc_extern.h b/src/interfaces/ecpg/preproc/preproc_extern.h
index 323fd5c..51d5f94 100644
--- a/src/interfaces/ecpg/preproc/preproc_extern.h
+++ b/src/interfaces/ecpg/preproc/preproc_extern.h
@@ -3,9 +3,8 @@
#ifndef _ECPG_PREPROC_EXTERN_H
#define _ECPG_PREPROC_EXTERN_H
-#include "type.h"
-
#include "common/keywords.h"
+#include "type.h"
#ifndef CHAR_BIT
#include <limits.h>
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 90f7cf1..0b224b9 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -44,11 +44,10 @@
#define TEXTDOMAIN PG_TEXTDOMAIN("plperl")
/* perl stuff */
-#include "plperl.h"
-#include "plperl_helpers.h"
-
/* string literal macros defining chunks of perl code */
#include "perlchunks.h"
+#include "plperl.h"
+#include "plperl_helpers.h"
/* defines PLPERL_SET_OPMASK */
#include "plperl_opmask.h"
diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c
index b44ce7e..4c37ff8 100644
--- a/src/pl/plpython/plpy_cursorobject.c
+++ b/src/pl/plpython/plpy_cursorobject.c
@@ -11,19 +11,15 @@
#include "access/xact.h"
#include "catalog/pg_type.h"
#include "mb/pg_wchar.h"
-#include "utils/memutils.h"
-
-#include "plpython.h"
-
#include "plpy_cursorobject.h"
-
#include "plpy_elog.h"
#include "plpy_main.h"
#include "plpy_planobject.h"
#include "plpy_procedure.h"
#include "plpy_resultobject.h"
#include "plpy_spi.h"
-
+#include "plpython.h"
+#include "utils/memutils.h"
static PyObject *PLy_cursor_query(const char *query);
static void PLy_cursor_dealloc(PyObject *arg);
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
index 15cc444..eb56282 100644
--- a/src/pl/plpython/plpy_elog.c
+++ b/src/pl/plpython/plpy_elog.c
@@ -7,14 +7,10 @@
#include "postgres.h"
#include "lib/stringinfo.h"
-
-#include "plpython.h"
-
#include "plpy_elog.h"
-
#include "plpy_main.h"
#include "plpy_procedure.h"
-
+#include "plpython.h"
PyObject *PLy_exc_error = NULL;
PyObject *PLy_exc_fatal = NULL;
diff --git a/src/pl/plpython/plpy_exec.c b/src/pl/plpython/plpy_exec.c
index 1aec1b2..c6f6a6f 100644
--- a/src/pl/plpython/plpy_exec.c
+++ b/src/pl/plpython/plpy_exec.c
@@ -12,20 +12,16 @@
#include "commands/trigger.h"
#include "executor/spi.h"
#include "funcapi.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
-#include "utils/rel.h"
-#include "utils/typcache.h"
-
-#include "plpython.h"
-
-#include "plpy_exec.h"
-
#include "plpy_elog.h"
+#include "plpy_exec.h"
#include "plpy_main.h"
#include "plpy_procedure.h"
#include "plpy_subxactobject.h"
-
+#include "plpython.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/rel.h"
+#include "utils/typcache.h"
/* saved state for a set-returning function */
typedef struct PLySRFState
diff --git a/src/pl/plpython/plpy_main.c b/src/pl/plpython/plpy_main.c
index 6edfcf2..faaec55 100644
--- a/src/pl/plpython/plpy_main.c
+++ b/src/pl/plpython/plpy_main.c
@@ -12,21 +12,17 @@
#include "commands/trigger.h"
#include "executor/spi.h"
#include "miscadmin.h"
-#include "utils/guc.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/syscache.h"
-
-#include "plpython.h"
-
-#include "plpy_main.h"
-
#include "plpy_elog.h"
#include "plpy_exec.h"
+#include "plpy_main.h"
#include "plpy_plpymodule.h"
#include "plpy_procedure.h"
#include "plpy_subxactobject.h"
-
+#include "plpython.h"
+#include "utils/guc.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
+#include "utils/syscache.h"
/*
* exported functions
diff --git a/src/pl/plpython/plpy_planobject.c b/src/pl/plpython/plpy_planobject.c
index 96ea24c..c23e79f 100644
--- a/src/pl/plpython/plpy_planobject.c
+++ b/src/pl/plpython/plpy_planobject.c
@@ -6,16 +6,13 @@
#include "postgres.h"
-#include "plpython.h"
-
-#include "plpy_planobject.h"
-
#include "plpy_cursorobject.h"
#include "plpy_elog.h"
+#include "plpy_planobject.h"
#include "plpy_spi.h"
+#include "plpython.h"
#include "utils/memutils.h"
-
static void PLy_plan_dealloc(PyObject *arg);
static PyObject *PLy_plan_cursor(PyObject *self, PyObject *args);
static PyObject *PLy_plan_execute(PyObject *self, PyObject *args);
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
index c80b350..e308c61 100644
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -8,21 +8,17 @@
#include "access/xact.h"
#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
-#include "utils/snapmgr.h"
-
-#include "plpython.h"
-
-#include "plpy_plpymodule.h"
-
#include "plpy_cursorobject.h"
#include "plpy_elog.h"
#include "plpy_main.h"
#include "plpy_planobject.h"
+#include "plpy_plpymodule.h"
#include "plpy_resultobject.h"
#include "plpy_spi.h"
#include "plpy_subxactobject.h"
-
+#include "plpython.h"
+#include "utils/builtins.h"
+#include "utils/snapmgr.h"
HTAB *PLy_spi_exceptions = NULL;
diff --git a/src/pl/plpython/plpy_procedure.c b/src/pl/plpython/plpy_procedure.c
index 6e08c03..9e15839 100644
--- a/src/pl/plpython/plpy_procedure.c
+++ b/src/pl/plpython/plpy_procedure.c
@@ -11,6 +11,10 @@
#include "funcapi.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
+#include "plpy_elog.h"
+#include "plpy_main.h"
+#include "plpy_procedure.h"
+#include "plpython.h"
#include "utils/builtins.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
@@ -18,14 +22,6 @@
#include "utils/memutils.h"
#include "utils/syscache.h"
-#include "plpython.h"
-
-#include "plpy_procedure.h"
-
-#include "plpy_elog.h"
-#include "plpy_main.h"
-
-
static HTAB *PLy_procedure_cache = NULL;
static PLyProcedure *PLy_procedure_create(HeapTuple procTup, Oid fn_oid, bool is_trigger);
diff --git a/src/pl/plpython/plpy_resultobject.c b/src/pl/plpython/plpy_resultobject.c
index 20cf3ed..b31dbda 100644
--- a/src/pl/plpython/plpy_resultobject.c
+++ b/src/pl/plpython/plpy_resultobject.c
@@ -6,11 +6,9 @@
#include "postgres.h"
-#include "plpython.h"
-
-#include "plpy_resultobject.h"
#include "plpy_elog.h"
-
+#include "plpy_resultobject.h"
+#include "plpython.h"
static void PLy_result_dealloc(PyObject *arg);
static PyObject *PLy_result_colnames(PyObject *self, PyObject *unused);
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
index ed2eee0..99c1b4f 100644
--- a/src/pl/plpython/plpy_spi.c
+++ b/src/pl/plpython/plpy_spi.c
@@ -14,20 +14,16 @@
#include "executor/spi.h"
#include "mb/pg_wchar.h"
#include "parser/parse_type.h"
-#include "utils/memutils.h"
-#include "utils/syscache.h"
-
-#include "plpython.h"
-
-#include "plpy_spi.h"
-
#include "plpy_elog.h"
#include "plpy_main.h"
#include "plpy_planobject.h"
#include "plpy_plpymodule.h"
#include "plpy_procedure.h"
#include "plpy_resultobject.h"
-
+#include "plpy_spi.h"
+#include "plpython.h"
+#include "utils/memutils.h"
+#include "utils/syscache.h"
static PyObject *PLy_spi_execute_query(char *query, long limit);
static PyObject *PLy_spi_execute_fetch_result(SPITupleTable *tuptable,
diff --git a/src/pl/plpython/plpy_spi.h b/src/pl/plpython/plpy_spi.h
index ec7b689..a5e2e60 100644
--- a/src/pl/plpython/plpy_spi.h
+++ b/src/pl/plpython/plpy_spi.h
@@ -5,9 +5,8 @@
#ifndef PLPY_SPI_H
#define PLPY_SPI_H
-#include "utils/resowner.h"
-
#include "plpython.h"
+#include "utils/resowner.h"
extern PyObject *PLy_spi_prepare(PyObject *self, PyObject *args);
extern PyObject *PLy_spi_execute(PyObject *self, PyObject *args);
diff --git a/src/pl/plpython/plpy_subxactobject.c b/src/pl/plpython/plpy_subxactobject.c
index 5dfb8a4..98d7c90 100644
--- a/src/pl/plpython/plpy_subxactobject.c
+++ b/src/pl/plpython/plpy_subxactobject.c
@@ -7,14 +7,10 @@
#include "postgres.h"
#include "access/xact.h"
-#include "utils/memutils.h"
-
-#include "plpython.h"
-
-#include "plpy_subxactobject.h"
-
#include "plpy_elog.h"
-
+#include "plpy_subxactobject.h"
+#include "plpython.h"
+#include "utils/memutils.h"
List *explicit_subtransactions = NIL;
diff --git a/src/pl/plpython/plpy_subxactobject.h b/src/pl/plpython/plpy_subxactobject.h
index 1ee85c0..5b6f863 100644
--- a/src/pl/plpython/plpy_subxactobject.h
+++ b/src/pl/plpython/plpy_subxactobject.h
@@ -6,9 +6,8 @@
#define PLPY_SUBXACTOBJECT
#include "nodes/pg_list.h"
-#include "utils/resowner.h"
-
#include "plpython.h"
+#include "utils/resowner.h"
/* a list of nested explicit subtransactions */
extern List *explicit_subtransactions;
diff --git a/src/pl/plpython/plpy_typeio.c b/src/pl/plpython/plpy_typeio.c
index e1a0524..e734b0d 100644
--- a/src/pl/plpython/plpy_typeio.c
+++ b/src/pl/plpython/plpy_typeio.c
@@ -11,20 +11,16 @@
#include "funcapi.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
+#include "plpy_elog.h"
+#include "plpy_main.h"
+#include "plpy_typeio.h"
+#include "plpython.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-#include "plpython.h"
-
-#include "plpy_typeio.h"
-
-#include "plpy_elog.h"
-#include "plpy_main.h"
-
-
/* conversion from Datums to Python objects */
static PyObject *PLyBool_FromBool(PLyDatumToOb *arg, Datum d);
static PyObject *PLyFloat_FromFloat4(PLyDatumToOb *arg, Datum d);
diff --git a/src/pl/plpython/plpy_typeio.h b/src/pl/plpython/plpy_typeio.h
index 3412a98..d11e6ae 100644
--- a/src/pl/plpython/plpy_typeio.h
+++ b/src/pl/plpython/plpy_typeio.h
@@ -7,9 +7,8 @@
#include "access/htup.h"
#include "fmgr.h"
-#include "utils/typcache.h"
-
#include "plpython.h"
+#include "utils/typcache.h"
struct PLyProcedure; /* avoid requiring plpy_procedure.h here */
diff --git a/src/pl/plpython/plpy_util.c b/src/pl/plpython/plpy_util.c
index 2128acb..4a7d726 100644
--- a/src/pl/plpython/plpy_util.c
+++ b/src/pl/plpython/plpy_util.c
@@ -7,14 +7,10 @@
#include "postgres.h"
#include "mb/pg_wchar.h"
-#include "utils/memutils.h"
-
-#include "plpython.h"
-
-#include "plpy_util.h"
-
#include "plpy_elog.h"
-
+#include "plpy_util.h"
+#include "plpython.h"
+#include "utils/memutils.h"
/*
* Convert a Python unicode object to a Python string/bytes object in
diff --git a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
index 7e9d7de..be318a6 100644
--- a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
+++ b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c
@@ -12,8 +12,8 @@
*/
#include "postgres.h"
-#include "access/ginblock.h"
#include "access/gin_private.h"
+#include "access/ginblock.h"
#include "access/htup_details.h"
#include "fmgr.h"
--
1.8.3.1
Re: Ordering of header file inclusion
On Thu, Nov 21, 2019 at 2:11 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Sat, Nov 16, 2019 at 7:01 AM vignesh C <vignesh21@gmail.com> wrote:
On Tue, Nov 12, 2019 at 11:19 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Tue, Nov 12, 2019 at 6:33 AM vignesh C <vignesh21@gmail.com> wrote:
Thanks Amit for your comments. Please find the updated patch which
does not include the changes mentioned above.Thanks for working on this. I have pushed your latest patch.
Thanks Amit for pushing the patch. I have re-verified and found that
changes need to be done in few more places. The main changes are made
in the header file and plpython source files. The attached patch
handles the same. I have verified make check and make check-world
including --with-python & --with-perl in the following:
CentOS Linux release 7.7.1908
Red Hat Enterprise Linux Server release 7.1I have verified including --llvm in CentOS Linux release 7.7.1908.
Thanks for finding the remaining places, the patch looks good to me.
I hope this covers the entire code. BTW, are you using some script to
find this or is this a result of manual inspection of code? I have
modified the commit message in the attached patch. I will commit this
early next week unless someone else wants to review it.
I have used script to verify if the inclusions are sorted. There are
few files which I did not modify intentionally, they are mainly like
the below type as in uuid-ossp.c:
#include "postgres.h"
#include "fmgr.h"
#include "port/pg_bswap.h"
#include "utils/builtins.h"
#include "utils/uuid.h"
/*
* It's possible that there's more than one uuid.h header file present.
* We expect configure to set the HAVE_ symbol for only the one we want.
*
* BSD includes a uuid_hash() function that conflicts with the one in
* builtins.h; we #define it out of the way.
*/
#define uuid_hash bsd_uuid_hash
#if defined(HAVE_UUID_H)
#include <uuid.h>
#elif defined(HAVE_OSSP_UUID_H)
#include <ossp/uuid.h>
#elif defined(HAVE_UUID_UUID_H)
#include <uuid/uuid.h>
After the inclusion they have define and further include based on #if
defined. In few cases I had seen the include happens at the end of the
file like in regcomp.c as there may be impact. I felt it is better not
to change these files. Let me know your thoughts on the same.
Regards,
Vignesh
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
vignesh C <vignesh21@gmail.com> writes:
After the inclusion they have define and further include based on #if
defined. In few cases I had seen the include happens at the end of the
file like in regcomp.c as there may be impact. I felt it is better not
to change these files. Let me know your thoughts on the same.
I think the point of this patch series is just to make cosmetic
adjustments in places where people have randomly failed to maintain
alphabetic order of a consecutive group of #include's. Messing with
examples like the above is way out of scope, if you ask me --- it
entails more analysis, and more risk of breakage, than a purely
cosmetic goal is worth.
regards, tom lane
Re: Ordering of header file inclusion
On Fri, Nov 22, 2019 at 8:07 PM Tom Lane <tgl@sss.pgh.pa.us> wrote:
vignesh C <vignesh21@gmail.com> writes:
After the inclusion they have define and further include based on #if
defined. In few cases I had seen the include happens at the end of the
file like in regcomp.c as there may be impact. I felt it is better not
to change these files. Let me know your thoughts on the same.I think the point of this patch series is just to make cosmetic
adjustments in places where people have randomly failed to maintain
alphabetic order of a consecutive group of #include's. Messing with
examples like the above is way out of scope, if you ask me --- it
entails more analysis, and more risk of breakage, than a purely
cosmetic goal is worth.
+1. I agree with what Tom said, so let's leave such things as it is.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com
Re: Ordering of header file inclusion
On Thu, Nov 21, 2019 at 2:10 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
Thanks for finding the remaining places, the patch looks good to me.
I hope this covers the entire code. BTW, are you using some script to
find this or is this a result of manual inspection of code? I have
modified the commit message in the attached patch. I will commit this
early next week unless someone else wants to review it.
Pushed.
--
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com