Actually sort includes after cherry-pick

src/backend/columnar/columnar.c

@@ -11,16 +11,18 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "postgres.h"
+
 #include "miscadmin.h"
+
 #include "utils/guc.h"
 #include "utils/rel.h"
 
 #include "citus_version.h"
+
 #include "columnar/columnar.h"
 #include "columnar/columnar_tableam.h"
 

src/backend/columnar/columnar_compression.c

@@ -13,13 +13,14 @@
  */
 #include "postgres.h"
 
-#include "citus_version.h"
 #include "common/pg_lzcompress.h"
 #include "lib/stringinfo.h"
 
-#include "columnar/columnar_compression.h"
+#include "citus_version.h"
 #include "pg_version_constants.h"
 
+#include "columnar/columnar_compression.h"
+
 #if HAVE_CITUS_LIBLZ4
 #include <lz4.h>
 #endif

src/backend/columnar/columnar_customscan.c

@@ -10,18 +10,17 @@
  *-------------------------------------------------------------------------
  */
 
-#include "citus_version.h"
+#include <math.h>
 
 #include "postgres.h"
 
-#include <math.h>
+#include "miscadmin.h"
 
 #include "access/amapi.h"
 #include "access/skey.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_statistic.h"
 #include "commands/defrem.h"
-#include "miscadmin.h"
 #include "nodes/extensible.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
@@ -33,6 +32,8 @@
 #include "optimizer/paths.h"
 #include "optimizer/plancat.h"
 #include "optimizer/restrictinfo.h"
+
+#include "citus_version.h"
 #if PG_VERSION_NUM >= PG_VERSION_16
 #include "parser/parse_relation.h"
 #include "parser/parsetree.h"
@@ -48,6 +49,7 @@
 #include "columnar/columnar_customscan.h"
 #include "columnar/columnar_metadata.h"
 #include "columnar/columnar_tableam.h"
+
 #include "distributed/listutils.h"
 
 /*

src/backend/columnar/columnar_debug.c

@@ -11,12 +11,12 @@
 #include "postgres.h"
 
 #include "funcapi.h"
+#include "miscadmin.h"
+
 #include "access/nbtree.h"
 #include "access/table.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_type.h"
-#include "pg_version_constants.h"
-#include "miscadmin.h"
 #include "storage/fd.h"
 #include "storage/smgr.h"
 #include "utils/guc.h"
@@ -25,6 +25,8 @@
 #include "utils/tuplestore.h"
 
 #include "pg_version_compat.h"
+#include "pg_version_constants.h"
+
 #include "columnar/columnar.h"
 #include "columnar/columnar_storage.h"
 #include "columnar/columnar_version_compat.h"

src/backend/columnar/columnar_metadata.c

@@ -19,46 +19,50 @@
  */
 
 
+#include <sys/stat.h>
+
 #include "postgres.h"
 
+#include "miscadmin.h"
 #include "safe_lib.h"
 
-#include "citus_version.h"
-#include "columnar/columnar.h"
-#include "columnar/columnar_storage.h"
-#include "columnar/columnar_version_compat.h"
-#include "distributed/listutils.h"
-
-#include <sys/stat.h>
 #include "access/heapam.h"
 #include "access/htup_details.h"
 #include "access/nbtree.h"
 #include "access/xact.h"
 #include "catalog/indexing.h"
-#include "catalog/pg_namespace.h"
-#include "catalog/pg_collation.h"
-#include "catalog/pg_type.h"
 #include "catalog/namespace.h"
+#include "catalog/pg_collation.h"
+#include "catalog/pg_namespace.h"
+#include "catalog/pg_type.h"
 #include "commands/defrem.h"
 #include "commands/sequence.h"
 #include "commands/trigger.h"
 #include "executor/executor.h"
 #include "executor/spi.h"
-#include "miscadmin.h"
-#include "nodes/execnodes.h"
 #include "lib/stringinfo.h"
+#include "nodes/execnodes.h"
+
+#include "citus_version.h"
+
+#include "columnar/columnar.h"
+#include "columnar/columnar_storage.h"
+#include "columnar/columnar_version_compat.h"
+
+#include "distributed/listutils.h"
 #if PG_VERSION_NUM >= PG_VERSION_16
 #include "parser/parse_relation.h"
 #endif
 #include "port.h"
+
 #include "storage/fd.h"
 #include "storage/lmgr.h"
 #include "storage/procarray.h"
 #include "storage/smgr.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
-#include "utils/memutils.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/rel.h"
 #if PG_VERSION_NUM >= PG_VERSION_16
 #include "storage/relfilelocator.h"

src/backend/columnar/columnar_reader.c

@@ -22,16 +22,15 @@
 #include "access/xact.h"
 #include "catalog/pg_am.h"
 #include "commands/defrem.h"
-#include "distributed/listutils.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
-#include "optimizer/optimizer.h"
 #include "optimizer/clauses.h"
+#include "optimizer/optimizer.h"
 #include "optimizer/restrictinfo.h"
 #include "storage/fd.h"
 #include "utils/guc.h"
-#include "utils/memutils.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/rel.h"
 
 #include "columnar/columnar.h"
@@ -39,6 +38,8 @@
 #include "columnar/columnar_tableam.h"
 #include "columnar/columnar_version_compat.h"
 
+#include "distributed/listutils.h"
+
 #define UNEXPECTED_STRIPE_READ_ERR_MSG \
 	"attempted to read an unexpected stripe while reading columnar " \
 	"table %s, stripe with id=" UINT64_FORMAT " is not flushed"

src/backend/columnar/columnar_storage.c

@@ -36,11 +36,11 @@
 
 #include "postgres.h"
 
+#include "miscadmin.h"
 #include "safe_lib.h"
 
 #include "access/generic_xlog.h"
 #include "catalog/storage.h"
-#include "miscadmin.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
 

src/backend/columnar/columnar_tableam.c

@@ -1,42 +1,38 @@
-#include "citus_version.h"
+#include <math.h>
 
 #include "postgres.h"
 
-#include <math.h>
-
 #include "miscadmin.h"
+#include "pgstat.h"
+#include "safe_lib.h"
 
+#include "access/detoast.h"
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/multixact.h"
 #include "access/rewriteheap.h"
 #include "access/tableam.h"
 #include "access/tsmapi.h"
-#include "access/detoast.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/index.h"
 #include "catalog/namespace.h"
 #include "catalog/objectaccess.h"
 #include "catalog/pg_am.h"
+#include "catalog/pg_extension.h"
 #include "catalog/pg_publication.h"
 #include "catalog/pg_trigger.h"
-#include "catalog/pg_extension.h"
 #include "catalog/storage.h"
 #include "catalog/storage_xlog.h"
 #include "commands/defrem.h"
+#include "commands/extension.h"
 #include "commands/progress.h"
 #include "commands/vacuum.h"
-#include "commands/extension.h"
 #include "executor/executor.h"
 #include "nodes/makefuncs.h"
 #include "optimizer/plancat.h"
-#include "pg_version_compat.h"
-#include "pgstat.h"
-#include "safe_lib.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"
@@ -44,17 +40,22 @@
 #include "tcop/utility.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
+#include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/pg_rusage.h"
 #include "utils/rel.h"
 #include "utils/relcache.h"
-#include "utils/lsyscache.h"
 #include "utils/syscache.h"
+
+#include "citus_version.h"
+#include "pg_version_compat.h"
+
 #include "columnar/columnar.h"
 #include "columnar/columnar_customscan.h"
 #include "columnar/columnar_storage.h"
 #include "columnar/columnar_tableam.h"
 #include "columnar/columnar_version_compat.h"
+
 #include "distributed/listutils.h"
 
 /*

src/backend/columnar/columnar_writer.c

@@ -16,18 +16,19 @@
 
 #include "postgres.h"
 
+#include "miscadmin.h"
 #include "safe_lib.h"
 
 #include "access/heapam.h"
 #include "access/nbtree.h"
 #include "catalog/pg_am.h"
-#include "miscadmin.h"
-#include "pg_version_compat.h"
 #include "storage/fd.h"
 #include "storage/smgr.h"
 #include "utils/guc.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
+
+#include "pg_version_compat.h"
 #if PG_VERSION_NUM >= PG_VERSION_16
 #include "storage/relfilelocator.h"
 #include "utils/relfilenumbermap.h"

src/backend/columnar/write_state_management.c

@@ -1,21 +1,17 @@
 
-#include "citus_version.h"
-
-#include "postgres.h"
-#include "columnar/columnar.h"
-
-
 #include <math.h>
 
+#include "postgres.h"
+
 #include "miscadmin.h"
+#include "pgstat.h"
 
 #include "access/genam.h"
 #include "access/heapam.h"
+#include "access/heaptoast.h"
 #include "access/multixact.h"
 #include "access/rewriteheap.h"
 #include "access/tsmapi.h"
-#include "access/heaptoast.h"
-#include "common/hashfn.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/index.h"
@@ -26,14 +22,12 @@
 #include "catalog/storage_xlog.h"
 #include "commands/progress.h"
 #include "commands/vacuum.h"
+#include "common/hashfn.h"
 #include "executor/executor.h"
 #include "nodes/makefuncs.h"
 #include "optimizer/plancat.h"
-#include "pg_version_compat.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"
@@ -44,6 +38,10 @@
 #include "utils/rel.h"
 #include "utils/syscache.h"
 
+#include "citus_version.h"
+#include "pg_version_compat.h"
+
+#include "columnar/columnar.h"
 #include "columnar/columnar_customscan.h"
 #include "columnar/columnar_tableam.h"
 #include "columnar/columnar_version_compat.h"

src/backend/distributed/cdc/cdc_decoder.c

@@ -8,8 +8,9 @@
  *-------------------------------------------------------------------------
  */
 
-#include "cdc_decoder_utils.h"
 #include "postgres.h"
+
+#include "cdc_decoder_utils.h"
 #include "fmgr.h"
 
 #include "access/genam.h"

src/backend/distributed/cdc/cdc_decoder_utils.c

@@ -8,18 +8,21 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "commands/extension.h"
+
+#include "cdc_decoder_utils.h"
 #include "fmgr.h"
 #include "miscadmin.h"
+
 #include "access/genam.h"
 #include "access/heapam.h"
+#include "catalog/pg_namespace.h"
+#include "commands/extension.h"
 #include "common/hashfn.h"
 #include "common/string.h"
 #include "utils/fmgroids.h"
-#include "utils/typcache.h"
 #include "utils/lsyscache.h"
-#include "catalog/pg_namespace.h"
-#include "cdc_decoder_utils.h"
+#include "utils/typcache.h"
+
 #include "distributed/pg_dist_partition.h"
 #include "distributed/pg_dist_shard.h"
 #include "distributed/relay_utility.h"

src/backend/distributed/cdc/cdc_decoder_utils.h

@@ -12,9 +12,11 @@
 #define CITUS_CDC_DECODER_H
 
 #include "postgres.h"
-#include "fmgr.h"
-#include "replication/logical.h"
+
 #include "c.h"
+#include "fmgr.h"
+
+#include "replication/logical.h"
 
 #define InvalidRepOriginId 0
 #define INVALID_SHARD_ID 0

src/backend/distributed/clock/causal_clock.c

@@ -11,36 +11,37 @@
 #include <sys/time.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
+
 #include "fmgr.h"
 #include "funcapi.h"
 #include "libpq-fe.h"
+#include "miscadmin.h"
 
-#include "utils/builtins.h"
-#include "utils/datum.h"
-#include "utils/numeric.h"
-#include "utils/typcache.h"
-#include "nodes/pg_list.h"
 #include "catalog/namespace.h"
 #include "commands/extension.h"
 #include "commands/sequence.h"
 #include "executor/spi.h"
+#include "nodes/pg_list.h"
 #include "postmaster/postmaster.h"
 #include "storage/ipc.h"
 #include "storage/lwlock.h"
+#include "storage/s_lock.h"
 #include "storage/shmem.h"
 #include "storage/spin.h"
-#include "storage/s_lock.h"
+#include "utils/builtins.h"
+#include "utils/datum.h"
+#include "utils/numeric.h"
+#include "utils/typcache.h"
 
 #include "distributed/causal_clock.h"
-#include "distributed/listutils.h"
-#include "distributed/lock_graph.h"
-#include "distributed/local_executor.h"
-#include "distributed/metadata_cache.h"
-#include "distributed/remote_commands.h"
-#include "distributed/placement_connection.h"
-#include "distributed/coordinator_protocol.h"
 #include "distributed/citus_safe_lib.h"
+#include "distributed/coordinator_protocol.h"
+#include "distributed/listutils.h"
+#include "distributed/local_executor.h"
+#include "distributed/lock_graph.h"
+#include "distributed/metadata_cache.h"
+#include "distributed/placement_connection.h"
+#include "distributed/remote_commands.h"
 
 #define SAVE_AND_PERSIST(c) \
 	do { \

src/backend/distributed/commands/alter_table.c

@@ -34,9 +34,16 @@
 #include "catalog/pg_am.h"
 #include "catalog/pg_depend.h"
 #include "catalog/pg_rewrite_d.h"
+#include "commands/defrem.h"
+#include "executor/spi.h"
+#include "nodes/pg_list.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
+
 #include "columnar/columnar.h"
 #include "columnar/columnar_tableam.h"
-#include "commands/defrem.h"
+
 #include "distributed/colocation_utils.h"
 #include "distributed/commands.h"
 #include "distributed/commands/utility_hook.h"
@@ -57,16 +64,11 @@
 #include "distributed/reference_table_utils.h"
 #include "distributed/relation_access_tracking.h"
 #include "distributed/replication_origin_session_utils.h"
-#include "distributed/shared_library_init.h"
 #include "distributed/shard_utils.h"
+#include "distributed/shared_library_init.h"
 #include "distributed/tenant_schema_metadata.h"
 #include "distributed/worker_protocol.h"
 #include "distributed/worker_transaction.h"
-#include "executor/spi.h"
-#include "nodes/pg_list.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
-#include "utils/syscache.h"
 
 
 /* Table Conversion Types */

src/backend/distributed/commands/begin.c

@@ -9,12 +9,14 @@
  */
 
 #include "postgres.h"
+
 #include "c.h"
 
+#include "nodes/parsenodes.h"
+
 #include "distributed/commands.h"
 #include "distributed/listutils.h"
 #include "distributed/transaction_management.h"
-#include "nodes/parsenodes.h"
 
 
 /*

src/backend/distributed/commands/call.c

@@ -11,12 +11,23 @@
  */
 
 #include "postgres.h"
-#include "funcapi.h"
 
-#include "pg_version_constants.h"
+#include "funcapi.h"
+#include "miscadmin.h"
 
 #include "catalog/pg_proc.h"
 #include "commands/defrem.h"
+#include "nodes/nodeFuncs.h"
+#include "nodes/parsenodes.h"
+#include "nodes/primnodes.h"
+#include "optimizer/clauses.h"
+#include "tcop/dest.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
+
+#include "pg_version_constants.h"
+
+#include "distributed/adaptive_executor.h"
 #include "distributed/backend_data.h"
 #include "distributed/citus_ruleutils.h"
 #include "distributed/colocation_utils.h"
@@ -26,27 +37,17 @@
 #include "distributed/connection_management.h"
 #include "distributed/deparse_shard_query.h"
 #include "distributed/function_call_delegation.h"
-#include "distributed/metadata_utility.h"
 #include "distributed/metadata_cache.h"
+#include "distributed/metadata_utility.h"
 #include "distributed/multi_executor.h"
 #include "distributed/multi_physical_planner.h"
-#include "distributed/adaptive_executor.h"
 #include "distributed/reference_table_utils.h"
 #include "distributed/remote_commands.h"
-#include "distributed/reference_table_utils.h"
 #include "distributed/shard_pruning.h"
 #include "distributed/tuple_destination.h"
 #include "distributed/version_compat.h"
-#include "distributed/worker_manager.h"
 #include "distributed/worker_log_messages.h"
-#include "optimizer/clauses.h"
-#include "nodes/nodeFuncs.h"
-#include "nodes/parsenodes.h"
-#include "nodes/primnodes.h"
-#include "miscadmin.h"
-#include "tcop/dest.h"
-#include "utils/lsyscache.h"
-#include "utils/syscache.h"
+#include "distributed/worker_manager.h"
 
 
 /* global variable tracking whether we are in a delegated procedure call */

src/backend/distributed/commands/cascade_table_operation_for_connected_relations.c

@@ -12,12 +12,19 @@
 
 #include "postgres.h"
 
-#include "pg_version_constants.h"
+#include "miscadmin.h"
 
 #include "access/xact.h"
 #include "catalog/pg_constraint.h"
-#include "distributed/commands/utility_hook.h"
+#include "executor/spi.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
+
+#include "pg_version_constants.h"
+
 #include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
 #include "distributed/foreign_key_relationship.h"
 #include "distributed/listutils.h"
 #include "distributed/local_executor.h"
@@ -26,11 +33,6 @@
 #include "distributed/reference_table_utils.h"
 #include "distributed/relation_access_tracking.h"
 #include "distributed/worker_protocol.h"
-#include "executor/spi.h"
-#include "miscadmin.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
-#include "utils/syscache.h"
 
 
 static void EnsureSequentialModeForCitusTableCascadeFunction(List *relationIdList);

src/backend/distributed/commands/citus_add_local_table_to_metadata.c

@@ -18,6 +18,7 @@
  */
 
 #include "postgres.h"
+
 #include "miscadmin.h"
 
 #include "access/genam.h"
@@ -25,29 +26,30 @@
 #include "catalog/pg_constraint.h"
 #include "catalog/pg_statistic_ext.h"
 #include "catalog/pg_trigger.h"
-#include "distributed/coordinator_protocol.h"
+#include "foreign/foreign.h"
+#include "utils/builtins.h"
+#include "utils/fmgroids.h"
+#include "utils/lsyscache.h"
+#include "utils/ruleutils.h"
+#include "utils/syscache.h"
+
 #include "distributed/citus_ruleutils.h"
 #include "distributed/colocation_utils.h"
 #include "distributed/commands.h"
 #include "distributed/commands/sequence.h"
 #include "distributed/commands/utility_hook.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/metadata/dependency.h"
+#include "distributed/coordinator_protocol.h"
 #include "distributed/foreign_key_relationship.h"
 #include "distributed/listutils.h"
 #include "distributed/local_executor.h"
+#include "distributed/metadata/dependency.h"
+#include "distributed/metadata/distobject.h"
 #include "distributed/metadata_sync.h"
 #include "distributed/multi_partitioning_utils.h"
 #include "distributed/namespace_utils.h"
 #include "distributed/reference_table_utils.h"
 #include "distributed/worker_protocol.h"
 #include "distributed/worker_shard_visibility.h"
-#include "utils/builtins.h"
-#include "utils/fmgroids.h"
-#include "utils/lsyscache.h"
-#include "utils/ruleutils.h"
-#include "utils/syscache.h"
-#include "foreign/foreign.h"
 
 
 /*

src/backend/distributed/commands/citus_global_signal.c

@@ -11,14 +11,16 @@
 
 #include "postgres.h"
 
+#include "signal.h"
+
+#include "lib/stringinfo.h"
+
 #include "pg_version_constants.h"
 
 #include "distributed/backend_data.h"
 #include "distributed/metadata_cache.h"
 #include "distributed/remote_commands.h"
 #include "distributed/worker_manager.h"
-#include "lib/stringinfo.h"
-#include "signal.h"
 
 static bool CitusSignalBackend(uint64 globalPID, uint64 timeout, int sig);
 

src/backend/distributed/commands/cluster.c

@@ -10,11 +10,11 @@
 
 #include "postgres.h"
 
-#include "pg_version_constants.h"
-
+#include "catalog/namespace.h"
 #include "commands/defrem.h"
 
-#include "catalog/namespace.h"
+#include "pg_version_constants.h"
+
 #include "distributed/commands.h"
 #include "distributed/commands/utility_hook.h"
 #include "distributed/listutils.h"

src/backend/distributed/commands/collation.c

@@ -10,30 +10,32 @@
  */
 #include "postgres.h"
 
-#include "pg_version_compat.h"
+#include "miscadmin.h"
 
 #include "access/htup_details.h"
 #include "access/xact.h"
 #include "catalog/pg_collation.h"
-#include "distributed/citus_safe_lib.h"
-#include "distributed/commands/utility_hook.h"
-#include "distributed/commands.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
-#include "distributed/metadata_utility.h"
-#include "distributed/metadata/dependency.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/metadata_sync.h"
-#include "distributed/multi_executor.h"
-#include "distributed/relation_access_tracking.h"
-#include "distributed/worker_create_or_replace.h"
-#include "pg_version_constants.h"
-#include "distributed/worker_manager.h"
 #include "parser/parse_type.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
-#include "miscadmin.h"
+
+#include "pg_version_compat.h"
+#include "pg_version_constants.h"
+
+#include "distributed/citus_safe_lib.h"
+#include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+#include "distributed/metadata/dependency.h"
+#include "distributed/metadata/distobject.h"
+#include "distributed/metadata_sync.h"
+#include "distributed/metadata_utility.h"
+#include "distributed/multi_executor.h"
+#include "distributed/relation_access_tracking.h"
+#include "distributed/worker_create_or_replace.h"
+#include "distributed/worker_manager.h"
 
 
 static char * CreateCollationDDLInternal(Oid collationId, Oid *collowner,

src/backend/distributed/commands/common.c

@@ -23,9 +23,9 @@
 #include "distributed/commands/utility_hook.h"
 #include "distributed/deparser.h"
 #include "distributed/listutils.h"
-#include "distributed/metadata_sync.h"
 #include "distributed/metadata/dependency.h"
 #include "distributed/metadata/distobject.h"
+#include "distributed/metadata_sync.h"
 #include "distributed/multi_executor.h"
 #include "distributed/worker_transaction.h"
 

src/backend/distributed/commands/create_distributed_table.c

@@ -9,10 +9,8 @@
  */
 
 #include "postgres.h"
-#include "miscadmin.h"
 
-#include "pg_version_constants.h"
-#include "distributed/commands/utility_hook.h"
+#include "miscadmin.h"
 
 #include "access/genam.h"
 #include "access/hash.h"
@@ -37,42 +35,6 @@
 #include "commands/sequence.h"
 #include "commands/tablecmds.h"
 #include "commands/trigger.h"
-#include "distributed/commands/multi_copy.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/colocation_utils.h"
-#include "distributed/commands.h"
-#include "distributed/deparser.h"
-#include "distributed/distributed_execution_locks.h"
-#include "distributed/distribution_column.h"
-#include "distributed/listutils.h"
-#include "distributed/local_executor.h"
-#include "distributed/metadata_utility.h"
-#include "distributed/coordinator_protocol.h"
-#include "distributed/metadata/dependency.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/metadata_cache.h"
-#include "distributed/metadata_sync.h"
-#include "distributed/multi_executor.h"
-#include "distributed/multi_logical_planner.h"
-#include "distributed/multi_partitioning_utils.h"
-#include "distributed/pg_dist_colocation.h"
-#include "distributed/pg_dist_partition.h"
-#include "distributed/reference_table_utils.h"
-#include "distributed/relation_access_tracking.h"
-#include "distributed/remote_commands.h"
-#include "distributed/replicate_none_dist_table_shard.h"
-#include "distributed/resource_lock.h"
-#include "distributed/shard_cleaner.h"
-#include "distributed/shard_rebalancer.h"
-#include "distributed/shard_split.h"
-#include "distributed/shard_transfer.h"
-#include "distributed/shared_library_init.h"
-#include "distributed/shard_rebalancer.h"
-#include "distributed/worker_protocol.h"
-#include "distributed/worker_shard_visibility.h"
-#include "distributed/worker_transaction.h"
-#include "distributed/utils/distribution_column_map.h"
-#include "distributed/version_compat.h"
 #include "executor/executor.h"
 #include "executor/spi.h"
 #include "nodes/execnodes.h"
@@ -88,12 +50,51 @@
 #include "tcop/pquery.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
+#include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/snapmgr.h"
 #include "utils/syscache.h"
-#include "utils/inval.h"
+
+#include "pg_version_constants.h"
+
+#include "distributed/citus_ruleutils.h"
+#include "distributed/colocation_utils.h"
+#include "distributed/commands.h"
+#include "distributed/commands/multi_copy.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/coordinator_protocol.h"
+#include "distributed/deparser.h"
+#include "distributed/distributed_execution_locks.h"
+#include "distributed/distribution_column.h"
+#include "distributed/listutils.h"
+#include "distributed/local_executor.h"
+#include "distributed/metadata/dependency.h"
+#include "distributed/metadata/distobject.h"
+#include "distributed/metadata_cache.h"
+#include "distributed/metadata_sync.h"
+#include "distributed/metadata_utility.h"
+#include "distributed/multi_executor.h"
+#include "distributed/multi_logical_planner.h"
+#include "distributed/multi_partitioning_utils.h"
+#include "distributed/pg_dist_colocation.h"
+#include "distributed/pg_dist_partition.h"
+#include "distributed/reference_table_utils.h"
+#include "distributed/relation_access_tracking.h"
+#include "distributed/remote_commands.h"
+#include "distributed/replicate_none_dist_table_shard.h"
+#include "distributed/resource_lock.h"
+#include "distributed/shard_cleaner.h"
+#include "distributed/shard_rebalancer.h"
+#include "distributed/shard_split.h"
+#include "distributed/shard_transfer.h"
+#include "distributed/shared_library_init.h"
+#include "distributed/utils/distribution_column_map.h"
+#include "distributed/version_compat.h"
+#include "distributed/worker_protocol.h"
+#include "distributed/worker_shard_visibility.h"
+#include "distributed/worker_transaction.h"
 
 
 /* common params that apply to all Citus table types */

src/backend/distributed/commands/database.c

@@ -11,12 +11,13 @@
 
 #include "postgres.h"
 
+#include "miscadmin.h"
+
 #include "access/htup_details.h"
 #include "access/xact.h"
 #include "catalog/objectaddress.h"
 #include "catalog/pg_database.h"
 #include "commands/dbcommands.h"
-#include "miscadmin.h"
 #include "nodes/parsenodes.h"
 #include "utils/syscache.h"
 

src/backend/distributed/commands/dependencies.c

@@ -10,9 +10,14 @@
 
 #include "postgres.h"
 
+#include "miscadmin.h"
+
 #include "catalog/dependency.h"
 #include "catalog/objectaddress.h"
 #include "commands/extension.h"
+#include "storage/lmgr.h"
+#include "utils/lsyscache.h"
+
 #include "distributed/commands.h"
 #include "distributed/commands/utility_hook.h"
 #include "distributed/connection_management.h"
@@ -25,9 +30,6 @@
 #include "distributed/remote_commands.h"
 #include "distributed/worker_manager.h"
 #include "distributed/worker_transaction.h"
-#include "miscadmin.h"
-#include "storage/lmgr.h"
-#include "utils/lsyscache.h"
 
 
 static void EnsureDependenciesCanBeDistributed(const ObjectAddress *relationAddress);

src/backend/distributed/commands/distribute_object_ops.c

@@ -12,11 +12,12 @@
 
 #include "postgres.h"
 
-#include "distributed/commands.h"
-#include "distributed/deparser.h"
 #include "pg_version_constants.h"
-#include "distributed/version_compat.h"
+
+#include "distributed/commands.h"
 #include "distributed/commands/utility_hook.h"
+#include "distributed/deparser.h"
+#include "distributed/version_compat.h"
 
 static DistributeObjectOps NoDistributeOps = {
 	.deparse = NULL,

src/backend/distributed/commands/drop_distributed_table.c

@@ -9,20 +9,21 @@
  */
 
 #include "postgres.h"
+
 #include "miscadmin.h"
 
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
 
 #include "distributed/colocation_utils.h"
-#include "distributed/commands/utility_hook.h"
 #include "distributed/commands.h"
-#include "distributed/metadata_utility.h"
+#include "distributed/commands/utility_hook.h"
 #include "distributed/coordinator_protocol.h"
 #include "distributed/metadata_sync.h"
+#include "distributed/metadata_utility.h"
 #include "distributed/multi_partitioning_utils.h"
 #include "distributed/tenant_schema_metadata.h"
 #include "distributed/worker_transaction.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
 
 
 /* local function forward declarations */

src/backend/distributed/commands/extension.c

@@ -12,32 +12,35 @@
 
 #include "access/genam.h"
 #include "access/xact.h"
-#include "citus_version.h"
 #include "catalog/dependency.h"
 #include "catalog/pg_depend.h"
 #include "catalog/pg_extension_d.h"
-#include "columnar/columnar.h"
 #include "catalog/pg_foreign_data_wrapper.h"
 #include "commands/defrem.h"
 #include "commands/extension.h"
+#include "foreign/foreign.h"
+#include "nodes/makefuncs.h"
+#include "utils/builtins.h"
+#include "utils/fmgroids.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
+
+#include "citus_version.h"
+
+#include "columnar/columnar.h"
+
 #include "distributed/citus_ruleutils.h"
 #include "distributed/commands.h"
 #include "distributed/commands/utility_hook.h"
+#include "distributed/coordinator_protocol.h"
 #include "distributed/deparser.h"
 #include "distributed/listutils.h"
-#include "distributed/coordinator_protocol.h"
-#include "distributed/metadata_sync.h"
 #include "distributed/metadata/dependency.h"
 #include "distributed/metadata/distobject.h"
+#include "distributed/metadata_sync.h"
 #include "distributed/multi_executor.h"
 #include "distributed/relation_access_tracking.h"
 #include "distributed/transaction_management.h"
-#include "foreign/foreign.h"
-#include "nodes/makefuncs.h"
-#include "utils/lsyscache.h"
-#include "utils/builtins.h"
-#include "utils/fmgroids.h"
-#include "utils/syscache.h"
 
 
 /* Local functions forward declarations for helper functions */

src/backend/distributed/commands/foreign_constraint.c

@@ -12,27 +12,15 @@
 
 #include "postgres.h"
 
-#include "pg_version_constants.h"
+#include "miscadmin.h"
 
+#include "access/genam.h"
 #include "access/htup_details.h"
 #include "access/sysattr.h"
 #include "access/xact.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_constraint.h"
-#include "access/genam.h"
 #include "catalog/pg_type.h"
-#include "distributed/colocation_utils.h"
-#include "distributed/commands.h"
-#include "distributed/commands/sequence.h"
-#include "distributed/coordinator_protocol.h"
-#include "distributed/listutils.h"
-#include "distributed/coordinator_protocol.h"
-#include "distributed/multi_join_order.h"
-#include "distributed/namespace_utils.h"
-#include "distributed/reference_table_utils.h"
-#include "distributed/utils/array_type.h"
-#include "distributed/version_compat.h"
-#include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/inval.h"
@@ -42,6 +30,19 @@
 #include "utils/ruleutils.h"
 #include "utils/syscache.h"
 
+#include "pg_version_constants.h"
+
+#include "distributed/colocation_utils.h"
+#include "distributed/commands.h"
+#include "distributed/commands/sequence.h"
+#include "distributed/coordinator_protocol.h"
+#include "distributed/listutils.h"
+#include "distributed/multi_join_order.h"
+#include "distributed/namespace_utils.h"
+#include "distributed/reference_table_utils.h"
+#include "distributed/utils/array_type.h"
+#include "distributed/version_compat.h"
+
 
 #define BehaviorIsRestrictOrNoAction(x) \
 	((x) == FKCONSTR_ACTION_NOACTION || (x) == FKCONSTR_ACTION_RESTRICT)

src/backend/distributed/commands/foreign_data_wrapper.c

@@ -11,17 +11,18 @@
 #include "postgres.h"
 
 #include "catalog/pg_foreign_data_wrapper.h"
-#include "distributed/commands/utility_hook.h"
-#include "distributed/commands.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
-#include "distributed/metadata_sync.h"
-#include "distributed/metadata/distobject.h"
 #include "foreign/foreign.h"
 #include "nodes/makefuncs.h"
 #include "nodes/parsenodes.h"
 #include "utils/syscache.h"
 
+#include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+#include "distributed/metadata/distobject.h"
+#include "distributed/metadata_sync.h"
+
 static bool NameListHasFDWOwnedByDistributedExtension(List *FDWNames);
 static ObjectAddress GetObjectAddressByFDWName(char *FDWName, bool missing_ok);
 

src/backend/distributed/commands/foreign_server.c

@@ -9,11 +9,18 @@
  */
 
 #include "postgres.h"
+
 #include "miscadmin.h"
 
 #include "catalog/pg_foreign_server.h"
-#include "distributed/commands/utility_hook.h"
+#include "foreign/foreign.h"
+#include "nodes/makefuncs.h"
+#include "nodes/parsenodes.h"
+#include "nodes/primnodes.h"
+#include "utils/builtins.h"
+
 #include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
 #include "distributed/deparser.h"
 #include "distributed/listutils.h"
 #include "distributed/log_utils.h"
@@ -21,11 +28,6 @@
 #include "distributed/metadata_sync.h"
 #include "distributed/multi_executor.h"
 #include "distributed/worker_transaction.h"
-#include "foreign/foreign.h"
-#include "nodes/makefuncs.h"
-#include "nodes/parsenodes.h"
-#include "nodes/primnodes.h"
-#include "utils/builtins.h"
 
 static char * GetForeignServerAlterOwnerCommand(Oid serverId);
 static Node * RecreateForeignServerStmt(Oid serverId);

src/backend/distributed/commands/function.c

@@ -18,43 +18,19 @@
  */
 
 #include "postgres.h"
-#include "miscadmin.h"
-#include "funcapi.h"
 
-#include "pg_version_constants.h"
+#include "funcapi.h"
+#include "miscadmin.h"
 
 #include "access/genam.h"
 #include "access/htup_details.h"
 #include "access/xact.h"
-#include "catalog/pg_aggregate.h"
 #include "catalog/dependency.h"
 #include "catalog/namespace.h"
+#include "catalog/pg_aggregate.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "commands/extension.h"
-#include "distributed/citus_depended_object.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/citus_safe_lib.h"
-#include "distributed/colocation_utils.h"
-#include "distributed/commands.h"
-#include "distributed/commands/utility_hook.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
-#include "distributed/maintenanced.h"
-#include "distributed/metadata_utility.h"
-#include "distributed/metadata/dependency.h"
-#include "distributed/coordinator_protocol.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/metadata/pg_dist_object.h"
-#include "distributed/metadata_sync.h"
-#include "distributed/multi_executor.h"
-#include "distributed/namespace_utils.h"
-#include "distributed/pg_dist_node.h"
-#include "distributed/reference_table_utils.h"
-#include "distributed/relation_access_tracking.h"
-#include "distributed/version_compat.h"
-#include "distributed/worker_create_or_replace.h"
-#include "distributed/worker_transaction.h"
 #include "nodes/makefuncs.h"
 #include "parser/parse_coerce.h"
 #include "parser/parse_type.h"
@@ -63,8 +39,34 @@
 #include "utils/fmgroids.h"
 #include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
-#include "utils/syscache.h"
 #include "utils/regproc.h"
+#include "utils/syscache.h"
+
+#include "pg_version_constants.h"
+
+#include "distributed/citus_depended_object.h"
+#include "distributed/citus_ruleutils.h"
+#include "distributed/citus_safe_lib.h"
+#include "distributed/colocation_utils.h"
+#include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/coordinator_protocol.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+#include "distributed/maintenanced.h"
+#include "distributed/metadata/dependency.h"
+#include "distributed/metadata/distobject.h"
+#include "distributed/metadata/pg_dist_object.h"
+#include "distributed/metadata_sync.h"
+#include "distributed/metadata_utility.h"
+#include "distributed/multi_executor.h"
+#include "distributed/namespace_utils.h"
+#include "distributed/pg_dist_node.h"
+#include "distributed/reference_table_utils.h"
+#include "distributed/relation_access_tracking.h"
+#include "distributed/version_compat.h"
+#include "distributed/worker_create_or_replace.h"
+#include "distributed/worker_transaction.h"
 
 #define DISABLE_LOCAL_CHECK_FUNCTION_BODIES "SET LOCAL check_function_bodies TO off;"
 #define RESET_CHECK_FUNCTION_BODIES "RESET check_function_bodies;"

src/backend/distributed/commands/grant.c

@@ -10,15 +10,16 @@
 
 #include "postgres.h"
 
+#include "lib/stringinfo.h"
+#include "nodes/parsenodes.h"
+#include "utils/lsyscache.h"
+
 #include "distributed/citus_ruleutils.h"
 #include "distributed/commands.h"
 #include "distributed/commands/utility_hook.h"
 #include "distributed/metadata/distobject.h"
 #include "distributed/metadata_cache.h"
 #include "distributed/version_compat.h"
-#include "lib/stringinfo.h"
-#include "nodes/parsenodes.h"
-#include "utils/lsyscache.h"
 
 
 /* Local functions forward declarations for helper functions */

src/backend/distributed/commands/index.c

@@ -10,7 +10,6 @@
 
 #include "postgres.h"
 
-#include "pg_version_constants.h"
 #include "access/genam.h"
 #include "access/htup_details.h"
 #include "access/xact.h"
@@ -18,32 +17,16 @@
 #include "catalog/index.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_class.h"
+
+#include "pg_version_constants.h"
 #if PG_VERSION_NUM >= PG_VERSION_16
 #include "catalog/pg_namespace.h"
 #endif
+#include "miscadmin.h"
+
 #include "commands/defrem.h"
 #include "commands/tablecmds.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/commands.h"
-#include "distributed/commands/utility_hook.h"
-#include "distributed/deparse_shard_query.h"
-#include "distributed/deparser.h"
-#include "distributed/distributed_planner.h"
-#include "distributed/listutils.h"
-#include "distributed/local_executor.h"
-#include "distributed/coordinator_protocol.h"
-#include "distributed/metadata_cache.h"
-#include "distributed/multi_executor.h"
-#include "distributed/multi_physical_planner.h"
-#include "distributed/multi_partitioning_utils.h"
-#include "distributed/namespace_utils.h"
-#include "distributed/resource_lock.h"
-#include "distributed/relation_access_tracking.h"
-#include "distributed/relation_utils.h"
-#include "distributed/version_compat.h"
-#include "distributed/worker_manager.h"
 #include "lib/stringinfo.h"
-#include "miscadmin.h"
 #include "nodes/parsenodes.h"
 #include "parser/parse_utilcmd.h"
 #include "storage/lmgr.h"
@@ -53,6 +36,26 @@
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
+#include "distributed/citus_ruleutils.h"
+#include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/coordinator_protocol.h"
+#include "distributed/deparse_shard_query.h"
+#include "distributed/deparser.h"
+#include "distributed/distributed_planner.h"
+#include "distributed/listutils.h"
+#include "distributed/local_executor.h"
+#include "distributed/metadata_cache.h"
+#include "distributed/multi_executor.h"
+#include "distributed/multi_partitioning_utils.h"
+#include "distributed/multi_physical_planner.h"
+#include "distributed/namespace_utils.h"
+#include "distributed/relation_access_tracking.h"
+#include "distributed/relation_utils.h"
+#include "distributed/resource_lock.h"
+#include "distributed/version_compat.h"
+#include "distributed/worker_manager.h"
+
 
 /* Local functions forward declarations for helper functions */
 static void ErrorIfCreateIndexHasTooManyColumns(IndexStmt *createIndexStatement);

src/backend/distributed/commands/local_multi_copy.c

@@ -19,24 +19,27 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-#include "commands/copy.h"
-#include "catalog/namespace.h"
-#include "parser/parse_relation.h"
-#include "utils/lsyscache.h"
-#include "nodes/makefuncs.h"
-#include "safe_lib.h"
 #include <netinet/in.h> /* for htons */
 
-#include "distributed/transmit.h"
+#include "postgres.h"
+
+#include "safe_lib.h"
+
+#include "catalog/namespace.h"
+#include "commands/copy.h"
+#include "nodes/makefuncs.h"
+#include "parser/parse_relation.h"
+#include "utils/lsyscache.h"
+
 #include "distributed/commands/multi_copy.h"
 #include "distributed/intermediate_results.h"
-#include "distributed/multi_partitioning_utils.h"
 #include "distributed/local_executor.h"
 #include "distributed/local_multi_copy.h"
-#include "distributed/shard_utils.h"
-#include "distributed/version_compat.h"
+#include "distributed/multi_partitioning_utils.h"
 #include "distributed/replication_origin_session_utils.h"
+#include "distributed/shard_utils.h"
+#include "distributed/transmit.h"
+#include "distributed/version_compat.h"
 
 /* managed via GUC, default is 512 kB */
 int LocalCopyFlushThresholdByte = 512 * 1024;

src/backend/distributed/commands/multi_copy.c

@@ -43,19 +43,18 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-#include "libpq-fe.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-
 #include <arpa/inet.h> /* for htons */
 #include <netinet/in.h> /* for htons */
 #include <string.h>
 
-#include "pg_version_constants.h"
+#include "postgres.h"
+
+#include "libpq-fe.h"
+#include "miscadmin.h"
+#include "pgstat.h"
 
-#include "access/htup_details.h"
 #include "access/htup.h"
+#include "access/htup_details.h"
 #include "access/sdir.h"
 #include "access/sysattr.h"
 #include "access/xact.h"
@@ -65,41 +64,30 @@
 #include "commands/copy.h"
 #include "commands/defrem.h"
 #include "commands/progress.h"
+
+#include "pg_version_constants.h"
+
 #include "distributed/citus_safe_lib.h"
 #include "distributed/commands/multi_copy.h"
 #include "distributed/commands/utility_hook.h"
+#include "distributed/coordinator_protocol.h"
 #include "distributed/intermediate_results.h"
 #include "distributed/listutils.h"
 #include "distributed/local_executor.h"
+#include "distributed/locally_reserved_shared_connections.h"
 #include "distributed/log_utils.h"
-#include "distributed/coordinator_protocol.h"
 #include "distributed/metadata_cache.h"
 #include "distributed/multi_executor.h"
 #include "distributed/multi_partitioning_utils.h"
 #include "distributed/multi_physical_planner.h"
 #include "distributed/multi_router_planner.h"
-#include "distributed/multi_executor.h"
-#include "distributed/listutils.h"
-#include "distributed/locally_reserved_shared_connections.h"
 #include "distributed/placement_connection.h"
 #include "distributed/relation_access_tracking.h"
 #if PG_VERSION_NUM >= PG_VERSION_16
 #include "distributed/relation_utils.h"
 #endif
-#include "distributed/remote_commands.h"
-#include "distributed/remote_transaction.h"
-#include "distributed/replication_origin_session_utils.h"
-#include "distributed/resource_lock.h"
-#include "distributed/shard_pruning.h"
-#include "distributed/shared_connection_stats.h"
-#include "distributed/version_compat.h"
-#include "distributed/worker_protocol.h"
-#include "distributed/local_multi_copy.h"
-#include "distributed/hash_helpers.h"
-#include "distributed/transmit.h"
 #include "executor/executor.h"
 #include "foreign/foreign.h"
-
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "nodes/makefuncs.h"
@@ -110,9 +98,21 @@
 #include "tsearch/ts_locale.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/syscache.h"
-#include "utils/memutils.h"
+
+#include "distributed/hash_helpers.h"
+#include "distributed/local_multi_copy.h"
+#include "distributed/remote_commands.h"
+#include "distributed/remote_transaction.h"
+#include "distributed/replication_origin_session_utils.h"
+#include "distributed/resource_lock.h"
+#include "distributed/shard_pruning.h"
+#include "distributed/shared_connection_stats.h"
+#include "distributed/transmit.h"
+#include "distributed/version_compat.h"
+#include "distributed/worker_protocol.h"
 
 
 /* constant used in binary protocol */

src/backend/distributed/commands/owned.c

@@ -10,33 +10,20 @@
 
 #include "postgres.h"
 
+#include "miscadmin.h"
+
+#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
-#include "access/genam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
+#include "catalog/objectaddress.h"
 #include "catalog/pg_auth_members.h"
 #include "catalog/pg_authid.h"
 #include "catalog/pg_db_role_setting.h"
 #include "catalog/pg_type.h"
-#include "catalog/objectaddress.h"
 #include "commands/dbcommands.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/citus_safe_lib.h"
-#include "distributed/commands.h"
-#include "distributed/commands/utility_hook.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
-#include "distributed/coordinator_protocol.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/metadata_sync.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/multi_executor.h"
-#include "distributed/relation_access_tracking.h"
-#include "distributed/version_compat.h"
-#include "distributed/worker_transaction.h"
-#include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "nodes/parsenodes.h"
 #include "nodes/pg_list.h"
@@ -44,8 +31,22 @@
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/rel.h"
-#include "utils/varlena.h"
 #include "utils/syscache.h"
+#include "utils/varlena.h"
+
+#include "distributed/citus_ruleutils.h"
+#include "distributed/citus_safe_lib.h"
+#include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/coordinator_protocol.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+#include "distributed/metadata/distobject.h"
+#include "distributed/metadata_sync.h"
+#include "distributed/multi_executor.h"
+#include "distributed/relation_access_tracking.h"
+#include "distributed/version_compat.h"
+#include "distributed/worker_transaction.h"
 
 /*
  * PreprocessDropOwnedStmt finds the distributed role out of the ones

src/backend/distributed/commands/policy.c

@@ -10,15 +10,10 @@
  */
 #include "postgres.h"
 
+#include "miscadmin.h"
+
 #include "catalog/namespace.h"
 #include "commands/policy.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/commands.h"
-#include "distributed/commands/utility_hook.h"
-#include "distributed/coordinator_protocol.h"
-#include "distributed/listutils.h"
-#include "distributed/metadata_cache.h"
-#include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "parser/parse_clause.h"
 #include "parser/parse_relation.h"
@@ -27,6 +22,13 @@
 #include "utils/builtins.h"
 #include "utils/ruleutils.h"
 
+#include "distributed/citus_ruleutils.h"
+#include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/coordinator_protocol.h"
+#include "distributed/listutils.h"
+#include "distributed/metadata_cache.h"
+
 
 static const char * unparse_policy_command(const char aclchar);
 static RowSecurityPolicy * GetPolicyByName(Oid relationId, const char *policyName);

src/backend/distributed/commands/publication.c

@@ -9,18 +9,11 @@
  */
 
 #include "postgres.h"
+
 #include "miscadmin.h"
 
 #include "catalog/pg_publication.h"
 #include "catalog/pg_publication_rel.h"
-#include "distributed/commands.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
-#include "distributed/metadata_utility.h"
-#include "distributed/metadata_sync.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/reference_table_utils.h"
-#include "distributed/worker_create_or_replace.h"
 #include "nodes/makefuncs.h"
 #include "nodes/parsenodes.h"
 #include "utils/builtins.h"
@@ -29,6 +22,15 @@
 
 #include "pg_version_compat.h"
 
+#include "distributed/commands.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+#include "distributed/metadata/distobject.h"
+#include "distributed/metadata_sync.h"
+#include "distributed/metadata_utility.h"
+#include "distributed/reference_table_utils.h"
+#include "distributed/worker_create_or_replace.h"
+
 
 static CreatePublicationStmt * BuildCreatePublicationStmt(Oid publicationId);
 #if (PG_VERSION_NUM >= PG_VERSION_15)

src/backend/distributed/commands/rename.c

@@ -12,11 +12,12 @@
 
 #include "catalog/index.h"
 #include "catalog/namespace.h"
+#include "nodes/parsenodes.h"
+#include "utils/lsyscache.h"
+
 #include "distributed/commands.h"
 #include "distributed/commands/utility_hook.h"
 #include "distributed/metadata_cache.h"
-#include "nodes/parsenodes.h"
-#include "utils/lsyscache.h"
 
 
 /*

src/backend/distributed/commands/role.c

@@ -10,37 +10,20 @@
 
 #include "postgres.h"
 
-#include "pg_version_compat.h"
-
-#include "pg_version_constants.h"
+#include "miscadmin.h"
 
+#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
-#include "access/genam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
+#include "catalog/objectaddress.h"
 #include "catalog/pg_auth_members.h"
 #include "catalog/pg_authid.h"
 #include "catalog/pg_db_role_setting.h"
 #include "catalog/pg_type.h"
-#include "catalog/objectaddress.h"
 #include "commands/dbcommands.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/citus_safe_lib.h"
-#include "distributed/commands.h"
-#include "distributed/commands/utility_hook.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
-#include "distributed/coordinator_protocol.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/metadata_sync.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/multi_executor.h"
-#include "distributed/relation_access_tracking.h"
-#include "distributed/version_compat.h"
-#include "distributed/worker_transaction.h"
-#include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "nodes/parsenodes.h"
 #include "nodes/pg_list.h"
@@ -48,11 +31,28 @@
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
-#include "utils/guc_tables.h"
 #include "utils/guc.h"
+#include "utils/guc_tables.h"
 #include "utils/rel.h"
-#include "utils/varlena.h"
 #include "utils/syscache.h"
+#include "utils/varlena.h"
+
+#include "pg_version_compat.h"
+#include "pg_version_constants.h"
+
+#include "distributed/citus_ruleutils.h"
+#include "distributed/citus_safe_lib.h"
+#include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/coordinator_protocol.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+#include "distributed/metadata/distobject.h"
+#include "distributed/metadata_sync.h"
+#include "distributed/multi_executor.h"
+#include "distributed/relation_access_tracking.h"
+#include "distributed/version_compat.h"
+#include "distributed/worker_transaction.h"
 
 static const char * ExtractEncryptedPassword(Oid roleOid);
 static const char * CreateAlterRoleIfExistsCommand(AlterRoleStmt *stmt);

src/backend/distributed/commands/schema.c

@@ -19,28 +19,28 @@
 #include "catalog/namespace.h"
 #include "catalog/pg_class.h"
 #include "catalog/pg_namespace.h"
-#include "distributed/colocation_utils.h"
-#include "distributed/commands.h"
-#include <distributed/connection_management.h>
-#include "distributed/commands/utility_hook.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/metadata_cache.h"
-#include <distributed/metadata_sync.h>
-#include "distributed/multi_executor.h"
-#include "distributed/reference_table_utils.h"
-#include "distributed/relation_access_tracking.h"
-#include "distributed/resource_lock.h"
-#include <distributed/remote_commands.h>
-#include <distributed/remote_commands.h>
-#include "distributed/tenant_schema_metadata.h"
-#include "distributed/version_compat.h"
 #include "nodes/parsenodes.h"
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/relcache.h"
 
+#include "distributed/colocation_utils.h"
+#include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/connection_management.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+#include "distributed/metadata/distobject.h"
+#include "distributed/metadata_cache.h"
+#include "distributed/metadata_sync.h"
+#include "distributed/multi_executor.h"
+#include "distributed/reference_table_utils.h"
+#include "distributed/relation_access_tracking.h"
+#include "distributed/remote_commands.h"
+#include "distributed/resource_lock.h"
+#include "distributed/tenant_schema_metadata.h"
+#include "distributed/version_compat.h"
+
 
 static List * GetObjectAddressBySchemaName(char *schemaName, bool missing_ok);
 static List * FilterDistributedSchemas(List *schemas);

src/backend/distributed/commands/schema_based_sharding.c

@@ -7,27 +7,29 @@
  */
 
 #include "postgres.h"
+
 #include "miscadmin.h"
 
 #include "access/genam.h"
 #include "catalog/catalog.h"
 #include "catalog/pg_namespace_d.h"
 #include "commands/extension.h"
+#include "utils/builtins.h"
+#include "utils/fmgroids.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
+
 #include "distributed/argutils.h"
 #include "distributed/backend_data.h"
 #include "distributed/colocation_utils.h"
 #include "distributed/commands.h"
 #include "distributed/listutils.h"
-#include "distributed/metadata_sync.h"
 #include "distributed/metadata/distobject.h"
+#include "distributed/metadata_sync.h"
 #include "distributed/multi_partitioning_utils.h"
 #include "distributed/shard_transfer.h"
 #include "distributed/tenant_schema_metadata.h"
 #include "distributed/worker_shard_visibility.h"
-#include "utils/builtins.h"
-#include "utils/fmgroids.h"
-#include "utils/lsyscache.h"
-#include "utils/syscache.h"
 
 
 /* return value of CreateCitusMoveSchemaParams() */

src/backend/distributed/commands/sequence.c

@@ -16,6 +16,12 @@
 #include "catalog/namespace.h"
 #include "commands/defrem.h"
 #include "commands/extension.h"
+#include "nodes/makefuncs.h"
+#include "nodes/parsenodes.h"
+#include "rewrite/rewriteHandler.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+
 #include "distributed/commands.h"
 #include "distributed/commands/sequence.h"
 #include "distributed/commands/utility_hook.h"
@@ -24,12 +30,7 @@
 #include "distributed/metadata/distobject.h"
 #include "distributed/metadata_cache.h"
 #include "distributed/metadata_sync.h"
-#include "nodes/makefuncs.h"
 #include "distributed/worker_create_or_replace.h"
-#include "nodes/parsenodes.h"
-#include "rewrite/rewriteHandler.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
 
 /* Local functions forward declarations for helper functions */
 static bool OptionsSpecifyOwnedBy(List *optionList, Oid *ownedByTableId);

src/backend/distributed/commands/statistics.c

@@ -19,6 +19,8 @@
 
 #include "postgres.h"
 
+#include "miscadmin.h"
+
 #include "access/genam.h"
 #include "access/htup_details.h"
 #include "access/xact.h"
@@ -26,8 +28,16 @@
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_statistic_ext.h"
 #include "catalog/pg_type.h"
-#include "distributed/commands/utility_hook.h"
+#include "utils/builtins.h"
+#include "utils/fmgroids.h"
+#include "utils/fmgrprotos.h"
+#include "utils/lsyscache.h"
+#include "utils/relcache.h"
+#include "utils/ruleutils.h"
+#include "utils/syscache.h"
+
 #include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
 #include "distributed/deparse_shard_query.h"
 #include "distributed/deparser.h"
 #include "distributed/listutils.h"
@@ -37,14 +47,6 @@
 #include "distributed/relation_access_tracking.h"
 #include "distributed/resource_lock.h"
 #include "distributed/worker_transaction.h"
-#include "miscadmin.h"
-#include "utils/builtins.h"
-#include "utils/fmgroids.h"
-#include "utils/fmgrprotos.h"
-#include "utils/lsyscache.h"
-#include "utils/relcache.h"
-#include "utils/ruleutils.h"
-#include "utils/syscache.h"
 
 #define DEFAULT_STATISTICS_TARGET -1
 #define ALTER_INDEX_COLUMN_SET_STATS_COMMAND \

src/backend/distributed/commands/subscription.c

@@ -8,21 +8,23 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-
-#include "safe_lib.h"
-
 #include <string.h>
 
-#include "commands/defrem.h"
-#include "distributed/commands.h"
-#include "distributed/connection_management.h"
-#include "pg_version_constants.h"
-#include "distributed/version_compat.h"
+#include "postgres.h"
+
 #include "libpq-fe.h"
+#include "safe_lib.h"
+
+#include "commands/defrem.h"
 #include "nodes/parsenodes.h"
 #include "utils/builtins.h"
 
+#include "pg_version_constants.h"
+
+#include "distributed/commands.h"
+#include "distributed/connection_management.h"
+#include "distributed/version_compat.h"
+
 
 static char * GenerateConninfoWithAuth(char *conninfo);
 

src/backend/distributed/commands/table.c

@@ -9,7 +9,7 @@
  */
 
 #include "postgres.h"
-#include "pg_version_constants.h"
+
 #include "access/genam.h"
 #include "access/htup_details.h"
 #include "access/xact.h"
@@ -20,28 +20,6 @@
 #include "catalog/pg_depend.h"
 #include "catalog/pg_type.h"
 #include "commands/tablecmds.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/colocation_utils.h"
-#include "distributed/commands.h"
-#include "distributed/commands/utility_hook.h"
-#include "distributed/coordinator_protocol.h"
-#include "distributed/deparser.h"
-#include "distributed/deparse_shard_query.h"
-#include "distributed/distribution_column.h"
-#include "distributed/foreign_key_relationship.h"
-#include "distributed/local_executor.h"
-#include "distributed/listutils.h"
-#include "distributed/metadata_sync.h"
-#include "distributed/metadata/dependency.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/multi_executor.h"
-#include "distributed/multi_partitioning_utils.h"
-#include "distributed/reference_table_utils.h"
-#include "distributed/relation_access_tracking.h"
-#include "distributed/resource_lock.h"
-#include "distributed/version_compat.h"
-#include "distributed/worker_shard_visibility.h"
-#include "distributed/tenant_schema_metadata.h"
 #include "foreign/foreign.h"
 #include "lib/stringinfo.h"
 #include "nodes/parsenodes.h"
@@ -53,6 +31,31 @@
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
+#include "pg_version_constants.h"
+
+#include "distributed/citus_ruleutils.h"
+#include "distributed/colocation_utils.h"
+#include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/coordinator_protocol.h"
+#include "distributed/deparse_shard_query.h"
+#include "distributed/deparser.h"
+#include "distributed/distribution_column.h"
+#include "distributed/foreign_key_relationship.h"
+#include "distributed/listutils.h"
+#include "distributed/local_executor.h"
+#include "distributed/metadata/dependency.h"
+#include "distributed/metadata/distobject.h"
+#include "distributed/metadata_sync.h"
+#include "distributed/multi_executor.h"
+#include "distributed/multi_partitioning_utils.h"
+#include "distributed/reference_table_utils.h"
+#include "distributed/relation_access_tracking.h"
+#include "distributed/resource_lock.h"
+#include "distributed/tenant_schema_metadata.h"
+#include "distributed/version_compat.h"
+#include "distributed/worker_shard_visibility.h"
+
 
 /* controlled via GUC, should be accessed via GetEnableLocalReferenceForeignKeys() */
 bool EnableLocalReferenceForeignKeys = true;

src/backend/distributed/commands/text_search.c

@@ -10,6 +10,8 @@
 
 #include "postgres.h"
 
+#include "fmgr.h"
+
 #include "access/genam.h"
 #include "access/xact.h"
 #include "catalog/namespace.h"
@@ -22,7 +24,6 @@
 #include "commands/comment.h"
 #include "commands/defrem.h"
 #include "commands/extension.h"
-#include "fmgr.h"
 #include "nodes/makefuncs.h"
 #include "tsearch/ts_cache.h"
 #include "tsearch/ts_public.h"

src/backend/distributed/commands/trigger.c

@@ -9,7 +9,6 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "pg_version_constants.h"
 
 #include "access/genam.h"
 #include "access/table.h"
@@ -18,6 +17,14 @@
 #include "catalog/pg_trigger.h"
 #include "commands/extension.h"
 #include "commands/trigger.h"
+#include "utils/builtins.h"
+#include "utils/fmgroids.h"
+#include "utils/fmgrprotos.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
+
+#include "pg_version_constants.h"
+
 #include "distributed/commands.h"
 #include "distributed/commands/utility_hook.h"
 #include "distributed/coordinator_protocol.h"
@@ -29,11 +36,6 @@
 #include "distributed/namespace_utils.h"
 #include "distributed/shard_utils.h"
 #include "distributed/worker_protocol.h"
-#include "utils/builtins.h"
-#include "utils/fmgrprotos.h"
-#include "utils/fmgroids.h"
-#include "utils/lsyscache.h"
-#include "utils/syscache.h"
 
 
 /* appropriate lock modes for the owner relation according to postgres */

src/backend/distributed/commands/truncate.c

@@ -9,12 +9,19 @@
  */
 
 #include "postgres.h"
+
 #include "miscadmin.h"
 
 #include "catalog/namespace.h"
 #include "catalog/pg_class.h"
 #include "commands/tablecmds.h"
 #include "commands/trigger.h"
+#include "storage/lmgr.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/regproc.h"
+#include "utils/rel.h"
+
 #include "distributed/adaptive_executor.h"
 #include "distributed/citus_ruleutils.h"
 #include "distributed/commands.h"
@@ -31,13 +38,8 @@
 #include "distributed/reference_table_utils.h"
 #include "distributed/resource_lock.h"
 #include "distributed/transaction_management.h"
-#include "distributed/worker_transaction.h"
 #include "distributed/worker_shard_visibility.h"
-#include "storage/lmgr.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
-#include "utils/regproc.h"
-#include "utils/rel.h"
+#include "distributed/worker_transaction.h"
 
 
 /* Local functions forward declarations for unsupported command checks */

src/backend/distributed/commands/type.c

@@ -43,7 +43,7 @@
 
 #include "postgres.h"
 
-#include "pg_version_constants.h"
+#include "miscadmin.h"
 
 #include "access/genam.h"
 #include "access/htup_details.h"
@@ -52,6 +52,18 @@
 #include "catalog/pg_enum.h"
 #include "catalog/pg_type.h"
 #include "commands/extension.h"
+#include "nodes/makefuncs.h"
+#include "parser/parse_type.h"
+#include "storage/lmgr.h"
+#include "utils/builtins.h"
+#include "utils/fmgroids.h"
+#include "utils/lsyscache.h"
+#include "utils/regproc.h"
+#include "utils/syscache.h"
+#include "utils/typcache.h"
+
+#include "pg_version_constants.h"
+
 #include "distributed/citus_safe_lib.h"
 #include "distributed/commands.h"
 #include "distributed/commands/utility_hook.h"
@@ -64,20 +76,10 @@
 #include "distributed/relation_access_tracking.h"
 #include "distributed/remote_commands.h"
 #include "distributed/transaction_management.h"
-#include "distributed/worker_create_or_replace.h"
 #include "distributed/version_compat.h"
+#include "distributed/worker_create_or_replace.h"
 #include "distributed/worker_manager.h"
 #include "distributed/worker_transaction.h"
-#include "miscadmin.h"
-#include "nodes/makefuncs.h"
-#include "parser/parse_type.h"
-#include "storage/lmgr.h"
-#include "utils/builtins.h"
-#include "utils/fmgroids.h"
-#include "utils/lsyscache.h"
-#include "utils/regproc.h"
-#include "utils/syscache.h"
-#include "utils/typcache.h"
 
 #define AlterEnumIsRename(stmt) (stmt->oldVal != NULL)
 #define AlterEnumIsAddValue(stmt) (stmt->oldVal == NULL)

src/backend/distributed/commands/utility_hook.c

@@ -25,9 +25,8 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_version_constants.h"
-
 #include "postgres.h"
+
 #include "miscadmin.h"
 
 #include "access/attnum.h"
@@ -35,11 +34,25 @@
 #include "access/htup_details.h"
 #include "catalog/catalog.h"
 #include "catalog/dependency.h"
-#include "citus_version.h"
 #include "commands/dbcommands.h"
 #include "commands/defrem.h"
 #include "commands/extension.h"
 #include "commands/tablecmds.h"
+#include "foreign/foreign.h"
+#include "lib/stringinfo.h"
+#include "nodes/makefuncs.h"
+#include "nodes/parsenodes.h"
+#include "nodes/pg_list.h"
+#include "tcop/utility.h"
+#include "utils/builtins.h"
+#include "utils/fmgroids.h"
+#include "utils/inval.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
+
+#include "citus_version.h"
+#include "pg_version_constants.h"
+
 #include "distributed/adaptive_executor.h"
 #include "distributed/backend_data.h"
 #include "distributed/citus_depended_object.h"
@@ -48,19 +61,19 @@
 #include "distributed/commands/multi_copy.h"
 #include "distributed/commands/utility_hook.h" /* IWYU pragma: keep */
 #include "distributed/coordinator_protocol.h"
-#include "distributed/deparser.h"
 #include "distributed/deparse_shard_query.h"
+#include "distributed/deparser.h"
 #include "distributed/executor_util.h"
 #include "distributed/foreign_key_relationship.h"
 #include "distributed/listutils.h"
 #include "distributed/local_executor.h"
 #include "distributed/maintenanced.h"
-#include "distributed/multi_logical_replication.h"
-#include "distributed/multi_partitioning_utils.h"
-#include "distributed/metadata_sync.h"
 #include "distributed/metadata/distobject.h"
+#include "distributed/metadata_sync.h"
 #include "distributed/multi_executor.h"
 #include "distributed/multi_explain.h"
+#include "distributed/multi_logical_replication.h"
+#include "distributed/multi_partitioning_utils.h"
 #include "distributed/multi_physical_planner.h"
 #include "distributed/reference_table_utils.h"
 #include "distributed/resource_lock.h"
@@ -69,17 +82,6 @@
 #include "distributed/version_compat.h"
 #include "distributed/worker_shard_visibility.h"
 #include "distributed/worker_transaction.h"
-#include "foreign/foreign.h"
-#include "lib/stringinfo.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/makefuncs.h"
-#include "tcop/utility.h"
-#include "utils/builtins.h"
-#include "utils/fmgroids.h"
-#include "utils/inval.h"
-#include "utils/lsyscache.h"
-#include "utils/syscache.h"
 
 
 bool EnableDDLPropagation = true; /* ddl propagation is enabled */

src/backend/distributed/commands/vacuum.c

@@ -10,10 +10,16 @@
 
 #include "postgres.h"
 
-#include "pg_version_constants.h"
-
+#include "access/xact.h"
 #include "commands/defrem.h"
 #include "commands/vacuum.h"
+#include "postmaster/bgworker_internals.h"
+#include "storage/lmgr.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+
+#include "pg_version_constants.h"
+
 #include "distributed/adaptive_executor.h"
 #include "distributed/commands.h"
 #include "distributed/commands/utility_hook.h"
@@ -24,11 +30,6 @@
 #include "distributed/resource_lock.h"
 #include "distributed/transaction_management.h"
 #include "distributed/version_compat.h"
-#include "storage/lmgr.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
-#include "postmaster/bgworker_internals.h"
-#include "access/xact.h"
 
 
 #define VACUUM_PARALLEL_NOTSET -2

src/backend/distributed/commands/variableset.c

@@ -9,21 +9,23 @@
  */
 
 #include "postgres.h"
+
 #include "c.h"
 
 #include "common/string.h"
-#include "distributed/commands.h"
-#include "distributed/commands/utility_hook.h"
-#include "distributed/metadata_cache.h"
-#include "distributed/resource_lock.h"
-#include "distributed/transaction_management.h"
-#include "distributed/version_compat.h"
+#include "lib/ilist.h"
 #include "storage/lmgr.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
-#include "lib/ilist.h"
 #include "utils/varlena.h"
+
+#include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/metadata_cache.h"
 #include "distributed/remote_commands.h"
+#include "distributed/resource_lock.h"
+#include "distributed/transaction_management.h"
+#include "distributed/version_compat.h"
 
 /*
  * ShouldPropagateSetCommand determines whether a SET or RESET command should be

src/backend/distributed/commands/view.c

@@ -9,23 +9,12 @@
  */
 
 #include "postgres.h"
+
 #include "fmgr.h"
 
 #include "access/genam.h"
 #include "catalog/objectaddress.h"
 #include "commands/extension.h"
-#include "distributed/commands.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/commands/utility_hook.h"
-#include "distributed/deparser.h"
-#include "distributed/errormessage.h"
-#include "distributed/listutils.h"
-#include "distributed/metadata_sync.h"
-#include "distributed/metadata/dependency.h"
-#include "distributed/metadata/distobject.h"
-#include "distributed/multi_executor.h"
-#include "distributed/namespace_utils.h"
-#include "distributed/worker_transaction.h"
 #include "executor/spi.h"
 #include "nodes/nodes.h"
 #include "nodes/pg_list.h"
@@ -35,6 +24,19 @@
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
+#include "distributed/citus_ruleutils.h"
+#include "distributed/commands.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/deparser.h"
+#include "distributed/errormessage.h"
+#include "distributed/listutils.h"
+#include "distributed/metadata/dependency.h"
+#include "distributed/metadata/distobject.h"
+#include "distributed/metadata_sync.h"
+#include "distributed/multi_executor.h"
+#include "distributed/namespace_utils.h"
+#include "distributed/worker_transaction.h"
+
 /*
  * GUC controls some restrictions for local objects. For example,
  * if it is disabled, a local view with no distributed relation dependency

src/backend/distributed/connection/connection_configuration.c

@@ -12,6 +12,10 @@
 
 #include "access/transam.h"
 #include "access/xact.h"
+#include "mb/pg_wchar.h"
+#include "postmaster/postmaster.h"
+#include "utils/builtins.h"
+
 #include "distributed/backend_data.h"
 #include "distributed/citus_safe_lib.h"
 #include "distributed/connection_management.h"
@@ -19,10 +23,6 @@
 #include "distributed/metadata_cache.h"
 #include "distributed/worker_manager.h"
 
-#include "postmaster/postmaster.h"
-#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
-
 /* stores the string representation of our node connection GUC */
 #ifdef USE_SSL
 char *NodeConninfo = "sslmode=require";

src/backend/distributed/connection/connection_management.c

@@ -9,39 +9,39 @@
  */
 
 #include "postgres.h"
-#include "pgstat.h"
 
 #include "libpq-fe.h"
-
 #include "miscadmin.h"
-
+#include "pg_config.h"
+#include "pgstat.h"
 #include "safe_lib.h"
-#include "postmaster/postmaster.h"
+
 #include "access/hash.h"
 #include "commands/dbcommands.h"
+#include "mb/pg_wchar.h"
+#include "portability/instr_time.h"
+#include "postmaster/postmaster.h"
+#include "storage/ipc.h"
+#include "utils/hsearch.h"
+#include "utils/memutils.h"
+
 #include "distributed/backend_data.h"
+#include "distributed/cancel_utils.h"
 #include "distributed/connection_management.h"
-#include "distributed/errormessage.h"
 #include "distributed/error_codes.h"
+#include "distributed/errormessage.h"
+#include "distributed/hash_helpers.h"
 #include "distributed/listutils.h"
 #include "distributed/log_utils.h"
 #include "distributed/memutils.h"
 #include "distributed/metadata_cache.h"
-#include "distributed/hash_helpers.h"
 #include "distributed/placement_connection.h"
+#include "distributed/remote_commands.h"
 #include "distributed/run_from_same_connection.h"
 #include "distributed/shared_connection_stats.h"
-#include "distributed/cancel_utils.h"
-#include "distributed/remote_commands.h"
 #include "distributed/time_constants.h"
 #include "distributed/version_compat.h"
 #include "distributed/worker_log_messages.h"
-#include "mb/pg_wchar.h"
-#include "pg_config.h"
-#include "portability/instr_time.h"
-#include "storage/ipc.h"
-#include "utils/hsearch.h"
-#include "utils/memutils.h"
 
 
 int NodeConnectionTimeout = 30000;

src/backend/distributed/connection/locally_reserved_shared_connections.c

@@ -33,12 +33,15 @@
 
 #include "postgres.h"
 
-#include "pg_version_constants.h"
-
 #include "miscadmin.h"
 
 #include "access/hash.h"
 #include "commands/dbcommands.h"
+#include "common/hashfn.h"
+#include "utils/builtins.h"
+
+#include "pg_version_constants.h"
+
 #include "distributed/listutils.h"
 #include "distributed/locally_reserved_shared_connections.h"
 #include "distributed/metadata_cache.h"
@@ -47,8 +50,6 @@
 #include "distributed/shared_connection_stats.h"
 #include "distributed/tuplestore.h"
 #include "distributed/worker_manager.h"
-#include "utils/builtins.h"
-#include "common/hashfn.h"
 
 
 #define RESERVED_CONNECTION_COLUMNS 4

src/backend/distributed/connection/placement_connection.c

@@ -11,23 +11,24 @@
 
 #include "postgres.h"
 
+#include "access/hash.h"
+#include "common/hashfn.h"
+#include "utils/hsearch.h"
+#include "utils/memutils.h"
+
 #include "pg_version_constants.h"
 
-#include "access/hash.h"
 #include "distributed/colocation_utils.h"
 #include "distributed/connection_management.h"
+#include "distributed/coordinator_protocol.h"
+#include "distributed/distributed_planner.h"
 #include "distributed/hash_helpers.h"
 #include "distributed/listutils.h"
-#include "distributed/coordinator_protocol.h"
 #include "distributed/metadata_cache.h"
 #include "distributed/multi_executor.h"
-#include "distributed/distributed_planner.h"
 #include "distributed/multi_partitioning_utils.h"
 #include "distributed/placement_connection.h"
 #include "distributed/relation_access_tracking.h"
-#include "utils/hsearch.h"
-#include "common/hashfn.h"
-#include "utils/memutils.h"
 
 
 /*

src/backend/distributed/connection/remote_commands.c

@@ -9,23 +9,23 @@
  */
 
 #include "postgres.h"
-#include "pgstat.h"
 
 #include "libpq-fe.h"
+#include "miscadmin.h"
+#include "pgstat.h"
 
+#include "lib/stringinfo.h"
+#include "storage/latch.h"
+#include "utils/builtins.h"
+#include "utils/fmgrprotos.h"
+#include "utils/palloc.h"
+
+#include "distributed/cancel_utils.h"
 #include "distributed/connection_management.h"
 #include "distributed/errormessage.h"
 #include "distributed/listutils.h"
 #include "distributed/log_utils.h"
 #include "distributed/remote_commands.h"
-#include "distributed/errormessage.h"
-#include "distributed/cancel_utils.h"
-#include "lib/stringinfo.h"
-#include "miscadmin.h"
-#include "storage/latch.h"
-#include "utils/builtins.h"
-#include "utils/fmgrprotos.h"
-#include "utils/palloc.h"
 
 
 /*

src/backend/distributed/connection/shared_connection_stats.c

@@ -11,18 +11,21 @@
  */
 
 #include "postgres.h"
-#include "pgstat.h"
-
-#include "pg_version_constants.h"
 
 #include "libpq-fe.h"
-
 #include "miscadmin.h"
+#include "pgstat.h"
 
 #include "access/hash.h"
 #include "access/htup_details.h"
 #include "catalog/pg_authid.h"
 #include "commands/dbcommands.h"
+#include "common/hashfn.h"
+#include "storage/ipc.h"
+#include "utils/builtins.h"
+
+#include "pg_version_constants.h"
+
 #include "distributed/backend_data.h"
 #include "distributed/cancel_utils.h"
 #include "distributed/connection_management.h"
@@ -32,12 +35,9 @@
 #include "distributed/multi_executor.h"
 #include "distributed/placement_connection.h"
 #include "distributed/shared_connection_stats.h"
-#include "distributed/worker_manager.h"
 #include "distributed/time_constants.h"
 #include "distributed/tuplestore.h"
-#include "utils/builtins.h"
-#include "common/hashfn.h"
-#include "storage/ipc.h"
+#include "distributed/worker_manager.h"
 
 
 #define REMOTE_CONNECTION_STATS_COLUMNS 4

src/backend/distributed/connection/worker_log_messages.c

@@ -10,12 +10,13 @@
 
 #include "postgres.h"
 
+#include "utils/elog.h"
+
 #include "distributed/connection_management.h"
 #include "distributed/error_codes.h"
 #include "distributed/errormessage.h"
 #include "distributed/log_utils.h"
 #include "distributed/worker_log_messages.h"
-#include "utils/elog.h"
 
 
 /*

src/backend/distributed/deparser/citus_grantutils.c

@@ -1,8 +1,10 @@
 #include "postgres.h"
+
 #include "lib/stringinfo.h"
 #include "nodes/parsenodes.h"
-#include "distributed/deparser.h"
+
 #include "distributed/citus_ruleutils.h"
+#include "distributed/deparser.h"
 
 /*
  * Append the 'WITH GRANT OPTION' clause to the given buffer if the given

src/backend/distributed/deparser/citus_ruleutils.c

@@ -7,13 +7,12 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-#include "miscadmin.h"
-
-#include "pg_version_constants.h"
-
 #include <stddef.h>
 
+#include "postgres.h"
+
+#include "miscadmin.h"
+
 #include "access/attnum.h"
 #include "access/genam.h"
 #include "access/heapam.h"
@@ -39,21 +38,11 @@
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
 #include "commands/extension.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/commands.h"
-#include "distributed/listutils.h"
-#include "distributed/multi_partitioning_utils.h"
-#include "distributed/metadata_cache.h"
-#include "distributed/metadata_sync.h"
-#include "distributed/metadata_utility.h"
-#include "distributed/namespace_utils.h"
-#include "distributed/relay_utility.h"
-#include "distributed/version_compat.h"
-#include "distributed/worker_protocol.h"
+#include "commands/sequence.h"
 #include "foreign/foreign.h"
 #include "lib/stringinfo.h"
-#include "nodes/nodes.h"
 #include "nodes/nodeFuncs.h"
+#include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
 #include "nodes/pg_list.h"
 #include "parser/parse_utilcmd.h"
@@ -71,7 +60,20 @@
 #include "utils/relcache.h"
 #include "utils/ruleutils.h"
 #include "utils/syscache.h"
-#include "commands/sequence.h"
+
+#include "pg_version_constants.h"
+
+#include "distributed/citus_ruleutils.h"
+#include "distributed/commands.h"
+#include "distributed/listutils.h"
+#include "distributed/metadata_cache.h"
+#include "distributed/metadata_sync.h"
+#include "distributed/metadata_utility.h"
+#include "distributed/multi_partitioning_utils.h"
+#include "distributed/namespace_utils.h"
+#include "distributed/relay_utility.h"
+#include "distributed/version_compat.h"
+#include "distributed/worker_protocol.h"
 
 
 static void deparse_index_columns(StringInfo buffer, List *indexParameterList,

src/backend/distributed/deparser/deparse_collation_stmts.c

@@ -17,8 +17,8 @@
 #include "nodes/value.h"
 #include "utils/builtins.h"
 
-#include "distributed/deparser.h"
 #include "distributed/citus_ruleutils.h"
+#include "distributed/deparser.h"
 
 static void AppendDropCollationStmt(StringInfo buf, DropStmt *stmt);
 static void AppendRenameCollationStmt(StringInfo buf, RenameStmt *stmt);

src/backend/distributed/deparser/deparse_database_stmts.c

@@ -11,16 +11,15 @@
 
 #include "postgres.h"
 
-#include "pg_version_compat.h"
-
 #include "catalog/namespace.h"
+#include "commands/defrem.h"
 #include "lib/stringinfo.h"
 #include "nodes/parsenodes.h"
 #include "utils/builtins.h"
 
-#include "distributed/deparser.h"
+#include "pg_version_compat.h"
+
 #include "distributed/citus_ruleutils.h"
-#include "commands/defrem.h"
 #include "distributed/deparser.h"
 #include "distributed/log_utils.h"
 

src/backend/distributed/deparser/deparse_extension_stmts.c

@@ -14,13 +14,14 @@
 
 #include "catalog/namespace.h"
 #include "commands/defrem.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
 #include "lib/stringinfo.h"
 #include "nodes/parsenodes.h"
 #include "nodes/pg_list.h"
 #include "utils/builtins.h"
 
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+
 /* Local functions forward declarations for helper functions */
 static void AppendCreateExtensionStmt(StringInfo buf, CreateExtensionStmt *stmt);
 static void AppendCreateExtensionStmtOptions(StringInfo buf, List *options);

src/backend/distributed/deparser/deparse_foreign_data_wrapper_stmts.c

@@ -10,13 +10,14 @@
 #include "postgres.h"
 
 #include "commands/defrem.h"
+#include "lib/stringinfo.h"
+#include "nodes/nodes.h"
+#include "utils/builtins.h"
+
 #include "distributed/citus_ruleutils.h"
 #include "distributed/deparser.h"
 #include "distributed/listutils.h"
 #include "distributed/relay_utility.h"
-#include "lib/stringinfo.h"
-#include "nodes/nodes.h"
-#include "utils/builtins.h"
 
 static void AppendGrantOnFDWStmt(StringInfo buf, GrantStmt *stmt);
 static void AppendGrantOnFDWNames(StringInfo buf, GrantStmt *stmt);

src/backend/distributed/deparser/deparse_foreign_server_stmts.c

@@ -10,13 +10,14 @@
 #include "postgres.h"
 
 #include "commands/defrem.h"
+#include "lib/stringinfo.h"
+#include "nodes/nodes.h"
+#include "utils/builtins.h"
+
 #include "distributed/citus_ruleutils.h"
 #include "distributed/deparser.h"
 #include "distributed/listutils.h"
 #include "distributed/relay_utility.h"
-#include "lib/stringinfo.h"
-#include "nodes/nodes.h"
-#include "utils/builtins.h"
 
 static void AppendCreateForeignServerStmt(StringInfo buf, CreateForeignServerStmt *stmt);
 static void AppendAlterForeignServerStmt(StringInfo buf, AlterForeignServerStmt *stmt);

src/backend/distributed/deparser/deparse_function_stmts.c

@@ -22,10 +22,6 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/commands.h"
-#include "distributed/deparser.h"
-#include "distributed/version_compat.h"
 #include "lib/stringinfo.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodes.h"
@@ -38,8 +34,13 @@
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
-#include "utils/syscache.h"
 #include "utils/regproc.h"
+#include "utils/syscache.h"
+
+#include "distributed/citus_ruleutils.h"
+#include "distributed/commands.h"
+#include "distributed/deparser.h"
+#include "distributed/version_compat.h"
 
 
 /* forward declaration for deparse functions */

src/backend/distributed/deparser/deparse_owned_stmts.c

@@ -11,13 +11,14 @@
 
 #include "postgres.h"
 
+#include "lib/stringinfo.h"
+#include "nodes/parsenodes.h"
+#include "utils/builtins.h"
+
 #include "pg_version_compat.h"
 
 #include "distributed/citus_ruleutils.h"
 #include "distributed/deparser.h"
-#include "lib/stringinfo.h"
-#include "nodes/parsenodes.h"
-#include "utils/builtins.h"
 
 static void AppendDropOwnedStmt(StringInfo buf, DropOwnedStmt *stmt);
 static void AppendRoleList(StringInfo buf, List *roleList);

src/backend/distributed/deparser/deparse_publication_stmts.c

@@ -13,20 +13,21 @@
 #include "access/relation.h"
 #include "catalog/namespace.h"
 #include "commands/defrem.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
-#include "distributed/namespace_utils.h"
 #include "lib/stringinfo.h"
+#include "nodes/value.h"
 #include "parser/parse_clause.h"
 #include "parser/parse_collate.h"
 #include "parser/parse_node.h"
 #include "parser/parse_relation.h"
-#include "nodes/value.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/ruleutils.h"
 
+#include "distributed/citus_ruleutils.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+#include "distributed/namespace_utils.h"
+
 
 static void AppendCreatePublicationStmt(StringInfo buf, CreatePublicationStmt *stmt,
 										bool whereClauseNeedsTransform,

src/backend/distributed/deparser/deparse_role_stmts.c

@@ -13,16 +13,17 @@
 
 #include "postgres.h"
 
-#include "pg_version_compat.h"
-
 #include "commands/defrem.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
 #include "lib/stringinfo.h"
 #include "nodes/parsenodes.h"
 #include "utils/builtins.h"
 
+#include "pg_version_compat.h"
+
+#include "distributed/citus_ruleutils.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+
 static void AppendAlterRoleStmt(StringInfo buf, AlterRoleStmt *stmt);
 static void AppendAlterRoleSetStmt(StringInfo buf, AlterRoleSetStmt *stmt);
 static void AppendCreateRoleStmt(StringInfo buf, CreateRoleStmt *stmt);

src/backend/distributed/deparser/deparse_schema_stmts.c

@@ -12,13 +12,14 @@
  */
 #include "postgres.h"
 
-#include "distributed/citus_ruleutils.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
 #include "lib/stringinfo.h"
 #include "nodes/nodes.h"
 #include "utils/builtins.h"
 
+#include "distributed/citus_ruleutils.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+
 static void AppendCreateSchemaStmt(StringInfo buf, CreateSchemaStmt *stmt);
 static void AppendDropSchemaStmt(StringInfo buf, DropStmt *stmt);
 static void AppendGrantOnSchemaStmt(StringInfo buf, GrantStmt *stmt);

src/backend/distributed/deparser/deparse_sequence_stmts.c

@@ -14,12 +14,13 @@
 #include "postgres.h"
 
 #include "catalog/namespace.h"
-#include "distributed/deparser.h"
-#include "distributed/version_compat.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 
+#include "distributed/deparser.h"
+#include "distributed/version_compat.h"
+
 
 /* forward declaration for deparse functions */
 static void AppendDropSequenceStmt(StringInfo buf, DropStmt *stmt);

src/backend/distributed/deparser/deparse_statistics_stmts.c

@@ -12,16 +12,17 @@
  */
 #include "postgres.h"
 
+#include "catalog/namespace.h"
+#include "lib/stringinfo.h"
+#include "nodes/nodes.h"
+#include "utils/builtins.h"
+
 #include "pg_version_constants.h"
 
-#include "catalog/namespace.h"
 #include "distributed/citus_ruleutils.h"
 #include "distributed/deparser.h"
 #include "distributed/listutils.h"
 #include "distributed/relay_utility.h"
-#include "lib/stringinfo.h"
-#include "nodes/nodes.h"
-#include "utils/builtins.h"
 
 static void AppendCreateStatisticsStmt(StringInfo buf, CreateStatsStmt *stmt);
 static void AppendDropStatisticsStmt(StringInfo buf, List *nameList, bool ifExists);

src/backend/distributed/deparser/deparse_table_stmts.c

@@ -13,20 +13,20 @@
 
 #include "catalog/heap.h"
 #include "commands/defrem.h"
-#include "distributed/commands.h"
-#include "distributed/deparser.h"
-#include "distributed/version_compat.h"
+#include "commands/tablecmds.h"
 #include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
 #include "parser/parse_expr.h"
-#include "parser/parse_type.h"
 #include "parser/parse_relation.h"
+#include "parser/parse_type.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/ruleutils.h"
 
+#include "distributed/commands.h"
+#include "distributed/deparser.h"
 #include "distributed/namespace_utils.h"
-#include "commands/tablecmds.h"
+#include "distributed/version_compat.h"
 
 static void AppendAlterTableSchemaStmt(StringInfo buf, AlterObjectSchemaStmt *stmt);
 static void AppendAlterTableStmt(StringInfo buf, AlterTableStmt *stmt);

src/backend/distributed/deparser/deparse_view_stmts.c

@@ -13,15 +13,16 @@
 
 #include "catalog/namespace.h"
 #include "commands/defrem.h"
-#include "distributed/citus_ruleutils.h"
-#include "distributed/commands.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
 #include "lib/stringinfo.h"
 #include "nodes/parsenodes.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 
+#include "distributed/citus_ruleutils.h"
+#include "distributed/commands.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+
 static void AppendDropViewStmt(StringInfo buf, DropStmt *stmt);
 static void AppendViewNameList(StringInfo buf, List *objects);
 static void AppendAlterViewStmt(StringInfo buf, AlterTableStmt *stmt);

src/backend/distributed/deparser/objectaddress.c

@@ -12,11 +12,12 @@
 
 #include "postgres.h"
 
-#include "commands/extension.h"
-#include "distributed/commands.h"
-#include "distributed/deparser.h"
 #include "catalog/objectaddress.h"
 #include "catalog/pg_extension_d.h"
+#include "commands/extension.h"
+
+#include "distributed/commands.h"
+#include "distributed/deparser.h"
 
 
 /*

src/backend/distributed/deparser/qualify_aggregate_stmts.c

@@ -15,10 +15,11 @@
 #include "postgres.h"
 
 #include "catalog/namespace.h"
-#include "distributed/deparser.h"
 #include "nodes/makefuncs.h"
 #include "utils/lsyscache.h"
 
+#include "distributed/deparser.h"
+
 void
 QualifyDefineAggregateStmt(Node *node)
 {

src/backend/distributed/deparser/qualify_function_stmt.c

@@ -21,12 +21,13 @@
 #include "access/htup_details.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_proc.h"
-#include "distributed/deparser.h"
-#include "distributed/version_compat.h"
 #include "parser/parse_func.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
+#include "distributed/deparser.h"
+#include "distributed/version_compat.h"
+
 /* forward declaration for qualify functions */
 static void QualifyFunction(ObjectWithArgs *func, ObjectType type);
 static void QualifyFunctionSchemaName(ObjectWithArgs *func, ObjectType type);

src/backend/distributed/deparser/qualify_publication_stmt.c

@@ -12,12 +12,13 @@
 #include "postgres.h"
 
 #include "catalog/namespace.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
 #include "nodes/nodes.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
 
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+
 #if (PG_VERSION_NUM >= PG_VERSION_15)
 static void QualifyPublicationObjects(List *publicationObjects);
 #else

src/backend/distributed/deparser/qualify_role_stmt.c

@@ -17,10 +17,11 @@
 
 #include "postgres.h"
 
-#include "distributed/deparser.h"
 #include "nodes/nodes.h"
 #include "utils/guc.h"
 
+#include "distributed/deparser.h"
+
 
 static void QualifyVarSetCurrent(VariableSetStmt *setStmt);
 

src/backend/distributed/deparser/qualify_sequence_stmt.c

@@ -17,12 +17,13 @@
 
 #include "postgres.h"
 
+#include "parser/parse_func.h"
+#include "utils/lsyscache.h"
+
 #include "distributed/commands.h"
 #include "distributed/deparser.h"
 #include "distributed/listutils.h"
 #include "distributed/version_compat.h"
-#include "parser/parse_func.h"
-#include "utils/lsyscache.h"
 
 
 /*

src/backend/distributed/deparser/qualify_statistics_stmt.c

@@ -16,15 +16,16 @@
 
 #include "catalog/namespace.h"
 #include "catalog/pg_statistic_ext.h"
-#include "distributed/commands.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
 #include "nodes/parsenodes.h"
 #include "nodes/value.h"
-#include "utils/syscache.h"
 #include "utils/lsyscache.h"
 #include "utils/rel.h"
 #include "utils/relcache.h"
+#include "utils/syscache.h"
+
+#include "distributed/commands.h"
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
 
 static Oid GetStatsNamespaceOid(Oid statsOid);
 

src/backend/distributed/deparser/qualify_table_stmt.c

@@ -23,6 +23,7 @@
 #include "utils/lsyscache.h"
 #include "utils/rel.h"
 #include "utils/relcache.h"
+
 #include "distributed/deparser.h"
 
 void

src/backend/distributed/deparser/qualify_type_stmt.c

@@ -23,13 +23,14 @@
 #include "catalog/namespace.h"
 #include "catalog/objectaddress.h"
 #include "catalog/pg_type.h"
+#include "nodes/makefuncs.h"
+#include "parser/parse_type.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
+
 #include "distributed/commands.h"
 #include "distributed/deparser.h"
 #include "distributed/version_compat.h"
-#include "nodes/makefuncs.h"
-#include "parser/parse_type.h"
-#include "utils/syscache.h"
-#include "utils/lsyscache.h"
 
 /*
  * GetTypeNamespaceNameByNameList resolved the schema name of a type by its namelist.

src/backend/distributed/deparser/qualify_view_stmt.c

@@ -12,12 +12,13 @@
 #include "postgres.h"
 
 #include "catalog/namespace.h"
-#include "distributed/deparser.h"
-#include "distributed/listutils.h"
 #include "nodes/nodes.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
 
+#include "distributed/deparser.h"
+#include "distributed/listutils.h"
+
 static void QualifyViewRangeVar(RangeVar *view);
 
 /*

src/backend/distributed/executor/adaptive_executor.c

@@ -118,32 +118,43 @@
  *-------------------------------------------------------------------------
  */
 
+#include <math.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include "postgres.h"
+
 #include "funcapi.h"
 #include "libpq-fe.h"
 #include "miscadmin.h"
 #include "pgstat.h"
 
-#include <math.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
+#include "access/htup_details.h"
 #include "access/transam.h"
 #include "access/xact.h"
-#include "access/htup_details.h"
 #include "catalog/pg_type.h"
 #include "commands/dbcommands.h"
 #include "commands/schemacmds.h"
+#include "lib/ilist.h"
+#include "portability/instr_time.h"
+#include "storage/fd.h"
+#include "storage/latch.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/memutils.h"
+#include "utils/syscache.h"
+#include "utils/timestamp.h"
+
 #include "distributed/adaptive_executor.h"
+#include "distributed/backend_data.h"
 #include "distributed/cancel_utils.h"
 #include "distributed/citus_custom_scan.h"
 #include "distributed/citus_safe_lib.h"
-#include "distributed/connection_management.h"
 #include "distributed/commands/multi_copy.h"
+#include "distributed/connection_management.h"
 #include "distributed/deparse_shard_query.h"
-#include "distributed/executor_util.h"
-#include "distributed/shared_connection_stats.h"
 #include "distributed/distributed_execution_locks.h"
+#include "distributed/executor_util.h"
 #include "distributed/intermediate_result_pruning.h"
 #include "distributed/listutils.h"
 #include "distributed/local_executor.h"
@@ -161,21 +172,11 @@
 #include "distributed/resource_lock.h"
 #include "distributed/shared_connection_stats.h"
 #include "distributed/subplan_execution.h"
-#include "distributed/transaction_management.h"
 #include "distributed/transaction_identifier.h"
+#include "distributed/transaction_management.h"
 #include "distributed/tuple_destination.h"
 #include "distributed/version_compat.h"
 #include "distributed/worker_protocol.h"
-#include "distributed/backend_data.h"
-#include "lib/ilist.h"
-#include "portability/instr_time.h"
-#include "storage/fd.h"
-#include "storage/latch.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
-#include "utils/memutils.h"
-#include "utils/syscache.h"
-#include "utils/timestamp.h"
 
 #define SLOW_START_DISABLED 0
 

src/backend/distributed/executor/citus_custom_scan.c

@@ -9,19 +9,30 @@
  */
 #include "postgres.h"
 
-#include "pg_version_constants.h"
-
 #include "miscadmin.h"
 
 #include "commands/copy.h"
+#include "executor/executor.h"
+#include "nodes/makefuncs.h"
+#include "optimizer/clauses.h"
+#include "optimizer/optimizer.h"
+#include "utils/datum.h"
+#include "utils/lsyscache.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
+
+#include "pg_version_constants.h"
+
 #include "distributed/backend_data.h"
 #include "distributed/citus_clauses.h"
 #include "distributed/citus_custom_scan.h"
 #include "distributed/citus_nodefuncs.h"
 #include "distributed/citus_ruleutils.h"
+#include "distributed/colocation_utils.h"
 #include "distributed/connection_management.h"
 #include "distributed/deparse_shard_query.h"
 #include "distributed/distributed_execution_locks.h"
+#include "distributed/function_call_delegation.h"
 #include "distributed/insert_select_executor.h"
 #include "distributed/insert_select_planner.h"
 #include "distributed/listutils.h"
@@ -30,23 +41,13 @@
 #include "distributed/merge_executor.h"
 #include "distributed/merge_planner.h"
 #include "distributed/multi_executor.h"
-#include "distributed/multi_server_executor.h"
 #include "distributed/multi_router_planner.h"
+#include "distributed/multi_server_executor.h"
 #include "distributed/query_stats.h"
 #include "distributed/shard_utils.h"
 #include "distributed/subplan_execution.h"
 #include "distributed/worker_log_messages.h"
 #include "distributed/worker_protocol.h"
-#include "distributed/colocation_utils.h"
-#include "distributed/function_call_delegation.h"
-#include "executor/executor.h"
-#include "nodes/makefuncs.h"
-#include "optimizer/optimizer.h"
-#include "optimizer/clauses.h"
-#include "utils/lsyscache.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/datum.h"
 
 
 extern AllowedDistributionColumn AllowedDistributionColumnValue;

src/backend/distributed/executor/directed_acyclic_graph_execution.c

@@ -8,11 +8,12 @@
  */
 
 #include "postgres.h"
+
 #include "access/hash.h"
-#include "distributed/hash_helpers.h"
 
 #include "distributed/adaptive_executor.h"
 #include "distributed/directed_acyclic_graph_execution.h"
+#include "distributed/hash_helpers.h"
 #include "distributed/listutils.h"
 #include "distributed/metadata_cache.h"
 #include "distributed/multi_physical_planner.h"

src/backend/distributed/executor/distributed_execution_locks.c

@@ -8,10 +8,10 @@
  * Copyright (c) Citus Data, Inc.
  *-------------------------------------------------------------------------
  */
+#include "distributed/coordinator_protocol.h"
 #include "distributed/distributed_execution_locks.h"
 #include "distributed/executor_util.h"
 #include "distributed/listutils.h"
-#include "distributed/coordinator_protocol.h"
 #include "distributed/metadata_cache.h"
 #include "distributed/multi_executor.h"
 #include "distributed/multi_partitioning_utils.h"

src/backend/distributed/executor/distributed_intermediate_results.c

@@ -8,12 +8,11 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_version_constants.h"
-
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include "postgres.h"
+
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "port.h"
@@ -21,21 +20,24 @@
 #include "access/htup_details.h"
 #include "access/tupdesc.h"
 #include "catalog/pg_type.h"
+#include "tcop/pquery.h"
+#include "tcop/tcopprot.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+
+#include "pg_version_constants.h"
+
 #include "distributed/deparse_shard_query.h"
 #include "distributed/intermediate_results.h"
 #include "distributed/listutils.h"
-#include "distributed/metadata_utility.h"
 #include "distributed/metadata_cache.h"
+#include "distributed/metadata_utility.h"
 #include "distributed/multi_executor.h"
 #include "distributed/multi_physical_planner.h"
 #include "distributed/transaction_management.h"
 #include "distributed/tuple_destination.h"
 #include "distributed/tuplestore.h"
 #include "distributed/worker_protocol.h"
-#include "tcop/pquery.h"
-#include "tcop/tcopprot.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
 
 
 /*

src/backend/distributed/executor/executor_util_params.c

@@ -8,12 +8,14 @@
  */
 
 #include "postgres.h"
+
 #include "funcapi.h"
 #include "miscadmin.h"
 
-#include "distributed/executor_util.h"
 #include "utils/lsyscache.h"
 
+#include "distributed/executor_util.h"
+
 
 /*
  * ExtractParametersForRemoteExecution extracts parameter types and values from

src/backend/distributed/executor/executor_util_tasks.c

@@ -8,6 +8,7 @@
  */
 
 #include "postgres.h"
+
 #include "funcapi.h"
 #include "miscadmin.h"
 

src/backend/distributed/executor/executor_util_tuples.c

@@ -8,12 +8,14 @@
  */
 
 #include "postgres.h"
+
 #include "funcapi.h"
 #include "miscadmin.h"
 
-#include "distributed/executor_util.h"
 #include "utils/lsyscache.h"
 
+#include "distributed/executor_util.h"
+
 
 /*
  * TupleDescGetAttBinaryInMetadata - Build an AttInMetadata structure based on

src/backend/distributed/executor/insert_select_executor.c

@@ -9,34 +9,9 @@
  */
 
 #include "postgres.h"
+
 #include "miscadmin.h"
 
-#include "distributed/citus_ruleutils.h"
-#include "distributed/commands/multi_copy.h"
-#include "distributed/adaptive_executor.h"
-#include "distributed/deparse_shard_query.h"
-#include "distributed/distributed_execution_locks.h"
-#include "distributed/insert_select_executor.h"
-#include "distributed/insert_select_planner.h"
-#include "distributed/intermediate_results.h"
-#include "distributed/local_executor.h"
-#include "distributed/merge_planner.h"
-#include "distributed/multi_executor.h"
-#include "distributed/multi_partitioning_utils.h"
-#include "distributed/multi_physical_planner.h"
-#include "distributed/listutils.h"
-#include "distributed/metadata_cache.h"
-#include "distributed/multi_router_planner.h"
-#include "distributed/local_executor.h"
-#include "distributed/distributed_planner.h"
-#include "distributed/recursive_planning.h"
-#include "distributed/relation_access_tracking.h"
-#include "distributed/repartition_executor.h"
-#include "distributed/resource_lock.h"
-#include "distributed/shardinterval_utils.h"
-#include "distributed/subplan_execution.h"
-#include "distributed/transaction_management.h"
-#include "distributed/version_compat.h"
 #include "executor/executor.h"
 #include "nodes/execnodes.h"
 #include "nodes/makefuncs.h"
@@ -53,6 +28,32 @@
 #include "utils/rel.h"
 #include "utils/snapmgr.h"
 
+#include "distributed/adaptive_executor.h"
+#include "distributed/citus_ruleutils.h"
+#include "distributed/commands/multi_copy.h"
+#include "distributed/deparse_shard_query.h"
+#include "distributed/distributed_execution_locks.h"
+#include "distributed/distributed_planner.h"
+#include "distributed/insert_select_executor.h"
+#include "distributed/insert_select_planner.h"
+#include "distributed/intermediate_results.h"
+#include "distributed/listutils.h"
+#include "distributed/local_executor.h"
+#include "distributed/merge_planner.h"
+#include "distributed/metadata_cache.h"
+#include "distributed/multi_executor.h"
+#include "distributed/multi_partitioning_utils.h"
+#include "distributed/multi_physical_planner.h"
+#include "distributed/multi_router_planner.h"
+#include "distributed/recursive_planning.h"
+#include "distributed/relation_access_tracking.h"
+#include "distributed/repartition_executor.h"
+#include "distributed/resource_lock.h"
+#include "distributed/shardinterval_utils.h"
+#include "distributed/subplan_execution.h"
+#include "distributed/transaction_management.h"
+#include "distributed/version_compat.h"
+
 /* Config variables managed via guc.c */
 bool EnableRepartitionedInsertSelect = true;
 

src/backend/distributed/executor/intermediate_results.c

@@ -11,6 +11,7 @@
 #include <unistd.h>
 
 #include "postgres.h"
+
 #include "funcapi.h"
 #include "libpq-fe.h"
 #include "miscadmin.h"
@@ -19,22 +20,6 @@
 #include "catalog/pg_enum.h"
 #include "catalog/pg_type.h"
 #include "commands/copy.h"
-#include "distributed/commands/multi_copy.h"
-#include "distributed/connection_management.h"
-#include "distributed/error_codes.h"
-#include "distributed/intermediate_results.h"
-#include "distributed/listutils.h"
-#include "distributed/metadata_utility.h"
-#include "distributed/metadata_cache.h"
-#include "distributed/multi_executor.h"
-#include "distributed/remote_commands.h"
-#include "distributed/transmit.h"
-#include "distributed/transaction_identifier.h"
-#include "distributed/tuplestore.h"
-#include "distributed/utils/array_type.h"
-#include "distributed/utils/directory.h"
-#include "distributed/version_compat.h"
-#include "distributed/worker_protocol.h"
 #include "nodes/makefuncs.h"
 #include "nodes/parsenodes.h"
 #include "nodes/primnodes.h"
@@ -45,6 +30,23 @@
 #include "utils/memutils.h"
 #include "utils/syscache.h"
 
+#include "distributed/commands/multi_copy.h"
+#include "distributed/connection_management.h"
+#include "distributed/error_codes.h"
+#include "distributed/intermediate_results.h"
+#include "distributed/listutils.h"
+#include "distributed/metadata_cache.h"
+#include "distributed/metadata_utility.h"
+#include "distributed/multi_executor.h"
+#include "distributed/remote_commands.h"
+#include "distributed/transaction_identifier.h"
+#include "distributed/transmit.h"
+#include "distributed/tuplestore.h"
+#include "distributed/utils/array_type.h"
+#include "distributed/utils/directory.h"
+#include "distributed/version_compat.h"
+#include "distributed/worker_protocol.h"
+
 
 static List *CreatedResultsDirectories = NIL;
 

src/backend/distributed/executor/local_executor.c

@@ -76,36 +76,38 @@
  *  via coordinator cannot happen via the local execution.
  */
 #include "postgres.h"
+
 #include "miscadmin.h"
 
+#include "executor/tstoreReceiver.h"
+#include "executor/tuptable.h"
+#include "nodes/params.h"
+#include "optimizer/optimizer.h"
+#include "utils/snapmgr.h"
+
 #include "pg_version_constants.h"
 
 #include "distributed/adaptive_executor.h"
-#include "distributed/commands/utility_hook.h"
 #include "distributed/citus_custom_scan.h"
 #include "distributed/citus_ruleutils.h"
 #include "distributed/colocation_utils.h"
-#include "distributed/query_utils.h"
+#include "distributed/commands/utility_hook.h"
+#include "distributed/coordinator_protocol.h"
 #include "distributed/deparse_shard_query.h"
+#include "distributed/executor_util.h"
 #include "distributed/listutils.h"
 #include "distributed/local_executor.h"
 #include "distributed/local_plan_cache.h"
-#include "distributed/coordinator_protocol.h"
-#include "distributed/executor_util.h"
 #include "distributed/metadata_cache.h"
 #include "distributed/multi_executor.h"
 #include "distributed/multi_server_executor.h"
+#include "distributed/query_utils.h"
 #include "distributed/relation_access_tracking.h"
 #include "distributed/remote_commands.h" /* to access LogRemoteCommands */
 #include "distributed/transaction_management.h"
 #include "distributed/utils/citus_stat_tenants.h"
 #include "distributed/version_compat.h"
 #include "distributed/worker_protocol.h"
-#include "executor/tstoreReceiver.h"
-#include "executor/tuptable.h"
-#include "optimizer/optimizer.h"
-#include "nodes/params.h"
-#include "utils/snapmgr.h"
 
 /* controlled via a GUC */
 bool EnableLocalExecution = true;