Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9ef2dbe

Browse files
committed
Final pgindent run with old pg_bsd_indent (version 1.3).
This is just to have a clean basis for comparison with the results ofthe new version (which will indeed end up reverting some of thesechanges...)Discussion:https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.orgDiscussion:https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
1 parentbcbf392 commit9ef2dbe

File tree

11 files changed

+29
-28
lines changed

11 files changed

+29
-28
lines changed

‎src/backend/catalog/objectaddress.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1849,7 +1849,7 @@ get_object_address_defacl(List *object, bool missing_ok)
18491849
default:
18501850
ereport(ERROR,
18511851
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
1852-
errmsg("unrecognized default ACL object type \"%c\"",objtype),
1852+
errmsg("unrecognized default ACL object type \"%c\"",objtype),
18531853
errhint("Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\".",
18541854
DEFACLOBJ_RELATION,
18551855
DEFACLOBJ_SEQUENCE,

‎src/backend/optimizer/plan/createplan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2576,7 +2576,7 @@ create_indexscan_plan(PlannerInfo *root,
25762576
if (is_redundant_derived_clause(rinfo,indexquals))
25772577
continue;/* derived from same EquivalenceClass */
25782578
if (!contain_mutable_functions((Node*)rinfo->clause)&&
2579-
predicate_implied_by(list_make1(rinfo->clause),indexquals, false))
2579+
predicate_implied_by(list_make1(rinfo->clause),indexquals, false))
25802580
continue;/* provably implied by indexquals */
25812581
qpqual=lappend(qpqual,rinfo);
25822582
}

‎src/backend/rewrite/rewriteDefine.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,8 @@ DefineQueryRewrite(char *rulename,
431431
if (event_relation->rd_rel->relispartition)
432432
ereport(ERROR,
433433
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
434-
errmsg("could not convert partition \"%s\" to a view",
435-
RelationGetRelationName(event_relation))));
434+
errmsg("could not convert partition \"%s\" to a view",
435+
RelationGetRelationName(event_relation))));
436436

437437
snapshot=RegisterSnapshot(GetLatestSnapshot());
438438
scanDesc=heap_beginscan(event_relation,snapshot,0,NULL);

‎src/backend/storage/lmgr/predicate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,8 +1754,8 @@ GetSerializableTransactionSnapshotInt(Snapshot snapshot,
17541754
ereport(ERROR,
17551755
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
17561756
errmsg("could not import the requested snapshot"),
1757-
errdetail("The source process with pid %d is not running anymore.",
1758-
sourcepid)));
1757+
errdetail("The source process with pid %d is not running anymore.",
1758+
sourcepid)));
17591759
}
17601760

17611761
/*

‎src/backend/utils/time/snapmgr.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ static Snapshot FirstXactSnapshot = NULL;
216216
/* Structure holding info about exported snapshot. */
217217
typedefstructExportedSnapshot
218218
{
219-
char*snapfile;
220-
Snapshotsnapshot;
219+
char*snapfile;
220+
Snapshotsnapshot;
221221
}ExportedSnapshot;
222222

223223
/* Current xact's exported snapshots (a list of ExportedSnapshot structs) */
@@ -626,8 +626,8 @@ SetTransactionSnapshot(Snapshot sourcesnap, VirtualTransactionId *sourcevxid,
626626
ereport(ERROR,
627627
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
628628
errmsg("could not import the requested snapshot"),
629-
errdetail("The source process with pid %d is not running anymore.",
630-
sourcepid)));
629+
errdetail("The source process with pid %d is not running anymore.",
630+
sourcepid)));
631631

632632
/*
633633
* In transaction-snapshot mode, the first snapshot must live until end of
@@ -1096,7 +1096,7 @@ AtEOXact_Snapshot(bool isCommit, bool resetXmin)
10961096
*/
10971097
foreach(lc,exportedSnapshots)
10981098
{
1099-
ExportedSnapshot*esnap= (ExportedSnapshot*)lfirst(lc);
1099+
ExportedSnapshot*esnap= (ExportedSnapshot*)lfirst(lc);
11001100

11011101
if (unlink(esnap->snapfile))
11021102
elog(WARNING,"could not unlink file \"%s\": %m",
@@ -1212,7 +1212,7 @@ ExportSnapshot(Snapshot snapshot)
12121212
* inside the transaction from 1.
12131213
*/
12141214
snprintf(path,sizeof(path),SNAPSHOT_EXPORT_DIR"/%08X-%08X-%d",
1215-
MyProc->backendId,MyProc->lxid,list_length(exportedSnapshots)+1);
1215+
MyProc->backendId,MyProc->lxid,list_length(exportedSnapshots)+1);
12161216

12171217
/*
12181218
* Copy the snapshot into TopTransactionContext, add it to the
@@ -1260,7 +1260,7 @@ ExportSnapshot(Snapshot snapshot)
12601260
* snapshot.h.)
12611261
*/
12621262
addTopXid= (TransactionIdIsValid(topXid)&&
1263-
TransactionIdPrecedes(topXid,snapshot->xmax)) ?1 :0;
1263+
TransactionIdPrecedes(topXid,snapshot->xmax)) ?1 :0;
12641264
appendStringInfo(&buf,"xcnt:%d\n",snapshot->xcnt+addTopXid);
12651265
for (i=0;i<snapshot->xcnt;i++)
12661266
appendStringInfo(&buf,"xip:%u\n",snapshot->xip[i]);

‎src/bin/pg_upgrade/check.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ void
177177
issue_warnings_and_set_wal_level(void)
178178
{
179179
/*
180-
* We unconditionally start/stop the new server because pg_resetwal -o
181-
*setwal_level to 'minimum'. If the user is upgrading standby
182-
*servers usingthe rsync instructions, they will need pg_upgrade
183-
*to write its finalWAL record showing wal_level as 'replica'.
180+
* We unconditionally start/stop the new server because pg_resetwal -o set
181+
* wal_level to 'minimum'. If the user is upgrading standby servers using
182+
* the rsync instructions, they will need pg_upgrade to write its final
183+
* WAL record showing wal_level as 'replica'.
184184
*/
185185
start_postmaster(&new_cluster, true);
186186

‎src/bin/psql/describe.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2538,12 +2538,12 @@ describeOneTableDetails(const char *schemaname,
25382538
printfPQExpBuffer(&buf,
25392539
"SELECT pubname\n"
25402540
"FROM pg_catalog.pg_publication p\n"
2541-
"JOIN pg_catalog.pg_publication_rel pr ON p.oid = pr.prpubid\n"
2541+
"JOIN pg_catalog.pg_publication_rel pr ON p.oid = pr.prpubid\n"
25422542
"WHERE pr.prrelid = '%s'\n"
25432543
"UNION ALL\n"
25442544
"SELECT pubname\n"
25452545
"FROM pg_catalog.pg_publication p\n"
2546-
"WHERE p.puballtables AND pg_relation_is_publishable('%s')\n"
2546+
"WHERE p.puballtables AND pg_relation_is_publishable('%s')\n"
25472547
"ORDER BY 1;",
25482548
oid,oid);
25492549

‎src/include/catalog/pg_proc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5436,7 +5436,7 @@ DESCR("get progress for all replication origins");
54365436
/* publications */
54375437
DATA(insert OID = 6119 ( pg_get_publication_tablesPGNSP 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_ ));
54385438
DESCR("get OIDs of tables in a publication");
5439-
DATA(insert OID = 6121 ( pg_relation_is_publishablePGNSP PGUID 12 10 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_ ));
5439+
DATA(insert OID = 6121 ( pg_relation_is_publishablePGNSP PGUID 12 10 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_ ));
54405440
DESCR("returns whether a relation can be part of a publication");
54415441

54425442
/* rls */

‎src/include/nodes/parsenodes.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,11 +1013,11 @@ typedef struct RangeTblEntry
10131013
*
10141014
* We need these for CTE RTEs so that the types of self-referential
10151015
* columns are well-defined. For VALUES RTEs, storing these explicitly
1016-
* saves having to re-determine the info by scanning the values_lists.
1017-
*ForENRs, we store the types explicitly here (we could get the
1018-
*informationfrom the catalogs if 'relid' was supplied, but we'd still
1019-
*need thesefor TupleDesc-based ENRs, so we might as well always store
1020-
*the typeinfo here).
1016+
* saves having to re-determine the info by scanning the values_lists. For
1017+
* ENRs, we store the types explicitly here (we could get the information
1018+
* from the catalogs if 'relid' was supplied, but we'd still need these
1019+
* for TupleDesc-based ENRs, so we might as well always store the type
1020+
* info here).
10211021
*/
10221022
List*coltypes;/* OID list of column type OIDs */
10231023
List*coltypmods;/* integer list of column typmods */

‎src/include/replication/reorderbuffer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ typedef struct ReorderBufferTXN
214214

215215
/*
216216
* Has this transaction been spilled to disk? It's not always possible to
217-
* deduce that fact by comparing nentries with nentries_mem, because
218-
*e.g.subtransactions of a large transaction might get serialized
219-
*togetherwith the parent - if they're restored to memory they'd have
217+
* deduce that fact by comparing nentries with nentries_mem, because e.g.
218+
* subtransactions of a large transaction might get serialized together
219+
* with the parent - if they're restored to memory they'd have
220220
* nentries_mem == nentries.
221221
*/
222222
boolserialized;

‎src/tools/pgindent/typedefs.list

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,7 @@ ExplainFormat
590590
ExplainOneQuery_hook_type
591591
ExplainState
592592
ExplainStmt
593+
ExportedSnapshot
593594
Expr
594595
ExprContext
595596
ExprContextCallbackFunction

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp