Final pgindent run with old pg_bsd_indent (version 1.3).

This is just to have a clean basis for comparison with the results of
the new version (which will indeed end up reverting some of these
changes...)

Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us

diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index 2b15d1979e47707d61e24e99bcd11225494814ec..791322a80397310405b0d14bf62be7d370b6f85e 100644 (file)
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -1849,7 +1849,7 @@ get_object_address_defacl(List *object, bool missing_ok)
                default:
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                 errmsg("unrecognized default ACL object type \"%c\"", objtype),
+                         errmsg("unrecognized default ACL object type \"%c\"", objtype),
                                         errhint("Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\".",
                                                         DEFACLOBJ_RELATION,
                                                         DEFACLOBJ_SEQUENCE,

diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 344caf453268b63f7b56cec2801b743bf9d29abb..19aa4575a93a880d840abafd2db5067a4bf0ae64 100644 (file)
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -2576,7 +2576,7 @@ create_indexscan_plan(PlannerInfo *root,
                if (is_redundant_derived_clause(rinfo, indexquals))
                        continue;                       /* derived from same EquivalenceClass */
                if (!contain_mutable_functions((Node *) rinfo->clause) &&
-                       predicate_implied_by(list_make1(rinfo->clause), indexquals, false))
+                 predicate_implied_by(list_make1(rinfo->clause), indexquals, false))
                        continue;                       /* provably implied by indexquals */
                qpqual = lappend(qpqual, rinfo);
        }

diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 4213bafa27096daff94a04a3abed97258c4fb5e4..5b948f03f2499b11f61e3de12d7ca197fbe37d3f 100644 (file)
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -431,8 +431,8 @@ DefineQueryRewrite(char *rulename,
                        if (event_relation->rd_rel->relispartition)
                                ereport(ERROR,
                                                (errcode(ERRCODE_WRONG_OBJECT_TYPE),
-                               errmsg("could not convert partition \"%s\" to a view",
-                                          RelationGetRelationName(event_relation))));
+                                          errmsg("could not convert partition \"%s\" to a view",
+                                                         RelationGetRelationName(event_relation))));
 
                        snapshot = RegisterSnapshot(GetLatestSnapshot());
                        scanDesc = heap_beginscan(event_relation, snapshot, 0, NULL);

diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index bce505a3fac8c309d477ff2d8a2914c6df9a9be7..f0b127cc600d4ef17d8b7a2044d1efb9c7d86490 100644 (file)
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -1754,8 +1754,8 @@ GetSerializableTransactionSnapshotInt(Snapshot snapshot,
                ereport(ERROR,
                                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
                                 errmsg("could not import the requested snapshot"),
-                       errdetail("The source process with pid %d is not running anymore.",
-                                               sourcepid)));
+                 errdetail("The source process with pid %d is not running anymore.",
+                                       sourcepid)));
        }
 
        /*

diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index 2b6fca924145477f1b16b9ee1a4fd73b28a5e1b8..420a34afe7381eac0acad9b9d5eb78cfba839000 100644 (file)
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -216,8 +216,8 @@ static Snapshot FirstXactSnapshot = NULL;
 /* Structure holding info about exported snapshot. */
 typedef struct ExportedSnapshot
 {
-       char *snapfile;
-       Snapshot snapshot;
+       char       *snapfile;
+       Snapshot        snapshot;
 } ExportedSnapshot;
 
 /* Current xact's exported snapshots (a list of ExportedSnapshot structs) */
@@ -626,8 +626,8 @@ SetTransactionSnapshot(Snapshot sourcesnap, VirtualTransactionId *sourcevxid,
                ereport(ERROR,
                                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
                                 errmsg("could not import the requested snapshot"),
-                       errdetail("The source process with pid %d is not running anymore.",
-                                               sourcepid)));
+                 errdetail("The source process with pid %d is not running anymore.",
+                                       sourcepid)));
 
        /*
         * In transaction-snapshot mode, the first snapshot must live until end of
@@ -1096,7 +1096,7 @@ AtEOXact_Snapshot(bool isCommit, bool resetXmin)
                 */
                foreach(lc, exportedSnapshots)
                {
-                       ExportedSnapshot        *esnap = (ExportedSnapshot *) lfirst(lc);
+                       ExportedSnapshot *esnap = (ExportedSnapshot *) lfirst(lc);
 
                        if (unlink(esnap->snapfile))
                                elog(WARNING, "could not unlink file \"%s\": %m",
@@ -1212,7 +1212,7 @@ ExportSnapshot(Snapshot snapshot)
         * inside the transaction from 1.
         */
        snprintf(path, sizeof(path), SNAPSHOT_EXPORT_DIR "/%08X-%08X-%d",
-                        MyProc->backendId, MyProc->lxid, list_length(exportedSnapshots) + 1);
+               MyProc->backendId, MyProc->lxid, list_length(exportedSnapshots) + 1);
 
        /*
         * Copy the snapshot into TopTransactionContext, add it to the
@@ -1260,7 +1260,7 @@ ExportSnapshot(Snapshot snapshot)
         * snapshot.h.)
         */
        addTopXid = (TransactionIdIsValid(topXid) &&
-               TransactionIdPrecedes(topXid, snapshot->xmax)) ? 1 : 0;
+                                TransactionIdPrecedes(topXid, snapshot->xmax)) ? 1 : 0;
        appendStringInfo(&buf, "xcnt:%d\n", snapshot->xcnt + addTopXid);
        for (i = 0; i < snapshot->xcnt; i++)
                appendStringInfo(&buf, "xip:%u\n", snapshot->xip[i]);

diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index b79e54a2dc70211c04d8fcf3cf9a889f500020b7..f28359d37964d8e7d6115585e730308715c88033 100644 (file)
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -177,10 +177,10 @@ void
 issue_warnings_and_set_wal_level(void)
 {
        /*
-        * We unconditionally start/stop the new server because pg_resetwal -o
-        * set wal_level to 'minimum'.  If the user is upgrading standby
-        * servers using the rsync instructions, they will need pg_upgrade
-        * to write its final WAL record showing wal_level as 'replica'.
+        * We unconditionally start/stop the new server because pg_resetwal -o set
+        * wal_level to 'minimum'.  If the user is upgrading standby servers using
+        * the rsync instructions, they will need pg_upgrade to write its final
+        * WAL record showing wal_level as 'replica'.
         */
        start_postmaster(&new_cluster, true);
 

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 0e19e94841c5d34074ef4f7a6d2650682d4b0f5b..9137a4e895d3a7d8e34d8c94cfac5aabf798f9cf 100644 (file)
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -2538,12 +2538,12 @@ describeOneTableDetails(const char *schemaname,
                        printfPQExpBuffer(&buf,
                                                          "SELECT pubname\n"
                                                          "FROM pg_catalog.pg_publication p\n"
-                                                         "JOIN pg_catalog.pg_publication_rel pr ON p.oid = pr.prpubid\n"
+                         "JOIN pg_catalog.pg_publication_rel pr ON p.oid = pr.prpubid\n"
                                                          "WHERE pr.prrelid = '%s'\n"
                                                          "UNION ALL\n"
                                                          "SELECT pubname\n"
                                                          "FROM pg_catalog.pg_publication p\n"
-                                                         "WHERE p.puballtables AND pg_relation_is_publishable('%s')\n"
+                               "WHERE p.puballtables AND pg_relation_is_publishable('%s')\n"
                                                          "ORDER BY 1;",
                                                          oid, oid);
 

diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index f22cc4f4726f74769060d405c39c384a6d984b58..9c12ea55256e29a240e7f922566e93ab2cfe8e80 100644 (file)
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -5436,7 +5436,7 @@ DESCR("get progress for all replication origins");
 /* publications */
 DATA(insert OID = 6119 ( pg_get_publication_tables     PGNSP PGUID 12 1 1000 0 0 f f f f t t s s 1 0 26 "25" "{25,26}" "{i,o}" "{pubname,relid}" _null_ _null_ pg_get_publication_tables _null_ _null_ _null_ ));
 DESCR("get OIDs of tables in a publication");
-DATA(insert OID = 6121 ( pg_relation_is_publishable    PGNSP PGUID 12 1    0 0 0 f f f f t f s s 1 0 16 "2205" _null_ _null_ _null_ _null_ _null_ pg_relation_is_publishable _null_ _null_ _null_ ));
+DATA(insert OID = 6121 ( pg_relation_is_publishable PGNSP PGUID 12 1   0 0 0 f f f f t f s s 1 0 16 "2205" _null_ _null_ _null_ _null_ _null_ pg_relation_is_publishable _null_ _null_ _null_ ));
 DESCR("returns whether a relation can be part of a publication");
 
 /* rls */

diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 271564fd23b735fee0306aea915ab587daa82d93..48ea5478874e5dffb1f37bbe47ee4050d51ce5d0 100644 (file)
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -1013,11 +1013,11 @@ typedef struct RangeTblEntry
         *
         * We need these for CTE RTEs so that the types of self-referential
         * columns are well-defined.  For VALUES RTEs, storing these explicitly
-        * saves having to re-determine the info by scanning the values_lists.
-        * For ENRs, we store the types explicitly here (we could get the
-        * information from the catalogs if 'relid' was supplied, but we'd still
-        * need these for TupleDesc-based ENRs, so we might as well always store
-        * the type info here).
+        * saves having to re-determine the info by scanning the values_lists. For
+        * ENRs, we store the types explicitly here (we could get the information
+        * from the catalogs if 'relid' was supplied, but we'd still need these
+        * for TupleDesc-based ENRs, so we might as well always store the type
+        * info here).
         */
        List       *coltypes;           /* OID list of column type OIDs */
        List       *coltypmods;         /* integer list of column typmods */

diff --git a/src/include/replication/reorderbuffer.h b/src/include/replication/reorderbuffer.h
index 8d8d418e8e397e6ba15ea4e4942e74792a0a9904..1d9a1d343e716d53c481249fb5a588f59ed6c5a8 100644 (file)
--- a/src/include/replication/reorderbuffer.h
+++ b/src/include/replication/reorderbuffer.h
@@ -214,9 +214,9 @@ typedef struct ReorderBufferTXN
 
        /*
         * Has this transaction been spilled to disk?  It's not always possible to
-        * deduce that fact by comparing nentries with nentries_mem, because
-        * e.g. subtransactions of a large transaction might get serialized
-        * together with the parent - if they're restored to memory they'd have
+        * deduce that fact by comparing nentries with nentries_mem, because e.g.
+        * subtransactions of a large transaction might get serialized together
+        * with the parent - if they're restored to memory they'd have
         * nentries_mem == nentries.
         */
        bool            serialized;

diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index eaa6d3290447972ae7184cd4fa229457c230f8a2..23a4bbd8de277bd3117f8be269fe7c79fd6da1e5 100644 (file)
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -590,6 +590,7 @@ ExplainFormat
 ExplainOneQuery_hook_type
 ExplainState
 ExplainStmt
+ExportedSnapshot
 Expr
 ExprContext
 ExprContextCallbackFunction