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

propagate partition value during joins

moonshot/custom-path
Nils Dijk 2020-01-24 00:48:13 +01:00
parent 30d9380f46
commit e570149c0a
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/backend/distributed/planner/path_based_planner.c
View File

@ -226,8 +226,9 @@ PathBasedPlannerRelationHook(PlannerInfo *root,
/* the distirbuted table has a partition key, lets check filters if there is a value */ /* the distirbuted table has a partition key, lets check filters if there is a value */
if (partitionKey != NULL) if (partitionKey != NULL)
{ {
/* TODO set correct varattno for multi table queries*/ /* use the first rel id included in this relation */
partitionKey->varattno = 1; partitionKey->varno = bms_next_member(relOptInfo->relids, -1);
Assert(bms_num_members(relOptInfo->relids) == 1);
partitionValue = ExtractPartitionValue(relOptInfo->baserestrictinfo, partitionKey); partitionValue = ExtractPartitionValue(relOptInfo->baserestrictinfo, partitionKey);
} }
@ -307,7 +308,12 @@ CanOptimizeJoinPath(JoinPath *jpath)
return false; return false;
} }
/* TODO check if join is on distribution column, assume for now */ if (!equal(innerDU->partitionValue, outerDU->partitionValue))
{
/* TODO this is most likely too strict, but if the values are strictly the same we can easily take one during merging */
return false;
}
return true; return true;
} }
@ -324,7 +330,9 @@ OptimizeJoinPath(Path *originalPath)
if (CanOptimizeJoinPath(jpath)) if (CanOptimizeJoinPath(jpath))
{ {
/* we can only optimize the Distributed union if the colocationId's are the same, taking any would suffice */ /* we can only optimize the Distributed union if the colocationId's are the same, taking any would suffice */
uint32 colocationId = ((DistributedUnionPath *) jpath->innerjoinpath)->colocationId; DistributedUnionPath *baseDistUnion = (DistributedUnionPath *) jpath->innerjoinpath;
uint32 colocationId = baseDistUnion->colocationId;
Expr *partitionValue = baseDistUnion->partitionValue;
jpath->innerjoinpath = ((DistributedUnionPath *) jpath->innerjoinpath)->worker_path; jpath->innerjoinpath = ((DistributedUnionPath *) jpath->innerjoinpath)->worker_path;
jpath->outerjoinpath = ((DistributedUnionPath *) jpath->outerjoinpath)->worker_path; jpath->outerjoinpath = ((DistributedUnionPath *) jpath->outerjoinpath)->worker_path;
@ -333,7 +341,10 @@ OptimizeJoinPath(Path *originalPath)
jpath->path.startup_cost -= 2000; /* remove the double dist union cost */ jpath->path.startup_cost -= 2000; /* remove the double dist union cost */
jpath->path.total_cost -= 2000; /* remove the double dist union cost */ jpath->path.total_cost -= 2000; /* remove the double dist union cost */
return (Path *) WrapTableAccessWithDistributedUnion((Path *) jpath, colocationId, NULL); return (Path *) WrapTableAccessWithDistributedUnion(
(Path *) jpath,
colocationId,
partitionValue);
} }
} }