external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix_timeout

pull/7377/head
Jelte Fennema-Nio 2024-01-10 11:31:11 +01:00 committed by GitHub
parent 0d4e7178e5 8e979f7ac6
commit 6d3453efd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/metadata/metadata_cache.c
View File

@ -381,7 +381,7 @@ EnsureModificationsCanRun(void)
/* /*
* EnsureModificationsCanRunOnRelation firsts calls into EnsureModificationsCanRun() and * EnsureModificationsCanRunOnRelation first calls into EnsureModificationsCanRun() and
* then does one more additional check. The additional check is to give a proper error * then does one more additional check. The additional check is to give a proper error
* message if any relation that is modified is replicated, as replicated tables use * message if any relation that is modified is replicated, as replicated tables use
* 2PC and 2PC cannot happen when recovery is in progress. * 2PC and 2PC cannot happen when recovery is in progress.

6
src/backend/distributed/utils/colocation_utils.c
View File

@ -362,10 +362,8 @@ ErrorIfShardPlacementsNotColocated(Oid leftRelationId, Oid rightRelationId)
leftRelationName, rightRelationName))); leftRelationName, rightRelationName)));
} }
List *leftPlacementList = ShardPlacementListSortedByWorker( List *leftPlacementList = ShardPlacementList(leftShardId);
leftShardId); List *rightPlacementList = ShardPlacementList(rightShardId);
List *rightPlacementList = ShardPlacementListSortedByWorker(
rightShardId);
if (list_length(leftPlacementList) != list_length(rightPlacementList)) if (list_length(leftPlacementList) != list_length(rightPlacementList))
{ {

5
src/backend/distributed/utils/shardinterval_utils.c
View File

@ -470,12 +470,11 @@ SingleReplicatedTable(Oid relationId)
return false; return false;
} }
List *shardIntervalList = LoadShardList(relationId);
uint64 *shardIdPointer = NULL; uint64 *shardIdPointer = NULL;
foreach_ptr(shardIdPointer, shardIntervalList) foreach_ptr(shardIdPointer, shardList)
{ {
uint64 shardId = *shardIdPointer; uint64 shardId = *shardIdPointer;
shardPlacementList = ShardPlacementListSortedByWorker(shardId); shardPlacementList = ShardPlacementList(shardId);
if (list_length(shardPlacementList) != 1) if (list_length(shardPlacementList) != 1)
{ {