Skip to content

Commit e1c1c30

Browse files
adunstanadunstan
committed
Pre branch pgindent / pgperltidy run
Along the way make a slight adjustment to src/include/utils/queryjumble.h to avoid an unused typedef.
1 parent c318337 commit e1c1c30

File tree

19 files changed

+94
-76
lines changed

19 files changed

+94
-76
lines changed

‎src/backend/access/heap/hio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,8 @@ RelationGetBufferForTuple(Relation relation, Size len,
410410
}
411411

412412
/*
413-
* If the FSM knows nothing of the rel, try the last page before we
414-
* give up and extend. This avoids one-tuple-per-page syndrome during
413+
* If the FSM knows nothing of the rel, try the last page before we give
414+
* up and extend. This avoids one-tuple-per-page syndrome during
415415
* bootstrapping or in a recently-started system.
416416
*/
417417
if (targetBlock == InvalidBlockNumber)

‎src/backend/catalog/genbki.pl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -890,11 +890,11 @@ sub morph_row_for_pgattr
890890
# Copy the type data from pg_type, and add some type-dependent items
891891
my $type = $types{$atttype};
892892

893-
$row->{atttypid} = $type->{oid};
894-
$row->{attlen} = $type->{typlen};
895-
$row->{attbyval} = $type->{typbyval};
896-
$row->{attalign} = $type->{typalign};
897-
$row->{attstorage} = $type->{typstorage};
893+
$row->{atttypid} = $type->{oid};
894+
$row->{attlen} = $type->{typlen};
895+
$row->{attbyval} = $type->{typbyval};
896+
$row->{attalign} = $type->{typalign};
897+
$row->{attstorage} = $type->{typstorage};
898898
$row->{attcompression} = '\0';
899899

900900
# set attndims if it's an array type

‎src/backend/catalog/heap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2294,7 +2294,7 @@ StoreAttrDefault(Relation rel, AttrNumber attnum,
22942294
valuesAtt[Anum_pg_attribute_atthasdef - 1] = true;
22952295
replacesAtt[Anum_pg_attribute_atthasdef - 1] = true;
22962296

2297-
if (rel->rd_rel->relkind == RELKIND_RELATION && add_column_mode &&
2297+
if (rel->rd_rel->relkind == RELKIND_RELATION && add_column_mode &&
22982298
!attgenerated)
22992299
{
23002300
expr2 = expression_planner(expr2);

‎src/backend/executor/nodeModifyTable.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -704,16 +704,16 @@ ExecInsert(ModifyTableState *mtstate,
704704
}
705705

706706
/*
707-
* Initialize the batch slots. We don't know how many slots will be
708-
* needed, so we initialize them as the batch grows, and we keep
709-
* them across batches. To mitigate an inefficiency in how resource
710-
* owner handles objects with many references (as with many slots
711-
* all referencing the same tuple descriptor) we copy the tuple
712-
* descriptor for each slot.
707+
* Initialize the batch slots. We don't know how many slots will
708+
* be needed, so we initialize them as the batch grows, and we
709+
* keep them across batches. To mitigate an inefficiency in how
710+
* resource owner handles objects with many references (as with
711+
* many slots all referencing the same tuple descriptor) we copy
712+
* the tuple descriptor for each slot.
713713
*/
714714
if (resultRelInfo->ri_NumSlots >= resultRelInfo->ri_NumSlotsInitialized)
715715
{
716-
TupleDesc tdesc = CreateTupleDescCopy(slot->tts_tupleDescriptor);
716+
TupleDesc tdesc = CreateTupleDescCopy(slot->tts_tupleDescriptor);
717717

718718
resultRelInfo->ri_Slots[resultRelInfo->ri_NumSlots] =
719719
MakeSingleTupleTableSlot(tdesc, slot->tts_ops);
@@ -3173,7 +3173,7 @@ ExecEndModifyTable(ModifyTableState *node)
31733173
*/
31743174
for (i = 0; i < node->mt_nrels; i++)
31753175
{
3176-
int j;
3176+
int j;
31773177
ResultRelInfo *resultRelInfo = node->resultRelInfo + i;
31783178

31793179
if (!resultRelInfo->ri_usesFdwDirectModify &&
@@ -3183,8 +3183,9 @@ ExecEndModifyTable(ModifyTableState *node)
31833183
resultRelInfo);
31843184

31853185
/*
3186-
* Cleanup the initialized batch slots. This only matters for FDWs with
3187-
* batching, but the other cases will have ri_NumSlotsInitialized == 0.
3186+
* Cleanup the initialized batch slots. This only matters for FDWs
3187+
* with batching, but the other cases will have ri_NumSlotsInitialized
3188+
* == 0.
31883189
*/
31893190
for (j = 0; j < resultRelInfo->ri_NumSlotsInitialized; j++)
31903191
{

‎src/backend/replication/logical/reorderbuffer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2215,8 +2215,8 @@ ReorderBufferProcessTXN(ReorderBuffer *rb, ReorderBufferTXN *txn,
22152215
change_done:
22162216

22172217
/*
2218-
* If speculative insertion was confirmed, the record isn't
2219-
* needed anymore.
2218+
* If speculative insertion was confirmed, the record
2219+
* isn't needed anymore.
22202220
*/
22212221
if (specinsert != NULL)
22222222
{

‎src/backend/replication/logical/tablesync.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ fetch_remote_table_info(char *nspname, char *relname,
759759
" ORDER BY a.attnum",
760760
lrel->remoteid,
761761
(walrcv_server_version(LogRepWorkerWalRcvConn) >= 120000 ?
762-
"AND a.attgenerated = ''" : ""),
762+
"AND a.attgenerated = ''" : ""),
763763
lrel->remoteid);
764764
res = walrcv_exec(LogRepWorkerWalRcvConn, cmd.data,
765765
lengthof(attrRow), attrRow);

‎src/backend/replication/pgoutput/pgoutput.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,8 @@ get_rel_sync_entry(PGOutputData *data, Oid relid)
10311031
entry->pubactions.pubinsert = entry->pubactions.pubupdate =
10321032
entry->pubactions.pubdelete = entry->pubactions.pubtruncate = false;
10331033
entry->publish_as_relid = InvalidOid;
1034-
entry->map = NULL; /* will be set by maybe_send_schema() if needed */
1034+
entry->map = NULL; /* will be set by maybe_send_schema() if
1035+
* needed */
10351036
}
10361037

10371038
/* Validate the entry */

‎src/backend/storage/ipc/procarray.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1974,7 +1974,7 @@ GetOldestNonRemovableTransactionId(Relation rel)
19741974
if (rel == NULL || rel->rd_rel->relisshared || RecoveryInProgress())
19751975
return horizons.shared_oldest_nonremovable;
19761976
else if (IsCatalogRelation(rel) ||
1977-
RelationIsAccessibleInLogicalDecoding(rel))
1977+
RelationIsAccessibleInLogicalDecoding(rel))
19781978
return horizons.catalog_oldest_nonremovable;
19791979
else if (RELATION_IS_LOCAL(rel))
19801980
return horizons.temp_oldest_nonremovable;

‎src/bin/pgbench/t/001_pgbench_with_server.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ sub pgbench
10931093
],
10941094
[ 'gset alone', 1, [qr{gset must follow an SQL command}], q{\gset} ],
10951095
[
1096-
'gset no SQL', 1,
1096+
'gset no SQL', 1,
10971097
[qr{gset must follow an SQL command}], q{\set i +1
10981098
\gset}
10991099
],
@@ -1102,7 +1102,7 @@ sub pgbench
11021102
[qr{too many arguments}], q{SELECT 1 \gset a b}
11031103
],
11041104
[
1105-
'gset after gset', 1,
1105+
'gset after gset', 1,
11061106
[qr{gset must follow an SQL command}], q{SELECT 1 AS i \gset
11071107
\gset}
11081108
],
@@ -1197,7 +1197,7 @@ sub check_pgbench_logs
11971197
my $contents_raw = slurp_file($log);
11981198

11991199
my @contents = split(/\n/, $contents_raw);
1200-
my $clen = @contents;
1200+
my $clen = @contents;
12011201
ok( $min <= $clen && $clen <= $max,
12021202
"transaction count for $log ($clen)");
12031203
my $clen_match = grep(/$re/, @contents);

‎src/include/nodes/execnodes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ typedef struct ResultRelInfo
462462

463463
/* batch insert stuff */
464464
int ri_NumSlots; /* number of slots in the array */
465-
int ri_NumSlotsInitialized; /* number of initialized slots */
465+
int ri_NumSlotsInitialized; /* number of initialized slots */
466466
int ri_BatchSize; /* max slots inserted in a single batch */
467467
TupleTableSlot **ri_Slots; /* input tuples for batch insert */
468468
TupleTableSlot **ri_PlanSlots;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy