Commit 9e1c9f95 authored by Tom Lane's avatar Tom Lane

pgindent run prior to branching v12.

pgperltidy and reformat-dat-files too, though the latter didn't
find anything to change.
parent 145b1868
...@@ -64,6 +64,7 @@ typedef struct PgFdwRelationInfo ...@@ -64,6 +64,7 @@ typedef struct PgFdwRelationInfo
int width; int width;
Cost startup_cost; Cost startup_cost;
Cost total_cost; Cost total_cost;
/* /*
* Estimated number of rows fetched from the foreign server, and costs * Estimated number of rows fetched from the foreign server, and costs
* excluding costs for transferring those rows from the foreign server. * excluding costs for transferring those rows from the foreign server.
......
...@@ -1085,9 +1085,9 @@ DefineIndex(Oid relationId, ...@@ -1085,9 +1085,9 @@ DefineIndex(Oid relationId,
childrel = table_open(childRelid, lockmode); childrel = table_open(childRelid, lockmode);
/* /*
* Don't try to create indexes on foreign tables, though. * Don't try to create indexes on foreign tables, though. Skip
* Skip those if a regular index, or fail if trying to create * those if a regular index, or fail if trying to create a
* a constraint index. * constraint index.
*/ */
if (childrel->rd_rel->relkind == RELKIND_FOREIGN_TABLE) if (childrel->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
{ {
......
...@@ -15682,6 +15682,7 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd) ...@@ -15682,6 +15682,7 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
defaultrel = table_open(defaultPartOid, NoLock); defaultrel = table_open(defaultPartOid, NoLock);
defPartConstraint = defPartConstraint =
get_proposed_default_constraint(partBoundConstraint); get_proposed_default_constraint(partBoundConstraint);
/* /*
* Map the Vars in the constraint expression from rel's attnos to * Map the Vars in the constraint expression from rel's attnos to
* defaultrel's. * defaultrel's.
......
...@@ -1211,8 +1211,8 @@ check_temp_tablespaces(char **newval, void **extra, GucSource source) ...@@ -1211,8 +1211,8 @@ check_temp_tablespaces(char **newval, void **extra, GucSource source)
/* /*
* If we aren't inside a transaction, or connected to a database, we * If we aren't inside a transaction, or connected to a database, we
* cannot do the catalog accesses necessary to verify the name. Must * cannot do the catalog accesses necessary to verify the name. Must
* accept the value on faith. * accept the value on faith. Fortunately, there's then also no need to
* Fortunately, there's then also no need to pass the data to fd.c. * pass the data to fd.c.
*/ */
if (IsTransactionState() && MyDatabaseId != InvalidOid) if (IsTransactionState() && MyDatabaseId != InvalidOid)
{ {
......
...@@ -528,9 +528,8 @@ ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags) ...@@ -528,9 +528,8 @@ ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags)
&TTSOpsVirtual); &TTSOpsVirtual);
/* /*
* We need another slot, in a format that's suitable for the table AM, * We need another slot, in a format that's suitable for the table AM, for
* for when we need to fetch a tuple from the table for rechecking * when we need to fetch a tuple from the table for rechecking visibility.
* visibility.
*/ */
indexstate->ioss_TableSlot = indexstate->ioss_TableSlot =
ExecAllocTableSlot(&estate->es_tupleTable, ExecAllocTableSlot(&estate->es_tupleTable,
......
...@@ -2317,8 +2317,8 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags) ...@@ -2317,8 +2317,8 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
* indexes for insertion of new index entries. Note we *must* set * indexes for insertion of new index entries. Note we *must* set
* estate->es_result_relation_info correctly while we initialize each * estate->es_result_relation_info correctly while we initialize each
* sub-plan; external modules such as FDWs may depend on that (see * sub-plan; external modules such as FDWs may depend on that (see
* contrib/postgres_fdw/postgres_fdw.c: postgresBeginDirectModify() * contrib/postgres_fdw/postgres_fdw.c: postgresBeginDirectModify() as one
* as one example). * example).
*/ */
saved_resultRelInfo = estate->es_result_relation_info; saved_resultRelInfo = estate->es_result_relation_info;
......
...@@ -1237,6 +1237,7 @@ check_default_partition_contents(Relation parent, Relation default_rel, ...@@ -1237,6 +1237,7 @@ check_default_partition_contents(Relation parent, Relation default_rel,
: get_qual_for_range(parent, new_spec, false); : get_qual_for_range(parent, new_spec, false);
def_part_constraints = def_part_constraints =
get_proposed_default_constraint(new_part_constraints); get_proposed_default_constraint(new_part_constraints);
/* /*
* Map the Vars in the constraint expression from parent's attnos to * Map the Vars in the constraint expression from parent's attnos to
* default_rel's. * default_rel's.
......
...@@ -701,6 +701,7 @@ scan_available_timezones(char *tzdir, char *tzdirsub, struct tztry *tt, ...@@ -701,6 +701,7 @@ scan_available_timezones(char *tzdir, char *tzdirsub, struct tztry *tt,
/* Consider how to break a tie */ /* Consider how to break a tie */
int namepref = (zone_name_pref(tzdirsub) - int namepref = (zone_name_pref(tzdirsub) -
zone_name_pref(bestzonename)); zone_name_pref(bestzonename));
if (namepref > 0 || if (namepref > 0 ||
(namepref == 0 && (namepref == 0 &&
(strlen(tzdirsub) < strlen(bestzonename) || (strlen(tzdirsub) < strlen(bestzonename) ||
......
...@@ -47,6 +47,6 @@ CATALOG(pg_statistic_ext_data,3429,StatisticExtDataRelationId) ...@@ -47,6 +47,6 @@ CATALOG(pg_statistic_ext_data,3429,StatisticExtDataRelationId)
* the format of pg_statistic_ext_data relation. * the format of pg_statistic_ext_data relation.
* ---------------- * ----------------
*/ */
typedef FormData_pg_statistic_ext_data *Form_pg_statistic_ext_data; typedef FormData_pg_statistic_ext_data * Form_pg_statistic_ext_data;
#endif /* PG_STATISTIC_EXT_DATA_H */ #endif /* PG_STATISTIC_EXT_DATA_H */
...@@ -50,6 +50,7 @@ DOING THE INDENT RUN: ...@@ -50,6 +50,7 @@ DOING THE INDENT RUN:
5) Reformat the bootstrap catalog data files: 5) Reformat the bootstrap catalog data files:
./configure # "make" will not work in an unconfigured tree
cd src/include/catalog cd src/include/catalog
make reformat-dat-files make reformat-dat-files
cd ../../.. cd ../../..
......
...@@ -729,7 +729,6 @@ FormData_pg_sequence_data ...@@ -729,7 +729,6 @@ FormData_pg_sequence_data
FormData_pg_shdepend FormData_pg_shdepend
FormData_pg_statistic FormData_pg_statistic
FormData_pg_statistic_ext FormData_pg_statistic_ext
FormData_pg_statistic_ext_data
FormData_pg_subscription FormData_pg_subscription
FormData_pg_subscription_rel FormData_pg_subscription_rel
FormData_pg_tablespace FormData_pg_tablespace
...@@ -787,7 +786,6 @@ Form_pg_sequence_data ...@@ -787,7 +786,6 @@ Form_pg_sequence_data
Form_pg_shdepend Form_pg_shdepend
Form_pg_statistic Form_pg_statistic
Form_pg_statistic_ext Form_pg_statistic_ext
Form_pg_statistic_ext_data
Form_pg_subscription Form_pg_subscription
Form_pg_subscription_rel Form_pg_subscription_rel
Form_pg_tablespace Form_pg_tablespace
......
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