open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix pull_varnos' miscomputation of relids set for a PlaceHolderVar.

Browse Source 
Previously, pull_varnos() took the relids of a PlaceHolderVar as being
equal to the relids in its contents, but that fails to account for the
possibility that we have to postpone evaluation of the PHV due to outer
joins.  This could result in a malformed plan.  The known cases end up
triggering the "failed to assign all NestLoopParams to plan nodes"
sanity check in createplan.c, but other symptoms may be possible.

The right value to use is the join level we actually intend to evaluate
the PHV at.  We can get that from the ph_eval_at field of the associated
PlaceHolderInfo.  However, there are some places that call pull_varnos()
before the PlaceHolderInfos have been created; in that case, fall back
to the conservative assumption that the PHV will be evaluated at its
syntactic level.  (In principle this might result in missing some legal
optimization, but I'm not aware of any cases where it's an issue in
practice.)  Things are also a bit ticklish for calls occurring during
deconstruct_jointree(), but AFAICS the ph_eval_at fields should have
reached their final values by the time we need them.

The main problem in making this work is that pull_varnos() has no
way to get at the PlaceHolderInfos.  We can fix that easily, if a
bit tediously, in HEAD by passing it the planner "root" pointer.
In the back branches that'd cause an unacceptable API/ABI break for
extensions, so leave the existing entry points alone and add new ones
with the additional parameter.  (If an old entry point is called and
encounters a PHV, it'll fall back to using the syntactic level,
again possibly missing some valid optimization.)

Back-patch to v12.  The computation is surely also wrong before that,
but it appears that we cannot reach a bad plan thanks to join order
restrictions imposed on the subquery that the PlaceHolderVar came from.
The error only became reachable when commit 4be058fe9 allowed trivial
subqueries to be collapsed out completely, eliminating their join order
restrictions.

Per report from Stephan Springl.

Discussion: https://postgr.es/m/171041.1610849523@sss.pgh.pa.us
pull/71/head
Tom Lane 5 years ago
parent 6671e81946
commit 73fc2e5bab
25 changed files with 358 additions and 117 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      contrib/postgres_fdw/postgres_fdw.c
  2. 15
      src/backend/optimizer/path/clausesel.c
  3. 5
      src/backend/optimizer/path/costsize.c
  4. 21
      src/backend/optimizer/path/equivclass.c
  5. 71
      src/backend/optimizer/path/indxpath.c
  6. 2
      src/backend/optimizer/path/pathkeys.c
  7. 21
      src/backend/optimizer/path/tidpath.c
  8. 5
      src/backend/optimizer/plan/analyzejoins.c
  9. 30
      src/backend/optimizer/plan/initsplan.c
  10. 7
      src/backend/optimizer/plan/subselect.c
  11. 44
      src/backend/optimizer/prep/prepjointree.c
  12. 11
      src/backend/optimizer/util/clauses.c
  13. 8
      src/backend/optimizer/util/inherit.c
  14. 6
      src/backend/optimizer/util/orclauses.c
  15. 5
      src/backend/optimizer/util/placeholder.c
  16. 61
      src/backend/optimizer/util/restrictinfo.c
  17. 77
      src/backend/optimizer/util/var.c
  18. 8
      src/backend/utils/adt/selfuncs.c
  19. 1
      src/include/optimizer/clauses.h
  20. 4
      src/include/optimizer/optimizer.h
  21. 3
      src/include/optimizer/paths.h
  22. 3
      src/include/optimizer/planmain.h
  23. 9
      src/include/optimizer/restrictinfo.h
  24. 36
      src/test/regress/expected/join.out
  25. 16
      src/test/regress/sql/join.sql

6
contrib/postgres_fdw/postgres_fdw.c
Unescape View File

@ -45,6 +45,9 @@
#include "utils/sampling.h" #include "utils/sampling.h"
#include "utils/selfuncs.h" #include "utils/selfuncs.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define make_restrictinfo(a,b,c,d,e,f,g,h,i) make_restrictinfo_new(a,b,c,d,e,f,g,h,i)
PG_MODULE_MAGIC; PG_MODULE_MAGIC;
/* Default CPU cost to start up a foreign query. */ /* Default CPU cost to start up a foreign query. */
@ -5716,7 +5719,8 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel,
* RestrictInfos, so we must make our own. * RestrictInfos, so we must make our own.
*/ */
Assert(!IsA(expr, RestrictInfo)); Assert(!IsA(expr, RestrictInfo));
rinfo = make_restrictinfo(expr, rinfo = make_restrictinfo(root,
expr,
true, true,
false, false,
false, false,

15
src/backend/optimizer/path/clausesel.c
Unescape View File

@ -26,6 +26,9 @@
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/selfuncs.h" #include "utils/selfuncs.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define NumRelids(a,b) NumRelids_new(a,b)
/* /*
* Data structure for accumulating info about possible range-query * Data structure for accumulating info about possible range-query
* clause pairs in clauselist_selectivity. * clause pairs in clauselist_selectivity.
@ -235,7 +238,7 @@ clauselist_selectivity_simple(PlannerInfo *root,
} }
else else
{ {
ok = (NumRelids(clause) == 1) && ok = (NumRelids(root, clause) == 1) &&
(is_pseudo_constant_clause(lsecond(expr->args)) || (is_pseudo_constant_clause(lsecond(expr->args)) ||
(varonleft = false, (varonleft = false,
is_pseudo_constant_clause(linitial(expr->args)))); is_pseudo_constant_clause(linitial(expr->args))));
@ -519,7 +522,7 @@ bms_is_subset_singleton(const Bitmapset *s, int x)
* restriction or join estimator. Subroutine for clause_selectivity(). * restriction or join estimator. Subroutine for clause_selectivity().
*/ */
static inline bool static inline bool
treat_as_join_clause(Node *clause, RestrictInfo *rinfo, treat_as_join_clause(PlannerInfo *root, Node *clause, RestrictInfo *rinfo,
int varRelid, SpecialJoinInfo *sjinfo) int varRelid, SpecialJoinInfo *sjinfo)
{ {
if (varRelid != 0) if (varRelid != 0)
@ -553,7 +556,7 @@ treat_as_join_clause(Node *clause, RestrictInfo *rinfo,
if (rinfo) if (rinfo)
return (bms_membership(rinfo->clause_relids) == BMS_MULTIPLE); return (bms_membership(rinfo->clause_relids) == BMS_MULTIPLE);
else else
return (NumRelids(clause) > 1); return (NumRelids(root, clause) > 1);
} }
} }
@ -759,7 +762,7 @@ clause_selectivity(PlannerInfo *root,
OpExpr *opclause = (OpExpr *) clause; OpExpr *opclause = (OpExpr *) clause;
Oid opno = opclause->opno; Oid opno = opclause->opno;
if (treat_as_join_clause(clause, rinfo, varRelid, sjinfo)) if (treat_as_join_clause(root, clause, rinfo, varRelid, sjinfo))
{ {
/* Estimate selectivity for a join clause. */ /* Estimate selectivity for a join clause. */
s1 = join_selectivity(root, opno, s1 = join_selectivity(root, opno,
@ -795,7 +798,7 @@ clause_selectivity(PlannerInfo *root,
funcclause->funcid, funcclause->funcid,
funcclause->args, funcclause->args,
funcclause->inputcollid, funcclause->inputcollid,
treat_as_join_clause(clause, rinfo, treat_as_join_clause(root, clause, rinfo,
varRelid, sjinfo), varRelid, sjinfo),
varRelid, varRelid,
jointype, jointype,
@ -806,7 +809,7 @@ clause_selectivity(PlannerInfo *root,
/* Use node specific selectivity calculation function */ /* Use node specific selectivity calculation function */
s1 = scalararraysel(root, s1 = scalararraysel(root,
(ScalarArrayOpExpr *) clause, (ScalarArrayOpExpr *) clause,
treat_as_join_clause(clause, rinfo, treat_as_join_clause(root, clause, rinfo,
varRelid, sjinfo), varRelid, sjinfo),
varRelid, varRelid,
jointype, jointype,

5
src/backend/optimizer/path/costsize.c
Unescape View File

@ -98,6 +98,9 @@
#include "utils/tuplesort.h" #include "utils/tuplesort.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
#define LOG2(x) (log(x) / 0.693147180559945) #define LOG2(x) (log(x) / 0.693147180559945)
/* /*
@ -1848,7 +1851,7 @@ cost_incremental_sort(Path *path,
* Check if the expression contains Var with "varno 0" so that we * Check if the expression contains Var with "varno 0" so that we
* don't call estimate_num_groups in that case. * don't call estimate_num_groups in that case.
*/ */
if (bms_is_member(0, pull_varnos((Node *) member->em_expr))) if (bms_is_member(0, pull_varnos(root, (Node *) member->em_expr)))
{ {
unknown_varno = true; unknown_varno = true;
break; break;

21
src/backend/optimizer/path/equivclass.c
Unescape View File

@ -32,6 +32,10 @@
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
#define make_restrictinfo(a,b,c,d,e,f,g,h,i) make_restrictinfo_new(a,b,c,d,e,f,g,h,i)
static EquivalenceMember *add_eq_member(EquivalenceClass *ec, static EquivalenceMember *add_eq_member(EquivalenceClass *ec,
Expr *expr, Relids relids, Relids nullable_relids, Expr *expr, Relids relids, Relids nullable_relids,
bool is_child, Oid datatype); bool is_child, Oid datatype);
@ -195,7 +199,8 @@ process_equivalence(PlannerInfo *root,
ntest->location = -1; ntest->location = -1;
*p_restrictinfo = *p_restrictinfo =
make_restrictinfo((Expr *) ntest, make_restrictinfo(root,
(Expr *) ntest,
restrictinfo->is_pushed_down, restrictinfo->is_pushed_down,
restrictinfo->outerjoin_delayed, restrictinfo->outerjoin_delayed,
restrictinfo->pseudoconstant, restrictinfo->pseudoconstant,
@ -713,7 +718,7 @@ get_eclass_for_sort_expr(PlannerInfo *root,
/* /*
* Get the precise set of nullable relids appearing in the expression. * Get the precise set of nullable relids appearing in the expression.
*/ */
expr_relids = pull_varnos((Node *) expr); expr_relids = pull_varnos(root, (Node *) expr);
nullable_relids = bms_intersect(nullable_relids, expr_relids); nullable_relids = bms_intersect(nullable_relids, expr_relids);
newem = add_eq_member(newec, copyObject(expr), expr_relids, newem = add_eq_member(newec, copyObject(expr), expr_relids,
@ -1661,7 +1666,8 @@ create_join_clause(PlannerInfo *root,
*/ */
oldcontext = MemoryContextSwitchTo(root->planner_cxt); oldcontext = MemoryContextSwitchTo(root->planner_cxt);
rinfo = build_implied_join_equality(opno, rinfo = build_implied_join_equality(root,
opno,
ec->ec_collation, ec->ec_collation,
leftem->em_expr, leftem->em_expr,
rightem->em_expr, rightem->em_expr,
@ -1961,7 +1967,8 @@ reconsider_outer_join_clause(PlannerInfo *root, RestrictInfo *rinfo,
cur_em->em_datatype); cur_em->em_datatype);
if (!OidIsValid(eq_op)) if (!OidIsValid(eq_op))
continue; /* can't generate equality */ continue; /* can't generate equality */
newrinfo = build_implied_join_equality(eq_op, newrinfo = build_implied_join_equality(root,
eq_op,
cur_ec->ec_collation, cur_ec->ec_collation,
innervar, innervar,
cur_em->em_expr, cur_em->em_expr,
@ -2104,7 +2111,8 @@ reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
cur_em->em_datatype); cur_em->em_datatype);
if (OidIsValid(eq_op)) if (OidIsValid(eq_op))
{ {
newrinfo = build_implied_join_equality(eq_op, newrinfo = build_implied_join_equality(root,
eq_op,
cur_ec->ec_collation, cur_ec->ec_collation,
leftvar, leftvar,
cur_em->em_expr, cur_em->em_expr,
@ -2119,7 +2127,8 @@ reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
cur_em->em_datatype); cur_em->em_datatype);
if (OidIsValid(eq_op)) if (OidIsValid(eq_op))
{ {
newrinfo = build_implied_join_equality(eq_op, newrinfo = build_implied_join_equality(root,
eq_op,
cur_ec->ec_collation, cur_ec->ec_collation,
rightvar, rightvar,
cur_em->em_expr, cur_em->em_expr,

71
src/backend/optimizer/path/indxpath.c
Unescape View File

@ -36,6 +36,12 @@
#include "utils/selfuncs.h" #include "utils/selfuncs.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
#undef make_simple_restrictinfo
#define make_simple_restrictinfo(root, clause) \
make_restrictinfo_new(root, clause, true, false, false, 0, NULL, NULL, NULL)
/* XXX see PartCollMatchesExprColl */ /* XXX see PartCollMatchesExprColl */
#define IndexCollMatchesExprColl(idxcollation, exprcollation) \ #define IndexCollMatchesExprColl(idxcollation, exprcollation) \
((idxcollation) == InvalidOid || (idxcollation) == (exprcollation)) ((idxcollation) == InvalidOid || (idxcollation) == (exprcollation))
@ -153,7 +159,8 @@ static IndexClause *match_clause_to_indexcol(PlannerInfo *root,
RestrictInfo *rinfo, RestrictInfo *rinfo,
int indexcol, int indexcol,
IndexOptInfo *index); IndexOptInfo *index);
static IndexClause *match_boolean_index_clause(RestrictInfo *rinfo, static IndexClause *match_boolean_index_clause(PlannerInfo *root,
RestrictInfo *rinfo,
int indexcol, IndexOptInfo *index); int indexcol, IndexOptInfo *index);
static IndexClause *match_opclause_to_indexcol(PlannerInfo *root, static IndexClause *match_opclause_to_indexcol(PlannerInfo *root,
RestrictInfo *rinfo, RestrictInfo *rinfo,
@ -169,13 +176,16 @@ static IndexClause *get_index_clause_from_support(PlannerInfo *root,
int indexarg, int indexarg,
int indexcol, int indexcol,
IndexOptInfo *index); IndexOptInfo *index);
static IndexClause *match_saopclause_to_indexcol(RestrictInfo *rinfo, static IndexClause *match_saopclause_to_indexcol(PlannerInfo *root,
RestrictInfo *rinfo,
int indexcol, int indexcol,
IndexOptInfo *index); IndexOptInfo *index);
static IndexClause *match_rowcompare_to_indexcol(RestrictInfo *rinfo, static IndexClause *match_rowcompare_to_indexcol(PlannerInfo *root,
RestrictInfo *rinfo,
int indexcol, int indexcol,
IndexOptInfo *index); IndexOptInfo *index);
static IndexClause *expand_indexqual_rowcompare(RestrictInfo *rinfo, static IndexClause *expand_indexqual_rowcompare(PlannerInfo *root,
RestrictInfo *rinfo,
int indexcol, int indexcol,
IndexOptInfo *index, IndexOptInfo *index,
Oid expr_op, Oid expr_op,
@ -2305,7 +2315,7 @@ match_clause_to_indexcol(PlannerInfo *root,
opfamily = index->opfamily[indexcol]; opfamily = index->opfamily[indexcol];
if (IsBooleanOpfamily(opfamily)) if (IsBooleanOpfamily(opfamily))
{ {
iclause = match_boolean_index_clause(rinfo, indexcol, index); iclause = match_boolean_index_clause(root, rinfo, indexcol, index);
if (iclause) if (iclause)
return iclause; return iclause;
} }
@ -2325,11 +2335,11 @@ match_clause_to_indexcol(PlannerInfo *root,
} }
else if (IsA(clause, ScalarArrayOpExpr)) else if (IsA(clause, ScalarArrayOpExpr))
{ {
return match_saopclause_to_indexcol(rinfo, indexcol, index); return match_saopclause_to_indexcol(root, rinfo, indexcol, index);
} }
else if (IsA(clause, RowCompareExpr)) else if (IsA(clause, RowCompareExpr))
{ {
return match_rowcompare_to_indexcol(rinfo, indexcol, index); return match_rowcompare_to_indexcol(root, rinfo, indexcol, index);
} }
else if (index->amsearchnulls && IsA(clause, NullTest)) else if (index->amsearchnulls && IsA(clause, NullTest))
{ {
@ -2368,7 +2378,8 @@ match_clause_to_indexcol(PlannerInfo *root,
* index's key, and if so, build a suitable IndexClause. * index's key, and if so, build a suitable IndexClause.
*/ */
static IndexClause * static IndexClause *
match_boolean_index_clause(RestrictInfo *rinfo, match_boolean_index_clause(PlannerInfo *root,
RestrictInfo *rinfo,
int indexcol, int indexcol,
IndexOptInfo *index) IndexOptInfo *index)
{ {
@ -2438,7 +2449,7 @@ match_boolean_index_clause(RestrictInfo *rinfo,
IndexClause *iclause = makeNode(IndexClause); IndexClause *iclause = makeNode(IndexClause);
iclause->rinfo = rinfo; iclause->rinfo = rinfo;
iclause->indexquals = list_make1(make_simple_restrictinfo(op)); iclause->indexquals = list_make1(make_simple_restrictinfo(root, op));
iclause->lossy = false; iclause->lossy = false;
iclause->indexcol = indexcol; iclause->indexcol = indexcol;
iclause->indexcols = NIL; iclause->indexcols = NIL;
@ -2663,7 +2674,8 @@ get_index_clause_from_support(PlannerInfo *root,
{ {
Expr *clause = (Expr *) lfirst(lc); Expr *clause = (Expr *) lfirst(lc);
indexquals = lappend(indexquals, make_simple_restrictinfo(clause)); indexquals = lappend(indexquals,
make_simple_restrictinfo(root, clause));
} }
iclause->rinfo = rinfo; iclause->rinfo = rinfo;
@ -2684,7 +2696,8 @@ get_index_clause_from_support(PlannerInfo *root,
* which see for comments. * which see for comments.
*/ */
static IndexClause * static IndexClause *
match_saopclause_to_indexcol(RestrictInfo *rinfo, match_saopclause_to_indexcol(PlannerInfo *root,
RestrictInfo *rinfo,
int indexcol, int indexcol,
IndexOptInfo *index) IndexOptInfo *index)
{ {
@ -2703,7 +2716,7 @@ match_saopclause_to_indexcol(RestrictInfo *rinfo,
return NULL; return NULL;
leftop = (Node *) linitial(saop->args); leftop = (Node *) linitial(saop->args);
rightop = (Node *) lsecond(saop->args); rightop = (Node *) lsecond(saop->args);
right_relids = pull_varnos(rightop); right_relids = pull_varnos(root, rightop);
expr_op = saop->opno; expr_op = saop->opno;
expr_coll = saop->inputcollid; expr_coll = saop->inputcollid;
@ -2751,7 +2764,8 @@ match_saopclause_to_indexcol(RestrictInfo *rinfo,
* is handled by expand_indexqual_rowcompare(). * is handled by expand_indexqual_rowcompare().
*/ */
static IndexClause * static IndexClause *
match_rowcompare_to_indexcol(RestrictInfo *rinfo, match_rowcompare_to_indexcol(PlannerInfo *root,
RestrictInfo *rinfo,
int indexcol, int indexcol,
IndexOptInfo *index) IndexOptInfo *index)
{ {
@ -2796,14 +2810,14 @@ match_rowcompare_to_indexcol(RestrictInfo *rinfo,
* These syntactic tests are the same as in match_opclause_to_indexcol() * These syntactic tests are the same as in match_opclause_to_indexcol()
*/ */
if (match_index_to_operand(leftop, indexcol, index) && if (match_index_to_operand(leftop, indexcol, index) &&
!bms_is_member(index_relid, pull_varnos(rightop)) && !bms_is_member(index_relid, pull_varnos(root, rightop)) &&
!contain_volatile_functions(rightop)) !contain_volatile_functions(rightop))
{ {
/* OK, indexkey is on left */ /* OK, indexkey is on left */
var_on_left = true; var_on_left = true;
} }
else if (match_index_to_operand(rightop, indexcol, index) && else if (match_index_to_operand(rightop, indexcol, index) &&
!bms_is_member(index_relid, pull_varnos(leftop)) && !bms_is_member(index_relid, pull_varnos(root, leftop)) &&
!contain_volatile_functions(leftop)) !contain_volatile_functions(leftop))
{ {
/* indexkey is on right, so commute the operator */ /* indexkey is on right, so commute the operator */
@ -2822,7 +2836,8 @@ match_rowcompare_to_indexcol(RestrictInfo *rinfo,
case BTLessEqualStrategyNumber: case BTLessEqualStrategyNumber:
case BTGreaterEqualStrategyNumber: case BTGreaterEqualStrategyNumber:
case BTGreaterStrategyNumber: case BTGreaterStrategyNumber:
return expand_indexqual_rowcompare(rinfo, return expand_indexqual_rowcompare(root,
rinfo,
indexcol, indexcol,
index, index,
expr_op, expr_op,
@ -2856,7 +2871,8 @@ match_rowcompare_to_indexcol(RestrictInfo *rinfo,
* but we split it out for comprehensibility. * but we split it out for comprehensibility.
*/ */
static IndexClause * static IndexClause *
expand_indexqual_rowcompare(RestrictInfo *rinfo, expand_indexqual_rowcompare(PlannerInfo *root,
RestrictInfo *rinfo,
int indexcol, int indexcol,
IndexOptInfo *index, IndexOptInfo *index,
Oid expr_op, Oid expr_op,
@ -2926,7 +2942,7 @@ expand_indexqual_rowcompare(RestrictInfo *rinfo,
if (expr_op == InvalidOid) if (expr_op == InvalidOid)
break; /* operator is not usable */ break; /* operator is not usable */
} }
if (bms_is_member(index->rel->relid, pull_varnos(constop))) if (bms_is_member(index->rel->relid, pull_varnos(root, constop)))
break; /* no good, Var on wrong side */ break; /* no good, Var on wrong side */
if (contain_volatile_functions(constop)) if (contain_volatile_functions(constop))
break; /* no good, volatile comparison value */ break; /* no good, volatile comparison value */
@ -3036,7 +3052,8 @@ expand_indexqual_rowcompare(RestrictInfo *rinfo,
matching_cols); matching_cols);
rc->rargs = list_truncate(copyObject(non_var_args), rc->rargs = list_truncate(copyObject(non_var_args),
matching_cols); matching_cols);
iclause->indexquals = list_make1(make_simple_restrictinfo((Expr *) rc)); iclause->indexquals = list_make1(make_simple_restrictinfo(root,
(Expr *) rc));
} }
else else
{ {
@ -3050,7 +3067,7 @@ expand_indexqual_rowcompare(RestrictInfo *rinfo,
copyObject(linitial(non_var_args)), copyObject(linitial(non_var_args)),
InvalidOid, InvalidOid,
linitial_oid(clause->inputcollids)); linitial_oid(clause->inputcollids));
iclause->indexquals = list_make1(make_simple_restrictinfo(op)); iclause->indexquals = list_make1(make_simple_restrictinfo(root, op));
} }
} }
@ -3667,7 +3684,9 @@ relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel,
* specified index column matches a boolean restriction clause. * specified index column matches a boolean restriction clause.
*/ */
bool bool
indexcol_is_bool_constant_for_query(IndexOptInfo *index, int indexcol) indexcol_is_bool_constant_for_query(PlannerInfo *root,
IndexOptInfo *index,
int indexcol)
{ {
ListCell *lc; ListCell *lc;
@ -3689,7 +3708,7 @@ indexcol_is_bool_constant_for_query(IndexOptInfo *index, int indexcol)
continue; continue;
/* See if we can match the clause's expression to the index column */ /* See if we can match the clause's expression to the index column */
if (match_boolean_index_clause(rinfo, indexcol, index)) if (match_boolean_index_clause(root, rinfo, indexcol, index))
return true; return true;
} }
@ -3802,9 +3821,15 @@ match_index_to_operand(Node *operand,
*/ */
bool bool
is_pseudo_constant_for_index(Node *expr, IndexOptInfo *index) is_pseudo_constant_for_index(Node *expr, IndexOptInfo *index)
{
return is_pseudo_constant_for_index_new(NULL, expr, index);
}
bool
is_pseudo_constant_for_index_new(PlannerInfo *root, Node *expr, IndexOptInfo *index)
{ {
/* pull_varnos is cheaper than volatility check, so do that first */ /* pull_varnos is cheaper than volatility check, so do that first */
if (bms_is_member(index->rel->relid, pull_varnos(expr))) if (bms_is_member(index->rel->relid, pull_varnos(root, expr)))
return false; /* no good, contains Var of table */ return false; /* no good, contains Var of table */
if (contain_volatile_functions(expr)) if (contain_volatile_functions(expr))
return false; /* no good, volatile comparison value */ return false; /* no good, volatile comparison value */

2
src/backend/optimizer/path/pathkeys.c
Unescape View File

@ -598,7 +598,7 @@ build_index_pathkeys(PlannerInfo *root,
* should stop considering index columns; any lower-order sort * should stop considering index columns; any lower-order sort
* keys won't be useful either. * keys won't be useful either.
*/ */
if (!indexcol_is_bool_constant_for_query(index, i)) if (!indexcol_is_bool_constant_for_query(root, index, i))
break; break;
} }

21
src/backend/optimizer/path/tidpath.c
Unescape View File

@ -45,6 +45,9 @@
#include "optimizer/paths.h" #include "optimizer/paths.h"
#include "optimizer/restrictinfo.h" #include "optimizer/restrictinfo.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
/* /*
* Does this Var represent the CTID column of the specified baserel? * Does this Var represent the CTID column of the specified baserel?
@ -123,7 +126,7 @@ IsTidEqualClause(RestrictInfo *rinfo, RelOptInfo *rel)
* other side of the clause does. * other side of the clause does.
*/ */
static bool static bool
IsTidEqualAnyClause(RestrictInfo *rinfo, RelOptInfo *rel) IsTidEqualAnyClause(PlannerInfo *root, RestrictInfo *rinfo, RelOptInfo *rel)
{ {
ScalarArrayOpExpr *node; ScalarArrayOpExpr *node;
Node *arg1, Node *arg1,
@ -148,7 +151,7 @@ IsTidEqualAnyClause(RestrictInfo *rinfo, RelOptInfo *rel)
IsCTIDVar((Var *) arg1, rel)) IsCTIDVar((Var *) arg1, rel))
{ {
/* The other argument must be a pseudoconstant */ /* The other argument must be a pseudoconstant */
if (bms_is_member(rel->relid, pull_varnos(arg2)) || if (bms_is_member(rel->relid, pull_varnos(root, arg2)) ||
contain_volatile_functions(arg2)) contain_volatile_functions(arg2))
return false; return false;
@ -190,7 +193,7 @@ IsCurrentOfClause(RestrictInfo *rinfo, RelOptInfo *rel)
* (Using a List may seem a bit weird, but it simplifies the caller.) * (Using a List may seem a bit weird, but it simplifies the caller.)
*/ */
static List * static List *
TidQualFromRestrictInfo(RestrictInfo *rinfo, RelOptInfo *rel) TidQualFromRestrictInfo(PlannerInfo *root, RestrictInfo *rinfo, RelOptInfo *rel)
{ {
/* /*
* We may ignore pseudoconstant clauses (they can't contain Vars, so could * We may ignore pseudoconstant clauses (they can't contain Vars, so could
@ -210,7 +213,7 @@ TidQualFromRestrictInfo(RestrictInfo *rinfo, RelOptInfo *rel)
* Check all base cases. If we get a match, return the clause. * Check all base cases. If we get a match, return the clause.
*/ */
if (IsTidEqualClause(rinfo, rel) || if (IsTidEqualClause(rinfo, rel) ||
IsTidEqualAnyClause(rinfo, rel) || IsTidEqualAnyClause(root, rinfo, rel) ||
IsCurrentOfClause(rinfo, rel)) IsCurrentOfClause(rinfo, rel))
return list_make1(rinfo); return list_make1(rinfo);
@ -227,7 +230,7 @@ TidQualFromRestrictInfo(RestrictInfo *rinfo, RelOptInfo *rel)
* This function is just concerned with handling AND/OR recursion. * This function is just concerned with handling AND/OR recursion.
*/ */
static List * static List *
TidQualFromRestrictInfoList(List *rlist, RelOptInfo *rel) TidQualFromRestrictInfoList(PlannerInfo *root, List *rlist, RelOptInfo *rel)
{ {
List *rlst = NIL; List *rlst = NIL;
ListCell *l; ListCell *l;
@ -255,14 +258,14 @@ TidQualFromRestrictInfoList(List *rlist, RelOptInfo *rel)
List *andargs = ((BoolExpr *) orarg)->args; List *andargs = ((BoolExpr *) orarg)->args;
/* Recurse in case there are sub-ORs */ /* Recurse in case there are sub-ORs */
sublist = TidQualFromRestrictInfoList(andargs, rel); sublist = TidQualFromRestrictInfoList(root, andargs, rel);
} }
else else
{ {
RestrictInfo *rinfo = castNode(RestrictInfo, orarg); RestrictInfo *rinfo = castNode(RestrictInfo, orarg);
Assert(!restriction_is_or_clause(rinfo)); Assert(!restriction_is_or_clause(rinfo));
sublist = TidQualFromRestrictInfo(rinfo, rel); sublist = TidQualFromRestrictInfo(root, rinfo, rel);
} }
/* /*
@ -284,7 +287,7 @@ TidQualFromRestrictInfoList(List *rlist, RelOptInfo *rel)
else else
{ {
/* Not an OR clause, so handle base cases */ /* Not an OR clause, so handle base cases */
rlst = TidQualFromRestrictInfo(rinfo, rel); rlst = TidQualFromRestrictInfo(root, rinfo, rel);
} }
/* /*
@ -390,7 +393,7 @@ create_tidscan_paths(PlannerInfo *root, RelOptInfo *rel)
* If any suitable quals exist in the rel's baserestrict list, generate a * If any suitable quals exist in the rel's baserestrict list, generate a
* plain (unparameterized) TidPath with them. * plain (unparameterized) TidPath with them.
*/ */
tidquals = TidQualFromRestrictInfoList(rel->baserestrictinfo, rel); tidquals = TidQualFromRestrictInfoList(root, rel->baserestrictinfo, rel);
if (tidquals) if (tidquals)
{ {

5
src/backend/optimizer/plan/analyzejoins.c
Unescape View File

@ -32,6 +32,9 @@
#include "optimizer/tlist.h" #include "optimizer/tlist.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
/* local functions */ /* local functions */
static bool join_is_removable(PlannerInfo *root, SpecialJoinInfo *sjinfo); static bool join_is_removable(PlannerInfo *root, SpecialJoinInfo *sjinfo);
static void remove_rel_from_query(PlannerInfo *root, int relid, static void remove_rel_from_query(PlannerInfo *root, int relid,
@ -231,7 +234,7 @@ join_is_removable(PlannerInfo *root, SpecialJoinInfo *sjinfo)
continue; /* it definitely doesn't reference innerrel */ continue; /* it definitely doesn't reference innerrel */
if (bms_is_subset(phinfo->ph_eval_at, innerrel->relids)) if (bms_is_subset(phinfo->ph_eval_at, innerrel->relids))
return false; /* there isn't any other place to eval PHV */ return false; /* there isn't any other place to eval PHV */
if (bms_overlap(pull_varnos((Node *) phinfo->ph_var->phexpr), if (bms_overlap(pull_varnos(root, (Node *) phinfo->ph_var->phexpr),
innerrel->relids)) innerrel->relids))
return false; /* it does reference innerrel */ return false; /* it does reference innerrel */
} }

30
src/backend/optimizer/plan/initsplan.c
Unescape View File

@ -34,6 +34,10 @@
#include "rewrite/rewriteManip.h" #include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
#define make_restrictinfo(a,b,c,d,e,f,g,h,i) make_restrictinfo_new(a,b,c,d,e,f,g,h,i)
/* These parameters are set by GUC */ /* These parameters are set by GUC */
int from_collapse_limit; int from_collapse_limit;
int join_collapse_limit; int join_collapse_limit;
@ -60,7 +64,8 @@ static SpecialJoinInfo *make_outerjoininfo(PlannerInfo *root,
Relids left_rels, Relids right_rels, Relids left_rels, Relids right_rels,
Relids inner_join_rels, Relids inner_join_rels,
JoinType jointype, List *clause); JoinType jointype, List *clause);
static void compute_semijoin_info(SpecialJoinInfo *sjinfo, List *clause); static void compute_semijoin_info(PlannerInfo *root, SpecialJoinInfo *sjinfo,
List *clause);
static void distribute_qual_to_rels(PlannerInfo *root, Node *clause, static void distribute_qual_to_rels(PlannerInfo *root, Node *clause,
bool is_deduced, bool is_deduced,
bool below_outer_join, bool below_outer_join,
@ -1200,7 +1205,7 @@ make_outerjoininfo(PlannerInfo *root,
/* this always starts out false */ /* this always starts out false */
sjinfo->delay_upper_joins = false; sjinfo->delay_upper_joins = false;
compute_semijoin_info(sjinfo, clause); compute_semijoin_info(root, sjinfo, clause);
/* If it's a full join, no need to be very smart */ /* If it's a full join, no need to be very smart */
if (jointype == JOIN_FULL) if (jointype == JOIN_FULL)
@ -1214,7 +1219,7 @@ make_outerjoininfo(PlannerInfo *root,
/* /*
* Retrieve all relids mentioned within the join clause. * Retrieve all relids mentioned within the join clause.
*/ */
clause_relids = pull_varnos((Node *) clause); clause_relids = pull_varnos(root, (Node *) clause);
/* /*
* For which relids is the clause strict, ie, it cannot succeed if the * For which relids is the clause strict, ie, it cannot succeed if the
@ -1394,7 +1399,7 @@ make_outerjoininfo(PlannerInfo *root,
* SpecialJoinInfo; the rest may not be set yet. * SpecialJoinInfo; the rest may not be set yet.
*/ */
static void static void
compute_semijoin_info(SpecialJoinInfo *sjinfo, List *clause) compute_semijoin_info(PlannerInfo *root, SpecialJoinInfo *sjinfo, List *clause)
{ {
List *semi_operators; List *semi_operators;
List *semi_rhs_exprs; List *semi_rhs_exprs;
@ -1458,7 +1463,7 @@ compute_semijoin_info(SpecialJoinInfo *sjinfo, List *clause)
list_length(op->args) != 2) list_length(op->args) != 2)
{ {
/* No, but does it reference both sides? */ /* No, but does it reference both sides? */
all_varnos = pull_varnos((Node *) op); all_varnos = pull_varnos(root, (Node *) op);
if (!bms_overlap(all_varnos, sjinfo->syn_righthand) || if (!bms_overlap(all_varnos, sjinfo->syn_righthand) ||
bms_is_subset(all_varnos, sjinfo->syn_righthand)) bms_is_subset(all_varnos, sjinfo->syn_righthand))
{ {
@ -1479,8 +1484,8 @@ compute_semijoin_info(SpecialJoinInfo *sjinfo, List *clause)
opno = op->opno; opno = op->opno;
left_expr = linitial(op->args); left_expr = linitial(op->args);
right_expr = lsecond(op->args); right_expr = lsecond(op->args);
left_varnos = pull_varnos(left_expr); left_varnos = pull_varnos(root, left_expr);
right_varnos = pull_varnos(right_expr); right_varnos = pull_varnos(root, right_expr);
all_varnos = bms_union(left_varnos, right_varnos); all_varnos = bms_union(left_varnos, right_varnos);
opinputtype = exprType(left_expr); opinputtype = exprType(left_expr);
@ -1634,7 +1639,7 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
/* /*
* Retrieve all relids mentioned within the clause. * Retrieve all relids mentioned within the clause.
*/ */
relids = pull_varnos(clause); relids = pull_varnos(root, clause);
/* /*
* In ordinary SQL, a WHERE or JOIN/ON clause can't reference any rels * In ordinary SQL, a WHERE or JOIN/ON clause can't reference any rels
@ -1866,7 +1871,8 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
/* /*
* Build the RestrictInfo node itself. * Build the RestrictInfo node itself.
*/ */
restrictinfo = make_restrictinfo((Expr *) clause, restrictinfo = make_restrictinfo(root,
(Expr *) clause,
is_pushed_down, is_pushed_down,
outerjoin_delayed, outerjoin_delayed,
pseudoconstant, pseudoconstant,
@ -2350,7 +2356,8 @@ process_implied_equality(PlannerInfo *root,
* caller's responsibility that left_ec/right_ec be set as necessary. * caller's responsibility that left_ec/right_ec be set as necessary.
*/ */
RestrictInfo * RestrictInfo *
build_implied_join_equality(Oid opno, build_implied_join_equality(PlannerInfo *root,
Oid opno,
Oid collation, Oid collation,
Expr *item1, Expr *item1,
Expr *item2, Expr *item2,
@ -2376,7 +2383,8 @@ build_implied_join_equality(Oid opno,
/* /*
* Build the RestrictInfo node itself. * Build the RestrictInfo node itself.
*/ */
restrictinfo = make_restrictinfo(clause, restrictinfo = make_restrictinfo(root,
clause,
true, /* is_pushed_down */ true, /* is_pushed_down */
false, /* outerjoin_delayed */ false, /* outerjoin_delayed */
false, /* pseudoconstant */ false, /* pseudoconstant */

7
src/backend/optimizer/plan/subselect.c
Unescape View File

@ -39,6 +39,9 @@
#include "utils/syscache.h" #include "utils/syscache.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
typedef struct convert_testexpr_context typedef struct convert_testexpr_context
{ {
PlannerInfo *root; PlannerInfo *root;
@ -1272,7 +1275,7 @@ convert_ANY_sublink_to_join(PlannerInfo *root, SubLink *sublink,
* it's not gonna be a join. (Note that it won't have Vars referring to * it's not gonna be a join. (Note that it won't have Vars referring to
* the subquery, rather Params.) * the subquery, rather Params.)
*/ */
upper_varnos = pull_varnos(sublink->testexpr); upper_varnos = pull_varnos(root, sublink->testexpr);
if (bms_is_empty(upper_varnos)) if (bms_is_empty(upper_varnos))
return NULL; return NULL;
@ -1456,7 +1459,7 @@ convert_EXISTS_sublink_to_join(PlannerInfo *root, SubLink *sublink,
* The ones <= rtoffset belong to the upper query; the ones > rtoffset do * The ones <= rtoffset belong to the upper query; the ones > rtoffset do
* not. * not.
*/ */
clause_varnos = pull_varnos(whereClause); clause_varnos = pull_varnos(root, whereClause);
upper_varnos = NULL; upper_varnos = NULL;
while ((varno = bms_first_member(clause_varnos)) >= 0) while ((varno = bms_first_member(clause_varnos)) >= 0)
{ {

44
src/backend/optimizer/prep/prepjointree.c
Unescape View File

@ -40,6 +40,10 @@
#include "rewrite/rewriteManip.h" #include "rewrite/rewriteManip.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
#define pull_varnos_of_level(a,b,c) pull_varnos_of_level_new(a,b,c)
typedef struct pullup_replace_vars_context typedef struct pullup_replace_vars_context
{ {
PlannerInfo *root; PlannerInfo *root;
@ -82,7 +86,8 @@ static void pull_up_union_leaf_queries(Node *setOp, PlannerInfo *root,
int childRToffset); int childRToffset);
static void make_setop_translation_list(Query *query, Index newvarno, static void make_setop_translation_list(Query *query, Index newvarno,
AppendRelInfo *appinfo); AppendRelInfo *appinfo);
static bool is_simple_subquery(Query *subquery, RangeTblEntry *rte, static bool is_simple_subquery(PlannerInfo *root, Query *subquery,
RangeTblEntry *rte,
JoinExpr *lowest_outer_join); JoinExpr *lowest_outer_join);
static Node *pull_up_simple_values(PlannerInfo *root, Node *jtnode, static Node *pull_up_simple_values(PlannerInfo *root, Node *jtnode,
RangeTblEntry *rte); RangeTblEntry *rte);
@ -95,7 +100,8 @@ static bool is_simple_union_all(Query *subquery);
static bool is_simple_union_all_recurse(Node *setOp, Query *setOpQuery, static bool is_simple_union_all_recurse(Node *setOp, Query *setOpQuery,
List *colTypes); List *colTypes);
static bool is_safe_append_member(Query *subquery); static bool is_safe_append_member(Query *subquery);
static bool jointree_contains_lateral_outer_refs(Node *jtnode, bool restricted, static bool jointree_contains_lateral_outer_refs(PlannerInfo *root,
Node *jtnode, bool restricted,
Relids safe_upper_varnos); Relids safe_upper_varnos);
static void perform_pullup_replace_vars(PlannerInfo *root, static void perform_pullup_replace_vars(PlannerInfo *root,
pullup_replace_vars_context *rvcontext, pullup_replace_vars_context *rvcontext,
@ -744,7 +750,7 @@ pull_up_subqueries_recurse(PlannerInfo *root, Node *jtnode,
* unless is_safe_append_member says so. * unless is_safe_append_member says so.
*/ */
if (rte->rtekind == RTE_SUBQUERY && if (rte->rtekind == RTE_SUBQUERY &&
is_simple_subquery(rte->subquery, rte, lowest_outer_join) && is_simple_subquery(root, rte->subquery, rte, lowest_outer_join) &&
(containing_appendrel == NULL || (containing_appendrel == NULL ||
is_safe_append_member(rte->subquery))) is_safe_append_member(rte->subquery)))
return pull_up_simple_subquery(root, jtnode, rte, return pull_up_simple_subquery(root, jtnode, rte,
@ -973,7 +979,7 @@ pull_up_simple_subquery(PlannerInfo *root, Node *jtnode, RangeTblEntry *rte,
* easier just to keep this "if" looking the same as the one in * easier just to keep this "if" looking the same as the one in
* pull_up_subqueries_recurse. * pull_up_subqueries_recurse.
*/ */
if (is_simple_subquery(subquery, rte, lowest_outer_join) && if (is_simple_subquery(root, subquery, rte, lowest_outer_join) &&
(containing_appendrel == NULL || is_safe_append_member(subquery))) (containing_appendrel == NULL || is_safe_append_member(subquery)))
{ {
/* good to go */ /* good to go */
@ -1398,7 +1404,7 @@ make_setop_translation_list(Query *query, Index newvarno,
* lowest_outer_join is the lowest outer join above the subquery, or NULL. * lowest_outer_join is the lowest outer join above the subquery, or NULL.
*/ */
static bool static bool
is_simple_subquery(Query *subquery, RangeTblEntry *rte, is_simple_subquery(PlannerInfo *root, Query *subquery, RangeTblEntry *rte,
JoinExpr *lowest_outer_join) JoinExpr *lowest_outer_join)
{ {
/* /*
@ -1477,7 +1483,8 @@ is_simple_subquery(Query *subquery, RangeTblEntry *rte,
safe_upper_varnos = NULL; /* doesn't matter */ safe_upper_varnos = NULL; /* doesn't matter */
} }
if (jointree_contains_lateral_outer_refs((Node *) subquery->jointree, if (jointree_contains_lateral_outer_refs(root,
(Node *) subquery->jointree,
restricted, safe_upper_varnos)) restricted, safe_upper_varnos))
return false; return false;
@ -1496,7 +1503,9 @@ is_simple_subquery(Query *subquery, RangeTblEntry *rte,
*/ */
if (lowest_outer_join != NULL) if (lowest_outer_join != NULL)
{ {
Relids lvarnos = pull_varnos_of_level((Node *) subquery->targetList, 1); Relids lvarnos = pull_varnos_of_level(root,
(Node *) subquery->targetList,
1);
if (!bms_is_subset(lvarnos, safe_upper_varnos)) if (!bms_is_subset(lvarnos, safe_upper_varnos))
return false; return false;
@ -1929,7 +1938,8 @@ is_safe_append_member(Query *subquery)
* in safe_upper_varnos. * in safe_upper_varnos.
*/ */
static bool static bool
jointree_contains_lateral_outer_refs(Node *jtnode, bool restricted, jointree_contains_lateral_outer_refs(PlannerInfo *root, Node *jtnode,
bool restricted,
Relids safe_upper_varnos) Relids safe_upper_varnos)
{ {
if (jtnode == NULL) if (jtnode == NULL)
@ -1944,7 +1954,8 @@ jointree_contains_lateral_outer_refs(Node *jtnode, bool restricted,
/* First, recurse to check child joins */ /* First, recurse to check child joins */
foreach(l, f->fromlist) foreach(l, f->fromlist)
{ {
if (jointree_contains_lateral_outer_refs(lfirst(l), if (jointree_contains_lateral_outer_refs(root,
lfirst(l),
restricted, restricted,
safe_upper_varnos)) safe_upper_varnos))
return true; return true;
@ -1952,7 +1963,7 @@ jointree_contains_lateral_outer_refs(Node *jtnode, bool restricted,
/* Then check the top-level quals */ /* Then check the top-level quals */
if (restricted && if (restricted &&
!bms_is_subset(pull_varnos_of_level(f->quals, 1), !bms_is_subset(pull_varnos_of_level(root, f->quals, 1),
safe_upper_varnos)) safe_upper_varnos))
return true; return true;
} }
@ -1971,18 +1982,20 @@ jointree_contains_lateral_outer_refs(Node *jtnode, bool restricted,
} }
/* Check the child joins */ /* Check the child joins */
if (jointree_contains_lateral_outer_refs(j->larg, if (jointree_contains_lateral_outer_refs(root,
j->larg,
restricted, restricted,
safe_upper_varnos)) safe_upper_varnos))
return true; return true;
if (jointree_contains_lateral_outer_refs(j->rarg, if (jointree_contains_lateral_outer_refs(root,
j->rarg,
restricted, restricted,
safe_upper_varnos)) safe_upper_varnos))
return true; return true;
/* Check the JOIN's qual clauses */ /* Check the JOIN's qual clauses */
if (restricted && if (restricted &&
!bms_is_subset(pull_varnos_of_level(j->quals, 1), !bms_is_subset(pull_varnos_of_level(root, j->quals, 1),
safe_upper_varnos)) safe_upper_varnos))
return true; return true;
} }
@ -2366,7 +2379,8 @@ pullup_replace_vars_callback(Var *var,
* level-zero var must belong to the subquery. * level-zero var must belong to the subquery.
*/ */
if ((rcon->target_rte->lateral ? if ((rcon->target_rte->lateral ?
bms_overlap(pull_varnos((Node *) newnode), rcon->relids) : bms_overlap(pull_varnos(rcon->root, (Node *) newnode),
rcon->relids) :
contain_vars_of_level((Node *) newnode, 0)) && contain_vars_of_level((Node *) newnode, 0)) &&
!contain_nonstrict_functions((Node *) newnode)) !contain_nonstrict_functions((Node *) newnode))
{ {
@ -2804,7 +2818,7 @@ reduce_outer_joins_pass2(Node *jtnode,
overlap = list_intersection(local_nonnullable_vars, overlap = list_intersection(local_nonnullable_vars,
forced_null_vars); forced_null_vars);
if (overlap != NIL && if (overlap != NIL &&
bms_overlap(pull_varnos((Node *) overlap), bms_overlap(pull_varnos(root, (Node *) overlap),
right_state->relids)) right_state->relids))
jointype = JOIN_ANTI; jointype = JOIN_ANTI;
} }

11
src/backend/optimizer/util/clauses.c
Unescape View File

@ -54,6 +54,9 @@
#include "utils/typcache.h" #include "utils/typcache.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
typedef struct typedef struct
{ {
PlannerInfo *root; PlannerInfo *root;
@ -2180,7 +2183,13 @@ is_pseudo_constant_clause_relids(Node *clause, Relids relids)
int int
NumRelids(Node *clause) NumRelids(Node *clause)
{ {
Relids varnos = pull_varnos(clause); return NumRelids_new(NULL, clause);
}
int
NumRelids_new(PlannerInfo *root, Node *clause)
{
Relids varnos = pull_varnos(root, clause);
int result = bms_num_members(varnos); int result = bms_num_members(varnos);
bms_free(varnos); bms_free(varnos);

8
src/backend/optimizer/util/inherit.c
Unescape View File

@ -35,6 +35,9 @@
#include "utils/rel.h" #include "utils/rel.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define make_restrictinfo(a,b,c,d,e,f,g,h,i) make_restrictinfo_new(a,b,c,d,e,f,g,h,i)
static void expand_partitioned_rtentry(PlannerInfo *root, RelOptInfo *relinfo, static void expand_partitioned_rtentry(PlannerInfo *root, RelOptInfo *relinfo,
RangeTblEntry *parentrte, RangeTblEntry *parentrte,
Index parentRTindex, Relation parentrel, Index parentRTindex, Relation parentrel,
@ -748,7 +751,8 @@ apply_child_basequals(PlannerInfo *root, RelOptInfo *parentrel,
} }
/* reconstitute RestrictInfo with appropriate properties */ /* reconstitute RestrictInfo with appropriate properties */
childquals = lappend(childquals, childquals = lappend(childquals,
make_restrictinfo((Expr *) onecq, make_restrictinfo(root,
(Expr *) onecq,
rinfo->is_pushed_down, rinfo->is_pushed_down,
rinfo->outerjoin_delayed, rinfo->outerjoin_delayed,
pseudoconstant, pseudoconstant,
@ -785,7 +789,7 @@ apply_child_basequals(PlannerInfo *root, RelOptInfo *parentrel,
/* not likely that we'd see constants here, so no check */ /* not likely that we'd see constants here, so no check */
childquals = lappend(childquals, childquals = lappend(childquals,
make_restrictinfo(qual, make_restrictinfo(root, qual,
true, false, false, true, false, false,
security_level, security_level,
NULL, NULL, NULL)); NULL, NULL, NULL));

6
src/backend/optimizer/util/orclauses.c
Unescape View File

@ -24,6 +24,9 @@
#include "optimizer/restrictinfo.h" #include "optimizer/restrictinfo.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define make_restrictinfo(a,b,c,d,e,f,g,h,i) make_restrictinfo_new(a,b,c,d,e,f,g,h,i)
static bool is_safe_restriction_clause_for(RestrictInfo *rinfo, RelOptInfo *rel); static bool is_safe_restriction_clause_for(RestrictInfo *rinfo, RelOptInfo *rel);
static Expr *extract_or_clause(RestrictInfo *or_rinfo, RelOptInfo *rel); static Expr *extract_or_clause(RestrictInfo *or_rinfo, RelOptInfo *rel);
static void consider_new_or_clause(PlannerInfo *root, RelOptInfo *rel, static void consider_new_or_clause(PlannerInfo *root, RelOptInfo *rel,
@ -268,7 +271,8 @@ consider_new_or_clause(PlannerInfo *root, RelOptInfo *rel,
* Build a RestrictInfo from the new OR clause. We can assume it's valid * Build a RestrictInfo from the new OR clause. We can assume it's valid
* as a base restriction clause. * as a base restriction clause.
*/ */
or_rinfo = make_restrictinfo(orclause, or_rinfo = make_restrictinfo(root,
orclause,
true, true,
false, false,
false, false,

5
src/backend/optimizer/util/placeholder.c
Unescape View File

@ -23,6 +23,9 @@
#include "optimizer/planmain.h" #include "optimizer/planmain.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
/* Local functions */ /* Local functions */
static void find_placeholders_recurse(PlannerInfo *root, Node *jtnode); static void find_placeholders_recurse(PlannerInfo *root, Node *jtnode);
static void find_placeholders_in_expr(PlannerInfo *root, Node *expr); static void find_placeholders_in_expr(PlannerInfo *root, Node *expr);
@ -98,7 +101,7 @@ find_placeholder_info(PlannerInfo *root, PlaceHolderVar *phv,
* ph_eval_at. If no referenced rels are within the syntactic scope, * ph_eval_at. If no referenced rels are within the syntactic scope,
* force evaluation at the syntactic location. * force evaluation at the syntactic location.
*/ */
rels_used = pull_varnos((Node *) phv->phexpr); rels_used = pull_varnos(root, (Node *) phv->phexpr);
phinfo->ph_lateral = bms_difference(rels_used, phv->phrels); phinfo->ph_lateral = bms_difference(rels_used, phv->phrels);
if (bms_is_empty(phinfo->ph_lateral)) if (bms_is_empty(phinfo->ph_lateral))
phinfo->ph_lateral = NULL; /* make it exactly NULL if empty */ phinfo->ph_lateral = NULL; /* make it exactly NULL if empty */

61
src/backend/optimizer/util/restrictinfo.c
Unescape View File

@ -21,7 +21,11 @@
#include "optimizer/restrictinfo.h" #include "optimizer/restrictinfo.h"
static RestrictInfo *make_restrictinfo_internal(Expr *clause, /* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
static RestrictInfo *make_restrictinfo_internal(PlannerInfo *root,
Expr *clause,
Expr *orclause, Expr *orclause,
bool is_pushed_down, bool is_pushed_down,
bool outerjoin_delayed, bool outerjoin_delayed,
@ -30,7 +34,8 @@ static RestrictInfo *make_restrictinfo_internal(Expr *clause,
Relids required_relids, Relids required_relids,
Relids outer_relids, Relids outer_relids,
Relids nullable_relids); Relids nullable_relids);
static Expr *make_sub_restrictinfos(Expr *clause, static Expr *make_sub_restrictinfos(PlannerInfo *root,
Expr *clause,
bool is_pushed_down, bool is_pushed_down,
bool outerjoin_delayed, bool outerjoin_delayed,
bool pseudoconstant, bool pseudoconstant,
@ -64,13 +69,36 @@ make_restrictinfo(Expr *clause,
Relids required_relids, Relids required_relids,
Relids outer_relids, Relids outer_relids,
Relids nullable_relids) Relids nullable_relids)
{
return make_restrictinfo_new(NULL,
clause,
is_pushed_down,
outerjoin_delayed,
pseudoconstant,
security_level,
required_relids,
outer_relids,
nullable_relids);
}
RestrictInfo *
make_restrictinfo_new(PlannerInfo *root,
Expr *clause,
bool is_pushed_down,
bool outerjoin_delayed,
bool pseudoconstant,
Index security_level,
Relids required_relids,
Relids outer_relids,
Relids nullable_relids)
{ {
/* /*
* If it's an OR clause, build a modified copy with RestrictInfos inserted * If it's an OR clause, build a modified copy with RestrictInfos inserted
* above each subclause of the top-level AND/OR structure. * above each subclause of the top-level AND/OR structure.
*/ */
if (is_orclause(clause)) if (is_orclause(clause))
return (RestrictInfo *) make_sub_restrictinfos(clause, return (RestrictInfo *) make_sub_restrictinfos(root,
clause,
is_pushed_down, is_pushed_down,
outerjoin_delayed, outerjoin_delayed,
pseudoconstant, pseudoconstant,
@ -82,7 +110,8 @@ make_restrictinfo(Expr *clause,
/* Shouldn't be an AND clause, else AND/OR flattening messed up */ /* Shouldn't be an AND clause, else AND/OR flattening messed up */
Assert(!is_andclause(clause)); Assert(!is_andclause(clause));
return make_restrictinfo_internal(clause, return make_restrictinfo_internal(root,
clause,
NULL, NULL,
is_pushed_down, is_pushed_down,
outerjoin_delayed, outerjoin_delayed,
@ -99,7 +128,8 @@ make_restrictinfo(Expr *clause,
* Common code for the main entry points and the recursive cases. * Common code for the main entry points and the recursive cases.
*/ */
static RestrictInfo * static RestrictInfo *
make_restrictinfo_internal(Expr *clause, make_restrictinfo_internal(PlannerInfo *root,
Expr *clause,
Expr *orclause, Expr *orclause,
bool is_pushed_down, bool is_pushed_down,
bool outerjoin_delayed, bool outerjoin_delayed,
@ -137,8 +167,8 @@ make_restrictinfo_internal(Expr *clause,
*/ */
if (is_opclause(clause) && list_length(((OpExpr *) clause)->args) == 2) if (is_opclause(clause) && list_length(((OpExpr *) clause)->args) == 2)
{ {
restrictinfo->left_relids = pull_varnos(get_leftop(clause)); restrictinfo->left_relids = pull_varnos(root, get_leftop(clause));
restrictinfo->right_relids = pull_varnos(get_rightop(clause)); restrictinfo->right_relids = pull_varnos(root, get_rightop(clause));
restrictinfo->clause_relids = bms_union(restrictinfo->left_relids, restrictinfo->clause_relids = bms_union(restrictinfo->left_relids,
restrictinfo->right_relids); restrictinfo->right_relids);
@ -165,7 +195,7 @@ make_restrictinfo_internal(Expr *clause,
restrictinfo->left_relids = NULL; restrictinfo->left_relids = NULL;
restrictinfo->right_relids = NULL; restrictinfo->right_relids = NULL;
/* and get the total relid set the hard way */ /* and get the total relid set the hard way */
restrictinfo->clause_relids = pull_varnos((Node *) clause); restrictinfo->clause_relids = pull_varnos(root, (Node *) clause);
} }
/* required_relids defaults to clause_relids */ /* required_relids defaults to clause_relids */
@ -225,7 +255,8 @@ make_restrictinfo_internal(Expr *clause,
* contained rels. * contained rels.
*/ */
static Expr * static Expr *
make_sub_restrictinfos(Expr *clause, make_sub_restrictinfos(PlannerInfo *root,
Expr *clause,
bool is_pushed_down, bool is_pushed_down,
bool outerjoin_delayed, bool outerjoin_delayed,
bool pseudoconstant, bool pseudoconstant,
@ -241,7 +272,8 @@ make_sub_restrictinfos(Expr *clause,
foreach(temp, ((BoolExpr *) clause)->args) foreach(temp, ((BoolExpr *) clause)->args)
orlist = lappend(orlist, orlist = lappend(orlist,
make_sub_restrictinfos(lfirst(temp), make_sub_restrictinfos(root,
lfirst(temp),
is_pushed_down, is_pushed_down,
outerjoin_delayed, outerjoin_delayed,
pseudoconstant, pseudoconstant,
@ -249,7 +281,8 @@ make_sub_restrictinfos(Expr *clause,
NULL, NULL,
outer_relids, outer_relids,
nullable_relids)); nullable_relids));
return (Expr *) make_restrictinfo_internal(clause, return (Expr *) make_restrictinfo_internal(root,
clause,
make_orclause(orlist), make_orclause(orlist),
is_pushed_down, is_pushed_down,
outerjoin_delayed, outerjoin_delayed,
@ -266,7 +299,8 @@ make_sub_restrictinfos(Expr *clause,
foreach(temp, ((BoolExpr *) clause)->args) foreach(temp, ((BoolExpr *) clause)->args)
andlist = lappend(andlist, andlist = lappend(andlist,
make_sub_restrictinfos(lfirst(temp), make_sub_restrictinfos(root,
lfirst(temp),
is_pushed_down, is_pushed_down,
outerjoin_delayed, outerjoin_delayed,
pseudoconstant, pseudoconstant,
@ -277,7 +311,8 @@ make_sub_restrictinfos(Expr *clause,
return make_andclause(andlist); return make_andclause(andlist);
} }
else else
return (Expr *) make_restrictinfo_internal(clause, return (Expr *) make_restrictinfo_internal(root,
clause,
NULL, NULL,
is_pushed_down, is_pushed_down,
outerjoin_delayed, outerjoin_delayed,

77
src/backend/optimizer/util/var.c
Unescape View File

@ -23,6 +23,7 @@
#include "access/sysattr.h" #include "access/sysattr.h"
#include "nodes/nodeFuncs.h" #include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h" #include "optimizer/optimizer.h"
#include "optimizer/placeholder.h"
#include "optimizer/prep.h" #include "optimizer/prep.h"
#include "parser/parsetree.h" #include "parser/parsetree.h"
#include "rewrite/rewriteManip.h" #include "rewrite/rewriteManip.h"
@ -31,6 +32,7 @@
typedef struct typedef struct
{ {
Relids varnos; Relids varnos;
PlannerInfo *root;
int sublevels_up; int sublevels_up;
} pull_varnos_context; } pull_varnos_context;
@ -93,10 +95,17 @@ static Relids alias_relid_set(Query *query, Relids relids);
*/ */
Relids Relids
pull_varnos(Node *node) pull_varnos(Node *node)
{
return pull_varnos_new(NULL, node);
}
Relids
pull_varnos_new(PlannerInfo *root, Node *node)
{ {
pull_varnos_context context; pull_varnos_context context;
context.varnos = NULL; context.varnos = NULL;
context.root = root;
context.sublevels_up = 0; context.sublevels_up = 0;
/* /*
@ -118,10 +127,17 @@ pull_varnos(Node *node)
*/ */
Relids Relids
pull_varnos_of_level(Node *node, int levelsup) pull_varnos_of_level(Node *node, int levelsup)
{
return pull_varnos_of_level_new(NULL, node, levelsup);
}
Relids
pull_varnos_of_level_new(PlannerInfo *root, Node *node, int levelsup)
{ {
pull_varnos_context context; pull_varnos_context context;
context.varnos = NULL; context.varnos = NULL;
context.root = root;
context.sublevels_up = levelsup; context.sublevels_up = levelsup;
/* /*
@ -159,33 +175,56 @@ pull_varnos_walker(Node *node, pull_varnos_context *context)
} }
if (IsA(node, PlaceHolderVar)) if (IsA(node, PlaceHolderVar))
{ {
/*
* A PlaceHolderVar acts as a variable of its syntactic scope, or
* lower than that if it references only a subset of the rels in its
* syntactic scope. It might also contain lateral references, but we
* should ignore such references when computing the set of varnos in
* an expression tree. Also, if the PHV contains no variables within
* its syntactic scope, it will be forced to be evaluated exactly at
* the syntactic scope, so take that as the relid set.
*/
PlaceHolderVar *phv = (PlaceHolderVar *) node; PlaceHolderVar *phv = (PlaceHolderVar *) node;
pull_varnos_context subcontext;
subcontext.varnos = NULL; /*
subcontext.sublevels_up = context->sublevels_up; * If a PlaceHolderVar is not of the target query level, ignore it,
(void) pull_varnos_walker((Node *) phv->phexpr, &subcontext); * instead recursing into its expression to see if it contains any
* vars that are of the target level.
*/
if (phv->phlevelsup == context->sublevels_up) if (phv->phlevelsup == context->sublevels_up)
{ {
subcontext.varnos = bms_int_members(subcontext.varnos, /*
phv->phrels); * Ideally, the PHV's contribution to context->varnos is its
if (bms_is_empty(subcontext.varnos)) * ph_eval_at set. However, this code can be invoked before
* that's been computed. If we cannot find a PlaceHolderInfo,
* fall back to the conservative assumption that the PHV will be
* evaluated at its syntactic level (phv->phrels).
*
* There is a second hazard: this code is also used to examine
* qual clauses during deconstruct_jointree, when we may have a
* PlaceHolderInfo but its ph_eval_at value is not yet final, so
* that theoretically we could obtain a relid set that's smaller
* than we'd see later on. That should never happen though,
* because we deconstruct the jointree working upwards. Any outer
* join that forces delay of evaluation of a given qual clause
* will be processed before we examine that clause here, so the
* ph_eval_at value should have been updated to include it.
*/
PlaceHolderInfo *phinfo = NULL;
if (phv->phlevelsup == 0 && context->root)
{
ListCell *lc;
foreach(lc, context->root->placeholder_list)
{
phinfo = (PlaceHolderInfo *) lfirst(lc);
if (phinfo->phid == phv->phid)
break;
phinfo = NULL;
}
}
if (phinfo != NULL)
context->varnos = bms_add_members(context->varnos,
phinfo->ph_eval_at);
else
context->varnos = bms_add_members(context->varnos, context->varnos = bms_add_members(context->varnos,
phv->phrels); phv->phrels);
return false; /* don't recurse into expression */
} }
context->varnos = bms_join(context->varnos, subcontext.varnos);
return false;
} }
if (IsA(node, Query)) else if (IsA(node, Query))
{ {
/* Recurse into RTE subquery or not-yet-planned sublink subquery */ /* Recurse into RTE subquery or not-yet-planned sublink subquery */
bool result; bool result;

8
src/backend/utils/adt/selfuncs.c
Unescape View File

@ -140,6 +140,10 @@
#include "utils/typcache.h" #include "utils/typcache.h"
/* source-code-compatibility hacks for pull_varnos() API change */
#define pull_varnos(a,b) pull_varnos_new(a,b)
#define NumRelids(a,b) NumRelids_new(a,b)
/* Hooks for plugins to get control when we ask for stats */ /* Hooks for plugins to get control when we ask for stats */
get_relation_stats_hook_type get_relation_stats_hook = NULL; get_relation_stats_hook_type get_relation_stats_hook = NULL;
get_index_stats_hook_type get_index_stats_hook = NULL; get_index_stats_hook_type get_index_stats_hook = NULL;
@ -2206,7 +2210,7 @@ rowcomparesel(PlannerInfo *root,
/* /*
* Otherwise, it's a join if there's more than one relation used. * Otherwise, it's a join if there's more than one relation used.
*/ */
is_join_clause = (NumRelids((Node *) opargs) > 1); is_join_clause = (NumRelids(root, (Node *) opargs) > 1);
} }
if (is_join_clause) if (is_join_clause)
@ -4769,7 +4773,7 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid,
* membership. Note that when varRelid isn't zero, only vars of that * membership. Note that when varRelid isn't zero, only vars of that
* relation are considered "real" vars. * relation are considered "real" vars.
*/ */
varnos = pull_varnos(basenode); varnos = pull_varnos(root, basenode);
onerel = NULL; onerel = NULL;

1
src/include/optimizer/clauses.h
Unescape View File

@ -50,6 +50,7 @@ extern bool is_pseudo_constant_clause(Node *clause);
extern bool is_pseudo_constant_clause_relids(Node *clause, Relids relids); extern bool is_pseudo_constant_clause_relids(Node *clause, Relids relids);
extern int NumRelids(Node *clause); extern int NumRelids(Node *clause);
extern int NumRelids_new(PlannerInfo *root, Node *clause);
extern void CommuteOpExpr(OpExpr *clause); extern void CommuteOpExpr(OpExpr *clause);

4
src/include/optimizer/optimizer.h
Unescape View File

@ -92,6 +92,8 @@ extern double clamp_row_est(double nrows);
/* in path/indxpath.c: */ /* in path/indxpath.c: */
extern bool is_pseudo_constant_for_index(Node *expr, IndexOptInfo *index); extern bool is_pseudo_constant_for_index(Node *expr, IndexOptInfo *index);
extern bool is_pseudo_constant_for_index_new(PlannerInfo *root, Node *expr,
IndexOptInfo *index);
/* in plan/planner.c: */ /* in plan/planner.c: */
@ -184,6 +186,8 @@ extern SortGroupClause *get_sortgroupref_clause_noerr(Index sortref,
extern Bitmapset *pull_varnos(Node *node); extern Bitmapset *pull_varnos(Node *node);
extern Bitmapset *pull_varnos_of_level(Node *node, int levelsup); extern Bitmapset *pull_varnos_of_level(Node *node, int levelsup);
extern Bitmapset *pull_varnos_new(PlannerInfo *root, Node *node);
extern Bitmapset *pull_varnos_of_level_new(PlannerInfo *root, Node *node, int levelsup);
extern void pull_varattnos(Node *node, Index varno, Bitmapset **varattnos); extern void pull_varattnos(Node *node, Index varno, Bitmapset **varattnos);
extern List *pull_vars_of_level(Node *node, int levelsup); extern List *pull_vars_of_level(Node *node, int levelsup);
extern bool contain_var_clause(Node *node); extern bool contain_var_clause(Node *node);

3
src/include/optimizer/paths.h
Unescape View File

@ -75,7 +75,8 @@ extern void create_index_paths(PlannerInfo *root, RelOptInfo *rel);
extern bool relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel, extern bool relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel,
List *restrictlist, List *restrictlist,
List *exprlist, List *oprlist); List *exprlist, List *oprlist);
extern bool indexcol_is_bool_constant_for_query(IndexOptInfo *index, extern bool indexcol_is_bool_constant_for_query(PlannerInfo *root,
IndexOptInfo *index,
int indexcol); int indexcol);
extern bool match_index_to_operand(Node *operand, int indexcol, extern bool match_index_to_operand(Node *operand, int indexcol,
IndexOptInfo *index); IndexOptInfo *index);

3
src/include/optimizer/planmain.h
Unescape View File

@ -87,7 +87,8 @@ extern void process_implied_equality(PlannerInfo *root,
Index security_level, Index security_level,
bool below_outer_join, bool below_outer_join,
bool both_const); bool both_const);
extern RestrictInfo *build_implied_join_equality(Oid opno, extern RestrictInfo *build_implied_join_equality(PlannerInfo *root,
Oid opno,
Oid collation, Oid collation,
Expr *item1, Expr *item1,
Expr *item2, Expr *item2,

9
src/include/optimizer/restrictinfo.h
Unescape View File

@ -29,6 +29,15 @@ extern RestrictInfo *make_restrictinfo(Expr *clause,
Relids required_relids, Relids required_relids,
Relids outer_relids, Relids outer_relids,
Relids nullable_relids); Relids nullable_relids);
extern RestrictInfo *make_restrictinfo_new(PlannerInfo *root,
Expr *clause,
bool is_pushed_down,
bool outerjoin_delayed,
bool pseudoconstant,
Index security_level,
Relids required_relids,
Relids outer_relids,
Relids nullable_relids);
extern RestrictInfo *commute_restrictinfo(RestrictInfo *rinfo, Oid comm_op); extern RestrictInfo *commute_restrictinfo(RestrictInfo *rinfo, Oid comm_op);
extern bool restriction_is_or_clause(RestrictInfo *restrictinfo); extern bool restriction_is_or_clause(RestrictInfo *restrictinfo);
extern bool restriction_is_securely_promotable(RestrictInfo *restrictinfo, extern bool restriction_is_securely_promotable(RestrictInfo *restrictinfo,

36
src/test/regress/expected/join.out
Unescape View File

@ -4755,6 +4755,42 @@ where ss.stringu2 !~* ss.case1;
(1 row) (1 row)
rollback; rollback;
-- test case to expose miscomputation of required relid set for a PHV
explain (verbose, costs off)
select i8.*, ss.v, t.unique2
from int8_tbl i8
left join int4_tbl i4 on i4.f1 = 1
left join lateral (select i4.f1 + 1 as v) as ss on true
left join tenk1 t on t.unique2 = ss.v
where q2 = 456;
QUERY PLAN
-------------------------------------------------------------
Nested Loop Left Join
Output: i8.q1, i8.q2, ((i4.f1 + 1)), t.unique2
-> Nested Loop Left Join
Output: i8.q1, i8.q2, (i4.f1 + 1)
-> Seq Scan on public.int8_tbl i8
Output: i8.q1, i8.q2
Filter: (i8.q2 = 456)
-> Seq Scan on public.int4_tbl i4
Output: i4.f1
Filter: (i4.f1 = 1)
-> Index Only Scan using tenk1_unique2 on public.tenk1 t
Output: t.unique2
Index Cond: (t.unique2 = ((i4.f1 + 1)))
(13 rows)
select i8.*, ss.v, t.unique2
from int8_tbl i8
left join int4_tbl i4 on i4.f1 = 1
left join lateral (select i4.f1 + 1 as v) as ss on true
left join tenk1 t on t.unique2 = ss.v
where q2 = 456;
q1 | q2 | v | unique2
-----+-----+---+---------
123 | 456 | |
(1 row)
-- bug #8444: we've historically allowed duplicate aliases within aliased JOINs -- bug #8444: we've historically allowed duplicate aliases within aliased JOINs
select * from select * from
int8_tbl x join (int4_tbl x cross join int4_tbl y) j on q1 = f1; -- error int8_tbl x join (int4_tbl x cross join int4_tbl y) j on q1 = f1; -- error

16
src/test/regress/sql/join.sql
Unescape View File

@ -1695,6 +1695,22 @@ where ss.stringu2 !~* ss.case1;
rollback; rollback;
-- test case to expose miscomputation of required relid set for a PHV
explain (verbose, costs off)
select i8.*, ss.v, t.unique2
from int8_tbl i8
left join int4_tbl i4 on i4.f1 = 1
left join lateral (select i4.f1 + 1 as v) as ss on true
left join tenk1 t on t.unique2 = ss.v
where q2 = 456;
select i8.*, ss.v, t.unique2
from int8_tbl i8
left join int4_tbl i4 on i4.f1 = 1
left join lateral (select i4.f1 + 1 as v) as ss on true
left join tenk1 t on t.unique2 = ss.v
where q2 = 456;
-- bug #8444: we've historically allowed duplicate aliases within aliased JOINs -- bug #8444: we've historically allowed duplicate aliases within aliased JOINs
select * from select * from

Write Preview
Loading…
Cancel
Save