mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Department of second thoughts: probably shouldn't use nth() to get the

Browse Source 
appropriate targetlist entry out of the subquery.  Use an explicit search
like we do everywhere else.
This commit is contained in:
Tom Lane 2003-03-22 17:11:25 +00:00
parent ed11ccf4d4
commit 9323cb0aab
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/optimizer/path/allpaths.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.100 2003/03/22 01:49:38 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.101 2003/03/22 17:11:25 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -638,7 +638,7 @@ qual_is_pushdown_safe(Query *subquery, Index rti, Node *qual)
{ {
bool safe = true; bool safe = true;
List *vars; List *vars;
List *l; List *vl;
Bitmapset *tested = NULL; Bitmapset *tested = NULL;
/* Refuse subselects (point 1) */ /* Refuse subselects (point 1) */
@ -650,10 +650,11 @@ qual_is_pushdown_safe(Query *subquery, Index rti, Node *qual)
* all such Vars must refer to subselect output columns. * all such Vars must refer to subselect output columns.
*/ */
vars = pull_var_clause(qual, false); vars = pull_var_clause(qual, false);
foreach(l, vars) foreach(vl, vars)
{ {
Var *var = (Var *) lfirst(l); Var *var = (Var *) lfirst(vl);
TargetEntry *tle; List *tl;
TargetEntry *tle = NULL;
Assert(var->varno == rti); Assert(var->varno == rti);
/* /*
@ -665,8 +666,13 @@ qual_is_pushdown_safe(Query *subquery, Index rti, Node *qual)
continue; continue;
tested = bms_add_member(tested, var->varattno); tested = bms_add_member(tested, var->varattno);
tle = (TargetEntry *) nth(var->varattno-1, subquery->targetList); foreach(tl, subquery->targetList)
Assert(tle->resdom->resno == var->varattno); {
tle = (TargetEntry *) lfirst(tl);
if (tle->resdom->resno == var->varattno)
break;
}
Assert(tl != NIL);
Assert(!tle->resdom->resjunk); Assert(!tle->resdom->resjunk);
/* If subquery uses DISTINCT or DISTINCT ON, check point 2 */ /* If subquery uses DISTINCT or DISTINCT ON, check point 2 */