aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/commands')
-rw-r--r--src/backend/commands/alter.c5
-rw-r--r--src/backend/commands/cluster.c5
-rw-r--r--src/backend/commands/copy.c3
-rw-r--r--src/backend/commands/createas.c3
-rw-r--r--src/backend/commands/dbcommands.c3
-rw-r--r--src/backend/commands/event_trigger.c6
-rw-r--r--src/backend/commands/functioncmds.c2
-rw-r--r--src/backend/commands/lockcmds.c4
-rw-r--r--src/backend/commands/opclasscmds.c3
-rw-r--r--src/backend/commands/policy.c2
-rw-r--r--src/backend/commands/publicationcmds.c10
-rw-r--r--src/backend/commands/schemacmds.c3
-rw-r--r--src/backend/commands/subscriptioncmds.c12
-rw-r--r--src/backend/commands/tablecmds.c2
-rw-r--r--src/backend/commands/tablespace.c3
-rw-r--r--src/backend/commands/variable.c4
-rw-r--r--src/backend/commands/view.c3
17 files changed, 25 insertions, 48 deletions
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 562e3d3455c..d425ef935e3 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -34,8 +34,8 @@
#include "catalog/pg_opclass.h"
#include "catalog/pg_opfamily.h"
#include "catalog/pg_proc.h"
-#include "catalog/pg_subscription.h"
#include "catalog/pg_statistic_ext.h"
+#include "catalog/pg_subscription.h"
#include "catalog/pg_ts_config.h"
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
@@ -57,8 +57,8 @@
#include "commands/trigger.h"
#include "commands/typecmds.h"
#include "commands/user.h"
-#include "parser/parse_func.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
#include "rewrite/rewriteDefine.h"
#include "tcop/utility.h"
#include "utils/builtins.h"
@@ -67,7 +67,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static Oid AlterObjectNamespace_internal(Relation rel, Oid objid, Oid nspOid);
/*
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index a23128d7a09..b8c349f245b 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -22,17 +22,17 @@
#include "access/multixact.h"
#include "access/relscan.h"
#include "access/tableam.h"
-#include "access/transam.h"
#include "access/toast_internals.h"
+#include "access/transam.h"
#include "access/xact.h"
#include "access/xlog.h"
-#include "catalog/pg_am.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/heap.h"
#include "catalog/index.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_am.h"
#include "catalog/toasting.h"
#include "commands/cluster.h"
#include "commands/progress.h"
@@ -55,7 +55,6 @@
#include "utils/syscache.h"
#include "utils/tuplesort.h"
-
/*
* This struct is used to pass around the information on tables to be
* clustered. We need this so we can make a list of them when invoked without
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index e17d8c760f7..42a147b67d7 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -39,8 +39,8 @@
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
-#include "optimizer/optimizer.h"
#include "nodes/makefuncs.h"
+#include "optimizer/optimizer.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
#include "parser/parse_expr.h"
@@ -58,7 +58,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
#define OCTVALUE(c) ((c) - '0')
diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c
index b7d220699fb..2bf70837195 100644
--- a/src/backend/commands/createas.c
+++ b/src/backend/commands/createas.c
@@ -25,8 +25,8 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -51,7 +51,6 @@
#include "utils/rls.h"
#include "utils/snapmgr.h"
-
typedef struct
{
DestReceiver pub; /* publicly-known function pointers */
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 4ad62e6bf85..6f28859f730 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -53,8 +53,8 @@
#include "replication/slot.h"
#include "storage/copydir.h"
#include "storage/fd.h"
-#include "storage/lmgr.h"
#include "storage/ipc.h"
+#include "storage/lmgr.h"
#include "storage/md.h"
#include "storage/procarray.h"
#include "storage/smgr.h"
@@ -65,7 +65,6 @@
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-
typedef struct
{
Oid src_dboid; /* source (template) DB */
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index 0301ae1ddd9..6b022af4ab9 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -33,11 +33,12 @@
#include "commands/extension.h"
#include "commands/trigger.h"
#include "funcapi.h"
-#include "parser/parse_func.h"
-#include "pgstat.h"
#include "lib/ilist.h"
#include "miscadmin.h"
+#include "parser/parse_func.h"
+#include "pgstat.h"
#include "tcop/deparse_utility.h"
+#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/evtcache.h"
@@ -46,7 +47,6 @@
#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/syscache.h"
-#include "tcop/utility.h"
typedef struct EventTriggerQueryState
{
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 40f1f9a1b6f..94411b50082 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -34,8 +34,8 @@
#include "access/genam.h"
#include "access/htup_details.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index bae3b38f778..2621e3607a8 100644
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -20,13 +20,13 @@
#include "catalog/pg_inherits.h"
#include "commands/lockcmds.h"
#include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
#include "parser/parse_clause.h"
+#include "rewrite/rewriteHandler.h"
#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
-#include "rewrite/rewriteHandler.h"
-#include "nodes/nodeFuncs.h"
static void LockTableRecurse(Oid reloid, LOCKMODE lockmode, bool nowait, Oid userid);
static AclResult LockTableAclCheck(Oid relid, LOCKMODE lockmode, Oid userid);
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index 6a1ccdeb826..cb7a6bd2d14 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -19,8 +19,8 @@
#include "access/genam.h"
#include "access/hash.h"
-#include "access/nbtree.h"
#include "access/htup_details.h"
+#include "access/nbtree.h"
#include "access/sysattr.h"
#include "access/table.h"
#include "catalog/catalog.h"
@@ -50,7 +50,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterOpFamilyAdd(AlterOpFamilyStmt *stmt,
Oid amoid, Oid opfamilyoid,
int maxOpNumber, int maxProcNumber,
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index 1df76623adb..36093dcd956 100644
--- a/src/backend/commands/policy.c
+++ b/src/backend/commands/policy.c
@@ -16,8 +16,8 @@
#include "access/htup.h"
#include "access/htup_details.h"
#include "access/relation.h"
-#include "access/table.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index f115d4bf805..fbf11c86aad 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -14,29 +14,25 @@
#include "postgres.h"
-#include "funcapi.h"
-#include "miscadmin.h"
-
#include "access/genam.h"
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_publication.h"
#include "catalog/pg_publication_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/publicationcmds.h"
-
+#include "funcapi.h"
+#include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 6cf94a3140b..7cf3cc1d5d4 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -21,8 +21,8 @@
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
-#include "catalog/pg_authid.h"
#include "catalog/objectaccess.h"
+#include "catalog/pg_authid.h"
#include "catalog/pg_namespace.h"
#include "commands/dbcommands.h"
#include "commands/event_trigger.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void AlterSchemaOwner_internal(HeapTuple tup, Relation rel, Oid newOwnerId);
/*
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 14191957665..5408edcfc23 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -14,38 +14,30 @@
#include "postgres.h"
-#include "miscadmin.h"
-
#include "access/htup_details.h"
#include "access/table.h"
#include "access/xact.h"
-
#include "catalog/catalog.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
#include "catalog/pg_subscription_rel.h"
-
+#include "catalog/pg_type.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
#include "commands/subscriptioncmds.h"
-
#include "executor/executor.h"
-
+#include "miscadmin.h"
#include "nodes/makefuncs.h"
-
#include "replication/logicallauncher.h"
#include "replication/origin.h"
#include "replication/walreceiver.h"
#include "replication/walsender.h"
#include "replication/worker_internal.h"
-
#include "storage/lmgr.h"
-
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 5597be6e3d9..496c2063329 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -20,7 +20,6 @@
#include "access/multixact.h"
#include "access/reloptions.h"
#include "access/relscan.h"
-#include "access/tableam.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/tupconvert.h"
@@ -100,7 +99,6 @@
#include "utils/timestamp.h"
#include "utils/typcache.h"
-
/*
* ON COMMIT action list
*/
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 84efb414d8c..570dcb2b098 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -51,8 +51,8 @@
#include <sys/stat.h>
#include "access/heapam.h"
-#include "access/reloptions.h"
#include "access/htup_details.h"
+#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/tableam.h"
#include "access/xact.h"
@@ -84,7 +84,6 @@
#include "utils/rel.h"
#include "utils/varlena.h"
-
/* GUC variables */
char *default_tablespace = NULL;
char *temp_tablespaces = NULL;
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 1119e21d55b..a0bd8c3cab3 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -24,14 +24,14 @@
#include "access/xlog.h"
#include "catalog/pg_authid.h"
#include "commands/variable.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "utils/snapmgr.h"
+#include "utils/syscache.h"
#include "utils/timestamp.h"
#include "utils/varlena.h"
-#include "mb/pg_wchar.h"
/*
* DATESTYLE
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index bea890f177a..9fa433a9754 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -26,8 +26,8 @@
#include "parser/analyze.h"
#include "parser/parse_relation.h"
#include "rewrite/rewriteDefine.h"
-#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteHandler.h"
+#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteSupport.h"
#include "utils/acl.h"
#include "utils/builtins.h"
@@ -35,7 +35,6 @@
#include "utils/rel.h"
#include "utils/syscache.h"
-
static void checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc);
/*---------------------------------------------------------------------