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

Make clear that IsTableLocallyAccessible is only for citus local tables (#5075) 

The name and comment of this function did not indicate that it only
really could detect locally accessible citus local tables. This fixes
that, while also cleaning up the function a bit.
pull/4994/head
Jelte Fennema 2021-06-28 11:47:21 +02:00 committed by GitHub
parent fe5907ad2d
commit 802225940e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/backend/distributed/planner/multi_router_planner.c
View File

@ -174,7 +174,7 @@ static void ReorderTaskPlacementsByTaskAssignmentPolicy(Job *job,
List *placementList); List *placementList);
static bool ModifiesLocalTableWithRemoteCitusLocalTable(List *rangeTableList); static bool ModifiesLocalTableWithRemoteCitusLocalTable(List *rangeTableList);
static DeferredErrorMessage * DeferErrorIfUnsupportedLocalTableJoin(List *rangeTableList); static DeferredErrorMessage * DeferErrorIfUnsupportedLocalTableJoin(List *rangeTableList);
static bool IsTableLocallyAccessible(Oid relationId); static bool IsLocallyAccessibleCitusLocalTable(Oid relationId);
/* /*
@ -794,7 +794,7 @@ ModifiesLocalTableWithRemoteCitusLocalTable(List *rangeTableList)
} }
if (IsCitusTableType(rangeTableEntry->relid, CITUS_LOCAL_TABLE)) if (IsCitusTableType(rangeTableEntry->relid, CITUS_LOCAL_TABLE))
{ {
if (!IsTableLocallyAccessible(rangeTableEntry->relid)) if (!IsLocallyAccessibleCitusLocalTable(rangeTableEntry->relid))
{ {
containsRemoteCitusLocalTable = true; containsRemoteCitusLocalTable = true;
} }
@ -809,19 +809,23 @@ ModifiesLocalTableWithRemoteCitusLocalTable(List *rangeTableList)
/* /*
* IsTableLocallyAccessible returns true if the given table * IsLocallyAccessibleCitusLocalTable returns true if the given table
* can be accessed in local. * is a citus local table that can be accessed using local execution.
*/ */
static bool static bool
IsTableLocallyAccessible(Oid relationId) IsLocallyAccessibleCitusLocalTable(Oid relationId)
{ {
if (!IsCitusTable(relationId)) if (!IsCitusTableType(relationId, CITUS_LOCAL_TABLE))
{ {
/* local tables are locally accessible */ return false;
return true;
} }
List *shardIntervalList = LoadShardIntervalList(relationId); List *shardIntervalList = LoadShardIntervalList(relationId);
/*
* Citus local tables should always have exactly one shard, but we have
* this check for safety.
*/
if (list_length(shardIntervalList) != 1) if (list_length(shardIntervalList) != 1)
{ {
return false; return false;
@ -831,12 +835,7 @@ IsTableLocallyAccessible(Oid relationId)
uint64 shardId = shardInterval->shardId; uint64 shardId = shardInterval->shardId;
ShardPlacement *localShardPlacement = ShardPlacement *localShardPlacement =
ShardPlacementOnGroup(shardId, GetLocalGroupId()); ShardPlacementOnGroup(shardId, GetLocalGroupId());
if (localShardPlacement != NULL) return localShardPlacement != NULL;
{
/* the table has a placement on this node */
return true;
}
return false;
} }