Skip to content

P
Postgres FD Implementation
Commit 9ef2dbef authored by Tom Lane's avatar Tom Lane
Browse files
Options

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
parent bcbf392e
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 28 deletions
src/backend/catalog/objectaddress.c
View file @ 9ef2dbef
......@@ -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,
......
src/backend/optimizer/plan/createplan.c
View file @ 9ef2dbef
......@@ -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);
}
......
src/backend/rewrite/rewriteDefine.c
View file @ 9ef2dbef
......@@ -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);
......
src/backend/storage/lmgr/predicate.c
View file @ 9ef2dbef
......@@ -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)));
}
/*
......
src/backend/utils/time/snapmgr.c
View file @ 9ef2dbef
......@@ -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]);
......
src/bin/pg_upgrade/check.c
View file @ 9ef2dbef
......@@ -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);
......
src/bin/psql/describe.c
View file @ 9ef2dbef
......@@ -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);
......
src/include/catalog/pg_proc.h
View file @ 9ef2dbef
......@@ -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 */
......
src/include/nodes/parsenodes.h
View file @ 9ef2dbef
......@@ -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 */
......
src/include/replication/reorderbuffer.h
View file @ 9ef2dbef
......@@ -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;
......
src/tools/pgindent/typedefs.list
View file @ 9ef2dbef
......@@ -590,6 +590,7 @@ ExplainFormat
ExplainOneQuery_hook_type
ExplainState
ExplainStmt
ExportedSnapshot
Expr
ExprContext
ExprContextCallbackFunction
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment