mirror of https://github.com/citusdata/citus.git
Decide what to do with router planner error at one place (#6781)
parent
aa33988c6e
commit
aa465b6de1
|
@ -944,18 +944,6 @@ CreateDistributedPlan(uint64 planId, bool allowRecursivePlanning, Query *origina
|
|||
distributedPlan =
|
||||
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
|
||||
{
|
||||
|
@ -968,18 +956,18 @@ CreateDistributedPlan(uint64 planId, bool allowRecursivePlanning, Query *origina
|
|||
|
||||
distributedPlan = CreateRouterPlan(originalQuery, query,
|
||||
plannerRestrictionContext);
|
||||
if (distributedPlan->planningError == NULL)
|
||||
{
|
||||
return distributedPlan;
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* For debugging it's useful to display why query was not
|
||||
* router plannable.
|
||||
*/
|
||||
RaiseDeferredError(distributedPlan->planningError, DEBUG2);
|
||||
}
|
||||
}
|
||||
|
||||
/* the functions above always return a plan, possibly with an error */
|
||||
Assert(distributedPlan);
|
||||
|
||||
if (distributedPlan->planningError == NULL)
|
||||
{
|
||||
return distributedPlan;
|
||||
}
|
||||
else
|
||||
{
|
||||
RaiseDeferredError(distributedPlan->planningError, DEBUG2);
|
||||
}
|
||||
|
||||
if (hasUnresolvedParams)
|
||||
|
|
Loading…
Reference in New Issue