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

FIX THIS related to outer join checks, root->simple_rel_array 

(cherry picked from commit a2c8dc65ce)
naisila/user_arb_config
onderkalaci 2023-05-05 12:27:28 +03:00 committed by naisila
parent e3b512aa84
commit bd169080a8
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1267,6 +1267,20 @@ AddRteSubqueryToAttributeEquivalenceClass(AttributeEquivalenceClass
PlannerInfo *root, PlannerInfo *root,
Var *varToBeAdded) Var *varToBeAdded)
{ {
#if PG_VERSION_NUM >= PG_VERSION_16
if (root->simple_rel_array_size <= varToBeAdded->varno)
{
return;
}
RelOptInfo *rel = root->simple_rel_array[varToBeAdded->varno];
if (rel == NULL)
{
/* must be an outer join*/
return;
}
#endif
RelOptInfo *baseRelOptInfo = find_base_rel(root, varToBeAdded->varno); RelOptInfo *baseRelOptInfo = find_base_rel(root, varToBeAdded->varno);
Query *targetSubquery = GetTargetSubquery(root, rangeTableEntry, varToBeAdded); Query *targetSubquery = GetTargetSubquery(root, rangeTableEntry, varToBeAdded);
@ -1357,6 +1371,19 @@ GetTargetSubquery(PlannerInfo *root, RangeTblEntry *rangeTableEntry, Var *varToB
*/ */
if (!rangeTableEntry->inh) if (!rangeTableEntry->inh)
{ {
#if PG_VERSION_NUM >= PG_VERSION_16
if (root->simple_rel_array_size <= varToBeAdded->varno)
{
return NULL;
}
RelOptInfo *rel = root->simple_rel_array[varToBeAdded->varno];
if (rel == NULL)
{
/* must be an outer join*/
return NULL;
}
#endif
RelOptInfo *baseRelOptInfo = find_base_rel(root, varToBeAdded->varno); RelOptInfo *baseRelOptInfo = find_base_rel(root, varToBeAdded->varno);
/* If the targetSubquery was not planned, we have to punt */ /* If the targetSubquery was not planned, we have to punt */