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

fix targetlist to prevent projection that failed

moonshot/custom-path
Nils Dijk 2020-01-28 16:08:34 +01:00
parent 5cef5b20a3
commit 2e178d21d6
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@
static Plan * CreateDistributedUnionPlan(PlannerInfo *root, RelOptInfo *rel, struct CustomPath *best_path, List *tlist, List *clauses, List *custom_plans); static Plan * CreateDistributedUnionPlan(PlannerInfo *root, RelOptInfo *rel, struct CustomPath *best_path, List *tlist, List *clauses, List *custom_plans);
static List * ReparameterizeDistributedUnion(PlannerInfo *root, List *custom_private, RelOptInfo *child_rel); static List * ReparameterizeDistributedUnion(PlannerInfo *root, List *custom_private, RelOptInfo *child_rel);
static CustomPath * WrapTableAccessWithDistributedUnion(Path *originalPath, uint32 colocationId, Expr *partitionValue, Oid sampleRelid); static CustomPath * WrapTableAccessWithDistributedUnion(Path *originalPath, uint32 colocationId, Expr *partitionValue, Oid sampleRelid);
static Index VarnoFromFirstTargetEntry(List *tlist);
static Query * GetQueryFromPath(PlannerInfo *root, Path *path, List *tlist, List *clauses); static Query * GetQueryFromPath(PlannerInfo *root, Path *path, List *tlist, List *clauses);
static List * ShardIntervalListToRelationShardList(List *shardIntervalList); static List * ShardIntervalListToRelationShardList(List *shardIntervalList);
static Path * OptimizeJoinPath(Path *originalPath); static Path * OptimizeJoinPath(Path *originalPath);
@ -140,7 +139,8 @@ CreateDistributedUnionPlan(PlannerInfo *root,
distributedPlan->hasReturning = true; distributedPlan->hasReturning = true;
CustomScan *plan = makeNode(CustomScan); CustomScan *plan = makeNode(CustomScan);
plan->scan.scanrelid = VarnoFromFirstTargetEntry(tlist); plan->scan.scanrelid = 0;
plan->custom_scan_tlist = tlist;
plan->flags = best_path->flags; plan->flags = best_path->flags;
plan->methods = &AdaptiveExecutorCustomScanMethods; plan->methods = &AdaptiveExecutorCustomScanMethods;
plan->custom_private = list_make1(distributedPlan); plan->custom_private = list_make1(distributedPlan);
@ -566,15 +566,6 @@ GetQueryFromPath(PlannerInfo *root, Path *path, List *tlist, List *clauses)
} }
static Index
VarnoFromFirstTargetEntry(List *tlist)
{
TargetEntry *entry = linitial_node(TargetEntry, tlist);
Var *var = castNode(Var, entry->expr);
return var->varno;
}
void void
PathBasedPlannedUpperPathHook(PlannerInfo *root, PathBasedPlannedUpperPathHook(PlannerInfo *root,
UpperRelationKind stage, UpperRelationKind stage,
@ -694,17 +685,26 @@ CanOptimizeAggPath(PlannerInfo *root, AggPath *apath)
*/ */
foreach_ptr(sgc, apath->groupClause) foreach_ptr(sgc, apath->groupClause)
{ {
PathKey *groupKey = list_nth_node(PathKey, root->group_pathkeys, sgc->tleSortGroupRef - 1); PathTarget *target = apath->path.pathtarget;
EquivalenceMember *ec_member = NULL; Expr *targetExpr = NULL;
foreach_ptr(ec_member, groupKey->pk_eclass->ec_members) Index i = 0;
foreach_ptr(targetExpr, target->exprs)
{ {
if (!IsA(ec_member->em_expr, Var)) Index targetSortGroupRef = target->sortgrouprefs[i];
i++;
if (targetSortGroupRef != sgc->tleSortGroupRef)
{ {
continue; continue;
} }
Var *ec_var = castNode(Var, ec_member->em_expr); if (!IsA(targetExpr, Var))
Index rteIndex = ec_var->varno; {
continue;
}
Var *targetVar = castNode(Var, targetExpr);
Index rteIndex = targetVar->varno;
RangeTblEntry *rte = root->simple_rte_array[rteIndex]; RangeTblEntry *rte = root->simple_rte_array[rteIndex];
DistTableCacheEntry *cacheEntry = DistributedTableCacheEntry(rte->relid); DistTableCacheEntry *cacheEntry = DistributedTableCacheEntry(rte->relid);
@ -714,7 +714,7 @@ CanOptimizeAggPath(PlannerInfo *root, AggPath *apath)
continue; continue;
} }
if (cacheEntry->partitionColumn->varattno == ec_var->varno) if (cacheEntry->partitionColumn->varattno == targetVar->varattno)
{ {
/* /*
* grouping column contains the distribution column of a distributed * grouping column contains the distribution column of a distributed