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

fix, the ommission of reference table colocation group unders certain circumstances because it breaks tests

onder/fix/reference-lock-contention
Nils Dijk 2022-08-12 15:17:33 +02:00
parent 5f73e44d7c
commit 4a290560b2
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/commands/create_distributed_table.c
View File

@ -527,7 +527,7 @@ CreateDistributedTable(Oid relationId, char *distributionColumnName,
* This function does not expect to create Citus local table, so we blindly * This function does not expect to create Citus local table, so we blindly
* create reference table when the method is DISTRIBUTE_BY_NONE. * create reference table when the method is DISTRIBUTE_BY_NONE.
*/ */
CreateReferenceTableShard(relationId, colocatedTableId); CreateReferenceTableShard(relationId);
} }
if (ShouldSyncTableMetadata(relationId)) if (ShouldSyncTableMetadata(relationId))

5
src/backend/distributed/commands/table.c
View File

@ -158,7 +158,10 @@ PreprocessDropTableStmt(Node *node, const char *queryString,
* prevent concurrent mutations to the placements of the shard groups. * prevent concurrent mutations to the placements of the shard groups.
*/ */
CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId); CitusTableCacheEntry *cacheEntry = GetCitusTableCacheEntry(relationId);
LockColocationId(cacheEntry->colocationId, ShareLock); if (cacheEntry->colocationId != INVALID_COLOCATION_ID)
{
LockColocationId(cacheEntry->colocationId, ShareLock);
}
/* invalidate foreign key cache if the table involved in any foreign key */ /* invalidate foreign key cache if the table involved in any foreign key */
if ((TableReferenced(relationId) || TableReferencing(relationId))) if ((TableReferenced(relationId) || TableReferencing(relationId)))

2
src/backend/distributed/operations/create_shards.c
View File

@ -326,7 +326,7 @@ CreateColocatedShards(Oid targetRelationId, Oid sourceRelationId, bool
* Also, the shard is replicated to the all active nodes in the cluster. * Also, the shard is replicated to the all active nodes in the cluster.
*/ */
void void
CreateReferenceTableShard(Oid distributedTableId, Oid colocatedTableId) CreateReferenceTableShard(Oid distributedTableId)
{ {
int workerStartIndex = 0; int workerStartIndex = 0;
text *shardMinValue = NULL; text *shardMinValue = NULL;

8
src/backend/distributed/utils/reference_table_utils.c
View File

@ -99,13 +99,7 @@ EnsureReferenceTablesExistOnAllNodesExtended(char transferMode)
uint64 shardId = INVALID_SHARD_ID; uint64 shardId = INVALID_SHARD_ID;
List *newWorkersList = NIL; List *newWorkersList = NIL;
const char *referenceTableName = NULL; const char *referenceTableName = NULL;
int colocationId = GetReferenceTableColocationId(); int colocationId = CreateReferenceTableColocationId();
if (colocationId == INVALID_COLOCATION_ID)
{
/* no colocation for reference tables available */
return;
}
/* /*
* Most of the time this function should result in a conclusion where we do not need * Most of the time this function should result in a conclusion where we do not need

2
src/include/distributed/coordinator_protocol.h
View File

@ -249,7 +249,7 @@ extern void CreateShardsWithRoundRobinPolicy(Oid distributedTableId, int32 shard
bool useExclusiveConnections); bool useExclusiveConnections);
extern void CreateColocatedShards(Oid targetRelationId, Oid sourceRelationId, extern void CreateColocatedShards(Oid targetRelationId, Oid sourceRelationId,
bool useExclusiveConnections); bool useExclusiveConnections);
extern void CreateReferenceTableShard(Oid distributedTableId, Oid colocatedTableId); extern void CreateReferenceTableShard(Oid distributedTableId);
extern List * WorkerCreateShardCommandList(Oid relationId, int shardIndex, uint64 shardId, extern List * WorkerCreateShardCommandList(Oid relationId, int shardIndex, uint64 shardId,
List *ddlCommandList, List *ddlCommandList,
List *foreignConstraintCommandList); List *foreignConstraintCommandList);