Skip to content

Commit 9e1c9f9

Browse files
tglsfdctglsfdc
committed
pgindent run prior to branching v12.
pgperltidy and reformat-dat-files too, though the latter didn't find anything to change.
1 parent 145b186 commit 9e1c9f9

File tree

15 files changed

+32
-30
lines changed

15 files changed

+32
-30
lines changed

‎contrib/postgres_fdw/postgres_fdw.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ typedef struct PgFdwRelationInfo
6464
int width;
6565
Cost startup_cost;
6666
Cost total_cost;
67+
6768
/*
6869
* Estimated number of rows fetched from the foreign server, and costs
6970
* excluding costs for transferring those rows from the foreign server.

‎src/backend/commands/indexcmds.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,9 +1085,9 @@ DefineIndex(Oid relationId,
10851085
childrel = table_open(childRelid, lockmode);
10861086

10871087
/*
1088-
* Don't try to create indexes on foreign tables, though.
1089-
* Skip those if a regular index, or fail if trying to create
1090-
* a constraint index.
1088+
* Don't try to create indexes on foreign tables, though. Skip
1089+
* those if a regular index, or fail if trying to create a
1090+
* constraint index.
10911091
*/
10921092
if (childrel->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
10931093
{
@@ -1097,7 +1097,7 @@ DefineIndex(Oid relationId,
10971097
errmsg("cannot create unique index on partitioned table \"%s\"",
10981098
RelationGetRelationName(rel)),
10991099
errdetail("Table \"%s\" contains partitions that are foreign tables.",
1100-
RelationGetRelationName(rel))));
1100+
RelationGetRelationName(rel))));
11011101

11021102
table_close(childrel, lockmode);
11031103
continue;

‎src/backend/commands/tablecmds.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
10771077
errmsg("cannot create foreign partition of partitioned table \"%s\"",
10781078
RelationGetRelationName(parent)),
10791079
errdetail("Table \"%s\" contains indexes that are unique.",
1080-
RelationGetRelationName(parent))));
1080+
RelationGetRelationName(parent))));
10811081
else
10821082
{
10831083
index_close(idxRel, AccessShareLock);
@@ -15682,6 +15682,7 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
1568215682
defaultrel = table_open(defaultPartOid, NoLock);
1568315683
defPartConstraint =
1568415684
get_proposed_default_constraint(partBoundConstraint);
15685+
1568515686
/*
1568615687
* Map the Vars in the constraint expression from rel's attnos to
1568715688
* defaultrel's.

‎src/backend/commands/tablespace.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,8 +1211,8 @@ check_temp_tablespaces(char **newval, void **extra, GucSource source)
12111211
/*
12121212
* If we aren't inside a transaction, or connected to a database, we
12131213
* cannot do the catalog accesses necessary to verify the name. Must
1214-
* accept the value on faith.
1215-
* Fortunately, there's then also no need to pass the data to fd.c.
1214+
* accept the value on faith. Fortunately, there's then also no need to
1215+
* pass the data to fd.c.
12161216
*/
12171217
if (IsTransactionState() && MyDatabaseId != InvalidOid)
12181218
{

‎src/backend/executor/nodeIndexonlyscan.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,9 +528,8 @@ ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags)
528528
&TTSOpsVirtual);
529529

530530
/*
531-
* We need another slot, in a format that's suitable for the table AM,
532-
* for when we need to fetch a tuple from the table for rechecking
533-
* visibility.
531+
* We need another slot, in a format that's suitable for the table AM, for
532+
* when we need to fetch a tuple from the table for rechecking visibility.
534533
*/
535534
indexstate->ioss_TableSlot =
536535
ExecAllocTableSlot(&estate->es_tupleTable,

‎src/backend/executor/nodeModifyTable.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2317,8 +2317,8 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
23172317
* indexes for insertion of new index entries. Note we *must* set
23182318
* estate->es_result_relation_info correctly while we initialize each
23192319
* sub-plan; external modules such as FDWs may depend on that (see
2320-
* contrib/postgres_fdw/postgres_fdw.c: postgresBeginDirectModify()
2321-
* as one example).
2320+
* contrib/postgres_fdw/postgres_fdw.c: postgresBeginDirectModify() as one
2321+
* example).
23222322
*/
23232323
saved_resultRelInfo = estate->es_result_relation_info;
23242324

‎src/backend/partitioning/partbounds.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,13 +1237,14 @@ check_default_partition_contents(Relation parent, Relation default_rel,
12371237
: get_qual_for_range(parent, new_spec, false);
12381238
def_part_constraints =
12391239
get_proposed_default_constraint(new_part_constraints);
1240+
12401241
/*
12411242
* Map the Vars in the constraint expression from parent's attnos to
12421243
* default_rel's.
12431244
*/
12441245
def_part_constraints =
1245-
map_partition_varattnos(def_part_constraints, 1, default_rel,
1246-
parent, NULL);
1246+
map_partition_varattnos(def_part_constraints, 1, default_rel,
1247+
parent, NULL);
12471248

12481249
/*
12491250
* If the existing constraints on the default partition imply that it will

‎src/backend/utils/adt/pg_lsn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ pg_lsn_in(PG_FUNCTION_ARGS)
6161
{
6262
char *str = PG_GETARG_CSTRING(0);
6363
XLogRecPtr result;
64-
bool have_error = false;
64+
bool have_error = false;
6565

6666
result = pg_lsn_in_internal(str, &have_error);
6767
if (have_error)

‎src/backend/utils/cache/syscache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ static const struct cachedesc cacheinfo[] = {
728728
},
729729
32
730730
},
731-
{StatisticExtDataRelationId, /* STATEXTDATASTXOID */
731+
{StatisticExtDataRelationId, /* STATEXTDATASTXOID */
732732
StatisticExtDataStxoidIndexId,
733733
1,
734734
{

‎src/backend/utils/misc/guc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11615,7 +11615,7 @@ check_recovery_target_time(char **newval, void **extra, GucSource source)
1161511615
dterr = DecodeDateTime(field, ftype, nf, &dtype, tm, &fsec, &tz);
1161611616
if (dterr != 0)
1161711617
return false;
11618-
if (dtype != DTK_DATE)
11618+
if (dtype != DTK_DATE)
1161911619
return false;
1162011620

1162111621
if (tm2timestamp(tm, fsec, &tz, &timestamp) != 0)

‎src/bin/initdb/findtimezone.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,8 +699,9 @@ scan_available_timezones(char *tzdir, char *tzdirsub, struct tztry *tt,
699699
else if (score == *bestscore)
700700
{
701701
/* Consider how to break a tie */
702-
int namepref = (zone_name_pref(tzdirsub) -
703-
zone_name_pref(bestzonename));
702+
int namepref = (zone_name_pref(tzdirsub) -
703+
zone_name_pref(bestzonename));
704+
704705
if (namepref > 0 ||
705706
(namepref == 0 &&
706707
(strlen(tzdirsub) < strlen(bestzonename) ||

‎src/include/catalog/pg_statistic_ext_data.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ CATALOG(pg_statistic_ext_data,3429,StatisticExtDataRelationId)
3434

3535
#ifdef CATALOG_VARLEN /* variable-length fields start here */
3636

37-
pg_ndistinct stxdndistinct; /* ndistinct coefficients (serialized) */
37+
pg_ndistinct stxdndistinct; /* ndistinct coefficients (serialized) */
3838
pg_dependencies stxddependencies; /* dependencies (serialized) */
39-
pg_mcv_list stxdmcv; /* MCV (serialized) */
39+
pg_mcv_list stxdmcv; /* MCV (serialized) */
4040

4141
#endif
4242

@@ -47,6 +47,6 @@ CATALOG(pg_statistic_ext_data,3429,StatisticExtDataRelationId)
4747
* the format of pg_statistic_ext_data relation.
4848
* ----------------
4949
*/
50-
typedef FormData_pg_statistic_ext_data *Form_pg_statistic_ext_data;
50+
typedef FormData_pg_statistic_ext_data * Form_pg_statistic_ext_data;
5151

5252
#endif /* PG_STATISTIC_EXT_DATA_H */

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ my $contrib_extrasource = {
4242
'seg' => [ 'contrib/seg/segscan.l', 'contrib/seg/segparse.y' ],
4343
};
4444
my @contrib_excludes = (
45-
'commit_ts', 'hstore_plperl',
46-
'hstore_plpython', 'intagg',
47-
'jsonb_plperl', 'jsonb_plpython',
48-
'ltree_plpython', 'pgcrypto',
49-
'sepgsql', 'brin',
50-
'test_extensions', 'test_pg_dump',
45+
'commit_ts', 'hstore_plperl',
46+
'hstore_plpython', 'intagg',
47+
'jsonb_plperl', 'jsonb_plpython',
48+
'ltree_plpython', 'pgcrypto',
49+
'sepgsql', 'brin',
50+
'test_extensions', 'test_pg_dump',
5151
'snapshot_too_old', 'unsafe_tests');
5252

5353
# Set of variables for frontend modules

‎src/tools/pgindent/README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ DOING THE INDENT RUN:
5050

5151
5) Reformat the bootstrap catalog data files:
5252

53+
./configure # "make" will not work in an unconfigured tree
5354
cd src/include/catalog
5455
make reformat-dat-files
5556
cd ../../..

‎src/tools/pgindent/typedefs.list

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,6 @@ FormData_pg_sequence_data
729729
FormData_pg_shdepend
730730
FormData_pg_statistic
731731
FormData_pg_statistic_ext
732-
FormData_pg_statistic_ext_data
733732
FormData_pg_subscription
734733
FormData_pg_subscription_rel
735734
FormData_pg_tablespace
@@ -787,7 +786,6 @@ Form_pg_sequence_data
787786
Form_pg_shdepend
788787
Form_pg_statistic
789788
Form_pg_statistic_ext
790-
Form_pg_statistic_ext_data
791789
Form_pg_subscription
792790
Form_pg_subscription_rel
793791
Form_pg_tablespace

0 commit comments

Comments
 (0)