Fix applied for NESTLOOP bug

scrappy · scrappy · commit 5315d37c207c · 1996-07-25T20:36:46.000Z
submitted by: vadim@sable.krasnoyarsk.su (Vadim B. Mikheev)
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.2 1996/07/25 20:36:46 scrappy Exp $
  *
  * HISTORY
  *    AUTHOR		DATE		MAJOR EVENT
@@ -356,11 +356,21 @@ clause_relids_vars(Node *clause, List **relids, List **vars)
 
     foreach (i, clvars) {
 	Var *var = (Var *)lfirst(i);
+	List *vi;
 
 	if (!intMember(var->varno, varno_list)) {
 	    varno_list = lappendi(varno_list, var->varno);
-	    var_list = lappend(var_list, var);
 	}
+	foreach (vi, var_list)
+	{
+	    Var *in_list = (Var *)lfirst(vi);
+	    
+	    if ( in_list->varno == var->varno && 
+	    		in_list->varattno == var->varattno )
+	    	break;
+	}
+	if ( vi == NIL )
+	    var_list = lappend(var_list, var);
     }
 
     *relids = varno_list;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.2 1996/07/25 20:36:46 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`* HISTORY`
`13`	`13`	`* AUTHOR DATE MAJOR EVENT`
`@@ -356,11 +356,21 @@ clause_relids_vars(Node clause, List relids, List *vars)`
`356`	`356`
`357`	`357`	`foreach (i, clvars) {`
`358`	`358`	`Var var = (Var )lfirst(i);`
	`359`	`+ List *vi;`
`359`	`360`
`360`	`361`	`if (!intMember(var->varno, varno_list)) {`
`361`	`362`	`varno_list = lappendi(varno_list, var->varno);`
`362`		`- var_list = lappend(var_list, var);`
`363`	`363`	`}`
	`364`	`+ foreach (vi, var_list)`
	`365`	`+ {`
	`366`	`+ Var in_list = (Var )lfirst(vi);`
	`367`	`+`
	`368`	`+ if ( in_list->varno == var->varno &&`
	`369`	`+ in_list->varattno == var->varattno )`
	`370`	`+ break;`
	`371`	`+ }`
	`372`	`+ if ( vi == NIL )`
	`373`	`+ var_list = lappend(var_list, var);`
`364`	`374`	`}`
`365`	`375`
`366`	`376`	`*relids = varno_list;`