From 3b1dbed8d05aea45f92db49b39060d5a4eedb967 Mon Sep 17 00:00:00 2001 From: Nitish Upreti Date: Mon, 15 Aug 2022 16:26:56 -0700 Subject: [PATCH] Reindent --- src/backend/distributed/commands/grant.c | 3 ++- src/backend/distributed/commands/rename.c | 3 ++- src/backend/distributed/metadata/metadata_cache.c | 6 ++++-- src/backend/distributed/metadata/metadata_sync.c | 2 +- .../distributed/metadata/metadata_utility.c | 14 +++++++++----- .../distributed/operations/delete_protocol.c | 3 ++- src/backend/distributed/operations/shard_split.c | 10 ++++++---- .../distributed/utils/shardinterval_utils.c | 1 + src/include/distributed/commands/utility_hook.h | 3 ++- 9 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/backend/distributed/commands/grant.c b/src/backend/distributed/commands/grant.c index b5fb1f0e4..9b41dc34e 100644 --- a/src/backend/distributed/commands/grant.c +++ b/src/backend/distributed/commands/grant.c @@ -162,7 +162,8 @@ PreprocessGrantStmt(Node *node, const char *queryString, { /* Propogate latest policies issue on deleted shards to avoid any potential issues */ bool includeOrphanedShards = true; - ddlJob->taskList = DDLTaskListExtended(relationId, ddlString.data, includeOrphanedShards); + ddlJob->taskList = DDLTaskListExtended(relationId, ddlString.data, + includeOrphanedShards); } ddlJobs = lappend(ddlJobs, ddlJob); diff --git a/src/backend/distributed/commands/rename.c b/src/backend/distributed/commands/rename.c index 657e62a9d..e8adedace 100644 --- a/src/backend/distributed/commands/rename.c +++ b/src/backend/distributed/commands/rename.c @@ -186,7 +186,8 @@ PreprocessRenameStmt(Node *node, const char *renameCommand, * try to delete the orphaned shard with the wrong (new) name. */ bool includeOrphanedShards = true; - ddlJob->taskList = DDLTaskListExtended(tableRelationId, renameCommand, includeOrphanedShards); + ddlJob->taskList = DDLTaskListExtended(tableRelationId, renameCommand, + includeOrphanedShards); return list_make1(ddlJob); } diff --git a/src/backend/distributed/metadata/metadata_cache.c b/src/backend/distributed/metadata/metadata_cache.c index 76e600e30..91b78933c 100644 --- a/src/backend/distributed/metadata/metadata_cache.c +++ b/src/backend/distributed/metadata/metadata_cache.c @@ -1592,7 +1592,8 @@ BuildCachedShardList(CitusTableCacheEntry *cacheEntry) /* Only load Active shards in the cache */ bool activeShardsOnly = true; - List *distShardTupleList = LookupDistShardTuples(cacheEntry->relationId, activeShardsOnly); + List *distShardTupleList = LookupDistShardTuples(cacheEntry->relationId, + activeShardsOnly); int shardIntervalArrayLength = list_length(distShardTupleList); if (shardIntervalArrayLength > 0) { @@ -4562,7 +4563,8 @@ LookupDistShardTuples(Oid relationId, bool activeShardsOnly) /* set scan arguments */ scanKey[0].sk_argument = ObjectIdGetDatum(relationId); - scanKey[1].sk_argument = (activeShardsOnly) ? SHARD_STATE_ACTIVE : SHARD_STATE_INVALID_LAST; + scanKey[1].sk_argument = (activeShardsOnly) ? SHARD_STATE_ACTIVE : + SHARD_STATE_INVALID_LAST; SysScanDesc scanDescriptor = systable_beginscan(pgDistShard, DistShardLogicalRelidIndexId(), true, diff --git a/src/backend/distributed/metadata/metadata_sync.c b/src/backend/distributed/metadata/metadata_sync.c index 2f94f2334..0395a304c 100644 --- a/src/backend/distributed/metadata/metadata_sync.c +++ b/src/backend/distributed/metadata/metadata_sync.c @@ -3271,7 +3271,7 @@ EnsureCoordinatorInitiatedOperation(void) */ static void EnsureShardMetadataIsSane(Oid relationId, int64 shardId, - char storageType, int shardState, + char storageType, int shardState, text *shardMinValue, text *shardMaxValue) { if (shardId <= INVALID_SHARD_ID) diff --git a/src/backend/distributed/metadata/metadata_utility.c b/src/backend/distributed/metadata/metadata_utility.c index 71c3c0ed2..acb259412 100644 --- a/src/backend/distributed/metadata/metadata_utility.c +++ b/src/backend/distributed/metadata/metadata_utility.c @@ -1081,10 +1081,12 @@ LoadShardIntervalList(Oid relationId) List * LoadShardIntervalListIncludingOrphansViaCatalog(Oid relationId) { - List *shardIntervalList = LoadUnsortedShardIntervalListIncludingOrphansViaCatalog(relationId); + List *shardIntervalList = LoadUnsortedShardIntervalListIncludingOrphansViaCatalog( + relationId); - // Transform into a temporary array to sort. - ShardInterval **shardIntervalArray = (ShardInterval **) PointerArrayFromList(shardIntervalList); + /* Transform into a temporary array to sort. */ + ShardInterval **shardIntervalArray = (ShardInterval **) PointerArrayFromList( + shardIntervalList); int shardIntervalArrayLength = list_length(shardIntervalList); /* @@ -1103,10 +1105,12 @@ LoadShardIntervalListIncludingOrphansViaCatalog(Oid relationId) shardIntervalArrayLength, cacheEntry->partitionColumn-> varcollid, - cacheEntry->shardIntervalCompareFunction); + cacheEntry-> + shardIntervalCompareFunction); } - List *sortedShardIntervalList = ShardArrayToList(sortedShardIntervalArray, shardIntervalArrayLength); + List *sortedShardIntervalList = ShardArrayToList(sortedShardIntervalArray, + shardIntervalArrayLength); return sortedShardIntervalList; } diff --git a/src/backend/distributed/operations/delete_protocol.c b/src/backend/distributed/operations/delete_protocol.c index 6fc2cb88e..9b113f1e9 100644 --- a/src/backend/distributed/operations/delete_protocol.c +++ b/src/backend/distributed/operations/delete_protocol.c @@ -139,7 +139,8 @@ citus_drop_all_shards(PG_FUNCTION_ARGS) */ LockRelationOid(relationId, AccessExclusiveLock); - List *shardIntervalList = LoadUnsortedShardIntervalListIncludingOrphansViaCatalog(relationId); + List *shardIntervalList = LoadUnsortedShardIntervalListIncludingOrphansViaCatalog( + relationId); int droppedShardCount = DropShards(relationId, schemaName, relationName, shardIntervalList, dropShardsMetadataOnly); diff --git a/src/backend/distributed/operations/shard_split.c b/src/backend/distributed/operations/shard_split.c index 8a672ca55..d69119f68 100644 --- a/src/backend/distributed/operations/shard_split.c +++ b/src/backend/distributed/operations/shard_split.c @@ -576,6 +576,7 @@ BlockingShardSplit(SplitOperation splitOperation, */ DropShardList(sourceColocatedShardIntervalList); } + /* Insert new shard and placement metdata */ InsertSplitChildrenShardMetadata(shardGroupSplitIntervalListList, workersForPlacementList); @@ -1188,6 +1189,7 @@ MarkShardListWithPlacementsForDrop(List *shardIntervalList) } } + /* * DropShardList drops shards and their metadata from both the coordinator and * mx nodes. @@ -1492,10 +1494,10 @@ NonBlockingShardSplit(SplitOperation splitOperation, else { /* - * 18) Drop old shards and delete related metadata. Have to do that before - * creating the new shard metadata, because there's cross-checks - * preventing inconsistent metadata (like overlapping shards). - */ + * 18) Drop old shards and delete related metadata. Have to do that before + * creating the new shard metadata, because there's cross-checks + * preventing inconsistent metadata (like overlapping shards). + */ DropShardList(sourceColocatedShardIntervalList); } diff --git a/src/backend/distributed/utils/shardinterval_utils.c b/src/backend/distributed/utils/shardinterval_utils.c index dcd8f0336..7d995e0f8 100644 --- a/src/backend/distributed/utils/shardinterval_utils.c +++ b/src/backend/distributed/utils/shardinterval_utils.c @@ -486,6 +486,7 @@ SingleReplicatedTable(Oid relationId) return true; } + /* * ShardArrayToList builds a list of out the array of ShardInterval*. */ diff --git a/src/include/distributed/commands/utility_hook.h b/src/include/distributed/commands/utility_hook.h index 9b7e53d53..48ce28383 100644 --- a/src/include/distributed/commands/utility_hook.h +++ b/src/include/distributed/commands/utility_hook.h @@ -95,7 +95,8 @@ extern void ProcessUtilityParseTree(Node *node, const char *queryString, extern void MarkInvalidateForeignKeyGraph(void); extern void InvalidateForeignKeyGraphForDDL(void); extern List * DDLTaskList(Oid relationId, const char *commandString); -extern List * DDLTaskListExtended(Oid relationId, const char *commandString, bool includeOrphanedShards); +extern List * DDLTaskListExtended(Oid relationId, const char *commandString, bool + includeOrphanedShards); extern List * NodeDDLTaskList(TargetWorkerSet targets, List *commands); extern bool AlterTableInProgress(void); extern bool DropSchemaOrDBInProgress(void);