Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 21d304d

Browse files
committed
Final pgindent + perltidy run for v10.
1 parent 5b6289c commit 21d304d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+273
-273
lines changed

src/backend/access/hash/hashpage.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,10 +1320,10 @@ _hash_splitbucket(Relation rel,
13201320
/*
13211321
* If possible, clean up the old bucket. We might not be able to do this
13221322
* if someone else has a pin on it, but if not then we can go ahead. This
1323-
* isn't absolutely necessary, but it reduces bloat; if we don't do it now,
1324-
* VACUUM will do it eventually, but maybe not until new overflow pages
1325-
* have been allocated. Note that there's no need to clean up the new
1326-
* bucket.
1323+
* isn't absolutely necessary, but it reduces bloat; if we don't do it
1324+
* now, VACUUM will do it eventually, but maybe not until new overflow
1325+
* pages have been allocated. Note that there's no need to clean up the
1326+
* new bucket.
13271327
*/
13281328
if (IsBufferCleanupOK(bucket_obuf))
13291329
{

src/backend/access/transam/slru.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ SimpleLruInit(SlruCtl ctl, const char *name, int nslots, int nlsns,
233233
}
234234

235235
/* Should fit to estimated shmem size */
236-
Assert(ptr - (char *) shared <= SimpleLruShmemSize(nslots, nlsns));
236+
Assert(ptr - (char *) shared <= SimpleLruShmemSize(nslots, nlsns));
237237
}
238238
else
239239
Assert(found);

src/backend/catalog/namespace.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3802,14 +3802,14 @@ InitTempTableNamespace(void)
38023802
get_database_name(MyDatabaseId))));
38033803

38043804
/*
3805-
* Do not allow a Hot Standby session to make temp tables. Aside
3806-
* from problems with modifying the system catalogs, there is a naming
3805+
* Do not allow a Hot Standby session to make temp tables. Aside from
3806+
* problems with modifying the system catalogs, there is a naming
38073807
* conflict: pg_temp_N belongs to the session with BackendId N on the
3808-
* master, not to a hot standby session with the same BackendId. We should not
3809-
* be able to get here anyway due to XactReadOnly checks, but let's just
3810-
* make real sure. Note that this also backstops various operations that
3811-
* allow XactReadOnly transactions to modify temp tables; they'd need
3812-
* RecoveryInProgress checks if not for this.
3808+
* master, not to a hot standby session with the same BackendId. We
3809+
* should not be able to get here anyway due to XactReadOnly checks, but
3810+
* let's just make real sure. Note that this also backstops various
3811+
* operations that allow XactReadOnly transactions to modify temp tables;
3812+
* they'd need RecoveryInProgress checks if not for this.
38133813
*/
38143814
if (RecoveryInProgress())
38153815
ereport(ERROR,

src/backend/catalog/partition.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -728,9 +728,9 @@ check_new_partition_bound(char *relname, Relation parent,
728728
errmsg("empty range bound specified for partition \"%s\"",
729729
relname),
730730
errdetail("Specified lower bound %s is greater than or equal to upper bound %s.",
731-
get_range_partbound_string(spec->lowerdatums),
732-
get_range_partbound_string(spec->upperdatums)),
733-
parser_errposition(pstate, spec->location)));
731+
get_range_partbound_string(spec->lowerdatums),
732+
get_range_partbound_string(spec->upperdatums)),
733+
parser_errposition(pstate, spec->location)));
734734
}
735735

736736
if (partdesc->nparts > 0)

src/backend/commands/copy.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ BeginCopy(ParseState *pstate,
14541454
*/
14551455
if (cstate->transition_capture != NULL)
14561456
{
1457-
int i;
1457+
int i;
14581458

14591459
cstate->transition_tupconv_maps = (TupleConversionMap **)
14601460
palloc0(sizeof(TupleConversionMap *) *
@@ -2651,6 +2651,7 @@ CopyFrom(CopyState cstate)
26512651
cstate->transition_capture->tcs_map = NULL;
26522652
}
26532653
}
2654+
26542655
/*
26552656
* We might need to convert from the parent rowtype to the
26562657
* partition rowtype.

src/backend/commands/subscriptioncmds.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,9 +919,10 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
919919
LWLockAcquire(LogicalRepWorkerLock, LW_SHARED);
920920
subworkers = logicalrep_workers_find(subid, false);
921921
LWLockRelease(LogicalRepWorkerLock);
922-
foreach (lc, subworkers)
922+
foreach(lc, subworkers)
923923
{
924924
LogicalRepWorker *w = (LogicalRepWorker *) lfirst(lc);
925+
925926
if (slotname)
926927
logicalrep_worker_stop(w->subid, w->relid);
927928
else

src/backend/commands/tablecmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13509,8 +13509,8 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
1350913509
* having to construct this list again, so we request the strongest lock
1351013510
* on all partitions. We need the strongest lock, because we may decide
1351113511
* to scan them if we find out that the table being attached (or its leaf
13512-
* partitions) may contain rows that violate the partition constraint.
13513-
* If the table has a constraint that would prevent such rows, which by
13512+
* partitions) may contain rows that violate the partition constraint. If
13513+
* the table has a constraint that would prevent such rows, which by
1351413514
* definition is present in all the partitions, we need not scan the
1351513515
* table, nor its partitions. But we cannot risk a deadlock by taking a
1351613516
* weaker lock now and the stronger one only when needed.

src/backend/commands/trigger.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,11 +2071,11 @@ FindTriggerIncompatibleWithInheritance(TriggerDesc *trigdesc)
20712071
{
20722072
if (trigdesc != NULL)
20732073
{
2074-
int i;
2074+
int i;
20752075

20762076
for (i = 0; i < trigdesc->numtriggers; ++i)
20772077
{
2078-
Trigger *trigger = &trigdesc->triggers[i];
2078+
Trigger *trigger = &trigdesc->triggers[i];
20792079

20802080
if (trigger->tgoldtable != NULL || trigger->tgnewtable != NULL)
20812081
return trigger->tgname;
@@ -5253,12 +5253,12 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
52535253
*/
52545254
if (row_trigger && transition_capture != NULL)
52555255
{
5256-
HeapTuple original_insert_tuple = transition_capture->tcs_original_insert_tuple;
5256+
HeapTuple original_insert_tuple = transition_capture->tcs_original_insert_tuple;
52575257
TupleConversionMap *map = transition_capture->tcs_map;
5258-
bool delete_old_table = transition_capture->tcs_delete_old_table;
5259-
bool update_old_table = transition_capture->tcs_update_old_table;
5260-
bool update_new_table = transition_capture->tcs_update_new_table;
5261-
bool insert_new_table = transition_capture->tcs_insert_new_table;;
5258+
bool delete_old_table = transition_capture->tcs_delete_old_table;
5259+
bool update_old_table = transition_capture->tcs_update_old_table;
5260+
bool update_new_table = transition_capture->tcs_update_new_table;
5261+
bool insert_new_table = transition_capture->tcs_insert_new_table;;
52625262

52635263
if ((event == TRIGGER_EVENT_DELETE && delete_old_table) ||
52645264
(event == TRIGGER_EVENT_UPDATE && update_old_table))

src/backend/commands/vacuumlazy.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -529,11 +529,11 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
529529
* safely set for relfrozenxid or relminmxid.
530530
*
531531
* Before entering the main loop, establish the invariant that
532-
* next_unskippable_block is the next block number >= blkno that we
533-
* can't skip based on the visibility map, either all-visible for a
534-
* regular scan or all-frozen for an aggressive scan. We set it to
535-
* nblocks if there's no such block. We also set up the skipping_blocks
536-
* flag correctly at this stage.
532+
* next_unskippable_block is the next block number >= blkno that we can't
533+
* skip based on the visibility map, either all-visible for a regular scan
534+
* or all-frozen for an aggressive scan. We set it to nblocks if there's
535+
* no such block. We also set up the skipping_blocks flag correctly at
536+
* this stage.
537537
*
538538
* Note: The value returned by visibilitymap_get_status could be slightly
539539
* out-of-date, since we make this test before reading the corresponding

src/backend/executor/execProcnode.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,9 @@ ExecProcNodeFirst(PlanState *node)
411411
/*
412412
* Perform stack depth check during the first execution of the node. We
413413
* only do so the first time round because it turns out to not be cheap on
414-
* some common architectures (eg. x86). This relies on the assumption that
415-
* ExecProcNode calls for a given plan node will always be made at roughly
416-
* the same stack depth.
414+
* some common architectures (eg. x86). This relies on the assumption
415+
* that ExecProcNode calls for a given plan node will always be made at
416+
* roughly the same stack depth.
417417
*/
418418
check_stack_depth();
419419

src/backend/executor/nodeModifyTable.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,7 +1469,7 @@ static void
14691469
ExecSetupTransitionCaptureState(ModifyTableState *mtstate, EState *estate)
14701470
{
14711471
ResultRelInfo *targetRelInfo = getASTriggerResultRelInfo(mtstate);
1472-
int i;
1472+
int i;
14731473

14741474
/* Check for transition tables on the directly targeted relation. */
14751475
mtstate->mt_transition_capture =
@@ -1483,7 +1483,7 @@ ExecSetupTransitionCaptureState(ModifyTableState *mtstate, EState *estate)
14831483
if (mtstate->mt_transition_capture != NULL)
14841484
{
14851485
ResultRelInfo *resultRelInfos;
1486-
int numResultRelInfos;
1486+
int numResultRelInfos;
14871487

14881488
/* Find the set of partitions so that we can find their TupleDescs. */
14891489
if (mtstate->mt_partition_dispatch_info != NULL)
@@ -2254,8 +2254,8 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
22542254
else if (relkind == RELKIND_FOREIGN_TABLE)
22552255
{
22562256
/*
2257-
* When there is a row-level trigger, there should be a
2258-
* wholerow attribute.
2257+
* When there is a row-level trigger, there should be
2258+
* a wholerow attribute.
22592259
*/
22602260
j->jf_junkAttNo = ExecFindJunkAttribute(j, "wholerow");
22612261
}

src/backend/libpq/be-secure-openssl.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,9 +730,10 @@ be_tls_write(Port *port, void *ptr, size_t len, int *waitfor)
730730
n = -1;
731731
break;
732732
case SSL_ERROR_ZERO_RETURN:
733+
733734
/*
734-
* the SSL connnection was closed, leave it to the caller
735-
* to ereport it
735+
* the SSL connnection was closed, leave it to the caller to
736+
* ereport it
736737
*/
737738
errno = ECONNRESET;
738739
n = -1;

src/backend/optimizer/geqo/geqo_cx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
*/
4747
int
4848
cx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring,
49-
int num_gene, City *city_table)
49+
int num_gene, City * city_table)
5050
{
5151
int i,
5252
start_pos,

src/backend/optimizer/geqo/geqo_ox1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*/
4646
void
4747
ox1(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene,
48-
City *city_table)
48+
City * city_table)
4949
{
5050
int left,
5151
right,

src/backend/optimizer/geqo/geqo_ox2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
* position crossover
4545
*/
4646
void
47-
ox2(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City *city_table)
47+
ox2(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City * city_table)
4848
{
4949
int k,
5050
j,

src/backend/optimizer/geqo/geqo_px.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*/
4646
void
4747
px(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene,
48-
City *city_table)
48+
City * city_table)
4949
{
5050
int num_positions;
5151
int i,

src/backend/optimizer/geqo/geqo_recombination.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ alloc_city_table(PlannerInfo *root, int num_gene)
8484
* deallocate memory of city table
8585
*/
8686
void
87-
free_city_table(PlannerInfo *root, City *city_table)
87+
free_city_table(PlannerInfo *root, City * city_table)
8888
{
8989
pfree(city_table);
9090
}

src/backend/parser/parse_utilcmd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2131,8 +2131,8 @@ transformCheckConstraints(CreateStmtContext *cxt, bool skipValidation)
21312131

21322132
/*
21332133
* If creating a new table (but not a foreign table), we can safely skip
2134-
* validation of check constraints, and nonetheless mark them valid.
2135-
* (This will override any user-supplied NOT VALID flag.)
2134+
* validation of check constraints, and nonetheless mark them valid. (This
2135+
* will override any user-supplied NOT VALID flag.)
21362136
*/
21372137
if (skipValidation)
21382138
{

src/backend/replication/logical/launcher.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ LogicalRepCtxStruct *LogicalRepCtx;
7575

7676
typedef struct LogicalRepWorkerId
7777
{
78-
Oid subid;
79-
Oid relid;
78+
Oid subid;
79+
Oid relid;
8080
} LogicalRepWorkerId;
8181

8282
static List *on_commit_stop_workers = NIL;
@@ -552,7 +552,7 @@ void
552552
logicalrep_worker_stop_at_commit(Oid subid, Oid relid)
553553
{
554554
LogicalRepWorkerId *wid;
555-
MemoryContext oldctx;
555+
MemoryContext oldctx;
556556

557557
/* Make sure we store the info in context that survives until commit. */
558558
oldctx = MemoryContextSwitchTo(TopTransactionContext);
@@ -824,11 +824,12 @@ AtEOXact_ApplyLauncher(bool isCommit)
824824
{
825825
if (isCommit)
826826
{
827-
ListCell *lc;
827+
ListCell *lc;
828828

829-
foreach (lc, on_commit_stop_workers)
829+
foreach(lc, on_commit_stop_workers)
830830
{
831831
LogicalRepWorkerId *wid = lfirst(lc);
832+
832833
logicalrep_worker_stop(wid->subid, wid->relid);
833834
}
834835

src/backend/replication/logical/origin.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ replorigin_drop(RepOriginId roident, bool nowait)
353353
{
354354
if (state->acquired_by != 0)
355355
{
356-
ConditionVariable *cv;
356+
ConditionVariable *cv;
357357

358358
if (nowait)
359359
ereport(ERROR,
@@ -977,7 +977,7 @@ replorigin_get_progress(RepOriginId node, bool flush)
977977
static void
978978
ReplicationOriginExitCleanup(int code, Datum arg)
979979
{
980-
ConditionVariable *cv = NULL;
980+
ConditionVariable *cv = NULL;
981981

982982
LWLockAcquire(ReplicationOriginLock, LW_EXCLUSIVE);
983983

@@ -1097,7 +1097,7 @@ replorigin_session_setup(RepOriginId node)
10971097
void
10981098
replorigin_session_reset(void)
10991099
{
1100-
ConditionVariable *cv;
1100+
ConditionVariable *cv;
11011101

11021102
Assert(max_replication_slots != 0);
11031103

src/backend/replication/logical/snapbuild.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,9 +1117,9 @@ SnapBuildProcessRunningXacts(SnapBuild *builder, XLogRecPtr lsn, xl_running_xact
11171117
* only ever look at those.
11181118
*
11191119
* NB: We only increase xmax when a catalog modifying transaction commits
1120-
* (see SnapBuildCommitTxn). Because of this, xmax can be lower than xmin,
1121-
* which looks odd but is correct and actually more efficient, since we hit
1122-
* fast paths in tqual.c.
1120+
* (see SnapBuildCommitTxn). Because of this, xmax can be lower than
1121+
* xmin, which looks odd but is correct and actually more efficient, since
1122+
* we hit fast paths in tqual.c.
11231123
*/
11241124
builder->xmin = running->oldestRunningXid;
11251125

src/backend/replication/slot.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,8 @@ ReplicationSlotAcquire(const char *name, bool nowait)
351351
if (s->in_use && strcmp(name, NameStr(s->data.name)) == 0)
352352
{
353353
/*
354-
* This is the slot we want. We don't know yet if it's active,
355-
* so get ready to sleep on it in case it is. (We may end up not
354+
* This is the slot we want. We don't know yet if it's active, so
355+
* get ready to sleep on it in case it is. (We may end up not
356356
* sleeping, but we don't want to do this while holding the
357357
* spinlock.)
358358
*/
@@ -397,7 +397,7 @@ ReplicationSlotAcquire(const char *name, bool nowait)
397397
goto retry;
398398
}
399399
else
400-
ConditionVariableCancelSleep(); /* no sleep needed after all */
400+
ConditionVariableCancelSleep(); /* no sleep needed after all */
401401

402402
/* Let everybody know we've modified this slot */
403403
ConditionVariableBroadcast(&slot->active_cv);

src/backend/replication/syncrep.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ SyncRepWaitForLSN(XLogRecPtr lsn, bool commit)
293293
* WalSender has checked our LSN and has removed us from queue. Clean up
294294
* state and leave. It's OK to reset these shared memory fields without
295295
* holding SyncRepLock, because any walsenders will ignore us anyway when
296-
* we're not on the queue. We need a read barrier to make sure we see
297-
* the changes to the queue link (this might be unnecessary without
296+
* we're not on the queue. We need a read barrier to make sure we see the
297+
* changes to the queue link (this might be unnecessary without
298298
* assertions, but better safe than sorry).
299299
*/
300300
pg_read_barrier();
@@ -715,7 +715,7 @@ SyncRepGetSyncStandbysQuorum(bool *am_sync)
715715
for (i = 0; i < max_wal_senders; i++)
716716
{
717717
XLogRecPtr flush;
718-
WalSndState state;
718+
WalSndState state;
719719
int pid;
720720

721721
walsnd = &WalSndCtl->walsnds[i];
@@ -794,7 +794,7 @@ SyncRepGetSyncStandbysPriority(bool *am_sync)
794794
for (i = 0; i < max_wal_senders; i++)
795795
{
796796
XLogRecPtr flush;
797-
WalSndState state;
797+
WalSndState state;
798798
int pid;
799799

800800
walsnd = &WalSndCtl->walsnds[i];

src/backend/storage/ipc/procarray.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,8 +1408,8 @@ GetOldestXmin(Relation rel, int flags)
14081408
* being careful not to generate a "permanent" XID.
14091409
*
14101410
* vacuum_defer_cleanup_age provides some additional "slop" for the
1411-
* benefit of hot standby queries on standby servers. This is quick and
1412-
* dirty, and perhaps not all that useful unless the master has a
1411+
* benefit of hot standby queries on standby servers. This is quick
1412+
* and dirty, and perhaps not all that useful unless the master has a
14131413
* predictable transaction rate, but it offers some protection when
14141414
* there's no walsender connection. Note that we are assuming
14151415
* vacuum_defer_cleanup_age isn't large enough to cause wraparound ---

0 commit comments

Comments
 (0)