mirror of
https://github.com/postgres/postgres.git
synced 2025-11-22 12:22:45 +03:00
Initial pgindent run for v12.
This is still using the 2.0 version of pg_bsd_indent. I thought it would be good to commit this separately, so as to document the differences between 2.0 and 2.1 behavior. Discussion: https://postgr.es/m/16296.1558103386@sss.pgh.pa.us
This commit is contained in:
@@ -1236,8 +1236,7 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, const char
|
||||
Anum_pg_class_reloptions, &isnull);
|
||||
|
||||
/*
|
||||
* Extract the list of column names to be used for the index
|
||||
* creation.
|
||||
* Extract the list of column names to be used for the index creation.
|
||||
*/
|
||||
for (int i = 0; i < indexInfo->ii_NumIndexAttrs; i++)
|
||||
{
|
||||
@@ -1270,8 +1269,8 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, const char
|
||||
optionDatum,
|
||||
INDEX_CREATE_SKIP_BUILD | INDEX_CREATE_CONCURRENT,
|
||||
0,
|
||||
true, /* allow table to be a system catalog? */
|
||||
false, /* is_internal? */
|
||||
true, /* allow table to be a system catalog? */
|
||||
false, /* is_internal? */
|
||||
NULL);
|
||||
|
||||
/* Close the relations used and clean up */
|
||||
@@ -1540,7 +1539,7 @@ index_concurrently_swap(Oid newIndexId, Oid oldIndexId, const char *oldName)
|
||||
values, nulls, replaces);
|
||||
CatalogTupleUpdate(description, &tuple->t_self, tuple);
|
||||
|
||||
break; /* Assume there can be only one match */
|
||||
break; /* Assume there can be only one match */
|
||||
}
|
||||
|
||||
systable_endscan(sd);
|
||||
@@ -1552,8 +1551,8 @@ index_concurrently_swap(Oid newIndexId, Oid oldIndexId, const char *oldName)
|
||||
*/
|
||||
if (get_rel_relispartition(oldIndexId))
|
||||
{
|
||||
List *ancestors = get_partition_ancestors(oldIndexId);
|
||||
Oid parentIndexRelid = linitial_oid(ancestors);
|
||||
List *ancestors = get_partition_ancestors(oldIndexId);
|
||||
Oid parentIndexRelid = linitial_oid(ancestors);
|
||||
|
||||
DeleteInheritsTuple(oldIndexId, parentIndexRelid);
|
||||
StoreSingleInheritance(newIndexId, parentIndexRelid, 1);
|
||||
@@ -1583,7 +1582,11 @@ index_concurrently_swap(Oid newIndexId, Oid oldIndexId, const char *oldName)
|
||||
newClassRel->pgstat_info->t_counts.t_tuples_fetched = tabentry->tuples_fetched;
|
||||
newClassRel->pgstat_info->t_counts.t_blocks_fetched = tabentry->blocks_fetched;
|
||||
newClassRel->pgstat_info->t_counts.t_blocks_hit = tabentry->blocks_hit;
|
||||
/* The data will be sent by the next pgstat_report_stat() call. */
|
||||
|
||||
/*
|
||||
* The data will be sent by the next pgstat_report_stat()
|
||||
* call.
|
||||
*/
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1614,27 +1617,26 @@ index_concurrently_set_dead(Oid heapId, Oid indexId)
|
||||
Relation userIndexRelation;
|
||||
|
||||
/*
|
||||
* No more predicate locks will be acquired on this index, and we're
|
||||
* about to stop doing inserts into the index which could show
|
||||
* conflicts with existing predicate locks, so now is the time to move
|
||||
* them to the heap relation.
|
||||
* No more predicate locks will be acquired on this index, and we're about
|
||||
* to stop doing inserts into the index which could show conflicts with
|
||||
* existing predicate locks, so now is the time to move them to the heap
|
||||
* relation.
|
||||
*/
|
||||
userHeapRelation = table_open(heapId, ShareUpdateExclusiveLock);
|
||||
userIndexRelation = index_open(indexId, ShareUpdateExclusiveLock);
|
||||
TransferPredicateLocksToHeapRelation(userIndexRelation);
|
||||
|
||||
/*
|
||||
* Now we are sure that nobody uses the index for queries; they just
|
||||
* might have it open for updating it. So now we can unset indisready
|
||||
* and indislive, then wait till nobody could be using it at all
|
||||
* anymore.
|
||||
* Now we are sure that nobody uses the index for queries; they just might
|
||||
* have it open for updating it. So now we can unset indisready and
|
||||
* indislive, then wait till nobody could be using it at all anymore.
|
||||
*/
|
||||
index_set_state_flags(indexId, INDEX_DROP_SET_DEAD);
|
||||
|
||||
/*
|
||||
* Invalidate the relcache for the table, so that after this commit
|
||||
* all sessions will refresh the table's index list. Forgetting just
|
||||
* the index's relcache entry is not enough.
|
||||
* Invalidate the relcache for the table, so that after this commit all
|
||||
* sessions will refresh the table's index list. Forgetting just the
|
||||
* index's relcache entry is not enough.
|
||||
*/
|
||||
CacheInvalidateRelcache(userHeapRelation);
|
||||
|
||||
@@ -1786,7 +1788,7 @@ index_constraint_create(Relation heapRelation,
|
||||
*/
|
||||
if (OidIsValid(parentConstraintId))
|
||||
{
|
||||
ObjectAddress referenced;
|
||||
ObjectAddress referenced;
|
||||
|
||||
ObjectAddressSet(referenced, ConstraintRelationId, parentConstraintId);
|
||||
recordDependencyOn(&myself, &referenced, DEPENDENCY_PARTITION_PRI);
|
||||
@@ -2709,7 +2711,7 @@ index_build(Relation heapRelation,
|
||||
PROGRESS_SCAN_BLOCKS_DONE,
|
||||
PROGRESS_SCAN_BLOCKS_TOTAL
|
||||
};
|
||||
const int64 val[] = {
|
||||
const int64 val[] = {
|
||||
PROGRESS_CREATEIDX_PHASE_BUILD,
|
||||
PROGRESS_CREATEIDX_SUBPHASE_INITIALIZE,
|
||||
0, 0, 0, 0
|
||||
@@ -3014,10 +3016,11 @@ validate_index(Oid heapId, Oid indexId, Snapshot snapshot)
|
||||
PROGRESS_SCAN_BLOCKS_DONE,
|
||||
PROGRESS_SCAN_BLOCKS_TOTAL
|
||||
};
|
||||
const int64 val[] = {
|
||||
const int64 val[] = {
|
||||
PROGRESS_CREATEIDX_PHASE_VALIDATE_IDXSCAN,
|
||||
0, 0, 0, 0
|
||||
};
|
||||
|
||||
pgstat_progress_update_multi_param(5, index, val);
|
||||
}
|
||||
|
||||
@@ -3080,7 +3083,7 @@ validate_index(Oid heapId, Oid indexId, Snapshot snapshot)
|
||||
PROGRESS_SCAN_BLOCKS_DONE,
|
||||
PROGRESS_SCAN_BLOCKS_TOTAL
|
||||
};
|
||||
const int64 val[] = {
|
||||
const int64 val[] = {
|
||||
PROGRESS_CREATEIDX_PHASE_VALIDATE_SORT,
|
||||
0, 0
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user