pull/7555/head
EmelSimsek 2024-03-08 14:54:42 +03:00
parent c48bf5ebaa
commit 0620d62373
No known key found for this signature in database
GPG Key ID: EB13DFB77C32D7D8
2 changed files with 13 additions and 11 deletions

View File

@ -50,7 +50,7 @@
#include "distributed/version_compat.h"
#include "distributed/worker_protocol.h"
extern List *FullShardPlacementList(Oid relationId, ArrayType *excludedShardArray);
extern List * FullShardPlacementList(Oid relationId, ArrayType *excludedShardArray);
static char * PartitionBound(Oid partitionId);
static Relation try_relation_open_nolock(Oid relationId);
static List * CreateFixPartitionConstraintsTaskList(Oid relationId);
@ -558,7 +558,8 @@ CreateFixPartitionShardIndexNames(Oid parentRelationId, Oid partitionRelationId,
int taskId = 1;
List *shardPlacementList = FullShardPlacementList(parentRelationId, construct_empty_array(INT4OID));
List *shardPlacementList = FullShardPlacementList(parentRelationId,
construct_empty_array(INT4OID));
List *workerNodeList = ReadDistNode(true);
@ -566,15 +567,16 @@ CreateFixPartitionShardIndexNames(Oid parentRelationId, Oid partitionRelationId,
/* make sure we have deterministic output for our tests */
workerNodeList = SortList(workerNodeList, CompareWorkerNodes);
MemoryContext localContext = AllocSetContextCreate(CurrentMemoryContext, "CreateFixPartitionShardIndexNames",
ALLOCSET_DEFAULT_SIZES);
MemoryContext oldContext = MemoryContextSwitchTo(localContext);
MemoryContext localContext = AllocSetContextCreate(CurrentMemoryContext,
"CreateFixPartitionShardIndexNames",
ALLOCSET_DEFAULT_SIZES);
MemoryContext oldContext = MemoryContextSwitchTo(localContext);
WorkerNode *workerNode = NULL;
foreach_ptr(workerNode, workerNodeList)
{
List *shardsOnNode = FilterActiveShardPlacementListByNode(
shardPlacementList, workerNode);
shardPlacementList, workerNode);
ShardPlacement *shardPlacement = NULL;
@ -584,8 +586,8 @@ CreateFixPartitionShardIndexNames(Oid parentRelationId, Oid partitionRelationId,
List *queryStringList =
WorkerFixPartitionShardIndexNamesCommandList(parentShardId,
parentIndexIdList,
partitionRelationId);
parentIndexIdList,
partitionRelationId);
if (queryStringList != NIL)
{
Task *task = CitusMakeNode(Task);

View File

@ -222,6 +222,6 @@ extern void SetupRebalanceMonitor(List *placementUpdateList,
uint64 initialProgressState,
PlacementUpdateStatus initialStatus);
extern List *FullShardPlacementList(Oid relationId, ArrayType *excludedShardArray);
extern List * FullShardPlacementList(Oid relationId, ArrayType *excludedShardArray);
#endif /* SHARD_REBALANCER_H */