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

Decide what to do with router planner error at one place (#6781)

pull/6754/head^2
Onur Tirtir 2023-03-21 14:04:07 +03:00 committed by GitHub
parent aa33988c6e
commit aa465b6de1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/distributed/planner/distributed_planner.c
View File

@ -944,18 +944,6 @@ CreateDistributedPlan(uint64 planId, bool allowRecursivePlanning, Query *origina
distributedPlan = distributedPlan =
CreateModifyPlan(originalQuery, query, plannerRestrictionContext); CreateModifyPlan(originalQuery, query, plannerRestrictionContext);
} }
/* the functions above always return a plan, possibly with an error */
Assert(distributedPlan);
if (distributedPlan->planningError == NULL)
{
return distributedPlan;
}
else
{
RaiseDeferredError(distributedPlan->planningError, DEBUG2);
}
} }
else else
{ {
@ -968,19 +956,19 @@ CreateDistributedPlan(uint64 planId, bool allowRecursivePlanning, Query *origina
distributedPlan = CreateRouterPlan(originalQuery, query, distributedPlan = CreateRouterPlan(originalQuery, query,
plannerRestrictionContext); plannerRestrictionContext);
}
/* the functions above always return a plan, possibly with an error */
Assert(distributedPlan);
if (distributedPlan->planningError == NULL) if (distributedPlan->planningError == NULL)
{ {
return distributedPlan; return distributedPlan;
} }
else else
{ {
/*
* For debugging it's useful to display why query was not
* router plannable.
*/
RaiseDeferredError(distributedPlan->planningError, DEBUG2); RaiseDeferredError(distributedPlan->planningError, DEBUG2);
} }
}
if (hasUnresolvedParams) if (hasUnresolvedParams)
{ {