Avoid reversing user-given order of WHERE clauses while attaching clauses

tglsfdc · tglsfdc · commit cdcaec5c53b2 · 2001-04-16T19:44:10.000Z
to specific base or join RelOptInfo nodes during planning.  This preserves
the more-intuitive behavior of 7.0.* --- if you write an expensive clause
(such as a sub-select) last, it should get evaluated last.  Someday we
ought to try to have some intelligence about the order of evaluation of
WHERE clauses, but for now we should not override what the user wrote.
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.58 2001/03/22 03:59:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.59 2001/04/16 19:44:10 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -444,8 +444,8 @@ distribute_qual_to_rels(Query *root, Node *clause,
 		 */
 		RelOptInfo *rel = get_base_rel(root, lfirsti(relids));
 
-		rel->baserestrictinfo = lcons(restrictinfo,
-									  rel->baserestrictinfo);
+		rel->baserestrictinfo = lappend(rel->baserestrictinfo,
+										restrictinfo);
 
 		/*
 		 * Check for a "mergejoinable" clause even though it's not a join
@@ -549,8 +549,8 @@ add_join_info_to_rels(Query *root, RestrictInfo *restrictinfo,
 		 */
 		joininfo = find_joininfo_node(get_base_rel(root, cur_relid),
 									  unjoined_relids);
-		joininfo->jinfo_restrictinfo = lcons(restrictinfo,
-										   joininfo->jinfo_restrictinfo);
+		joininfo->jinfo_restrictinfo = lappend(joininfo->jinfo_restrictinfo,
+											   restrictinfo);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.58 2001/03/22 03:59:36 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.59 2001/04/16 19:44:10 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -444,8 +444,8 @@ distribute_qual_to_rels(Query root, Node clause,`
`444`	`444`	`*/`
`445`	`445`	`RelOptInfo *rel = get_base_rel(root, lfirsti(relids));`
`446`	`446`
`447`		`- rel->baserestrictinfo = lcons(restrictinfo,`
`448`		`- rel->baserestrictinfo);`
	`447`	`+ rel->baserestrictinfo = lappend(rel->baserestrictinfo,`
	`448`	`+ restrictinfo);`
`449`	`449`
`450`	`450`	`/*`
`451`	`451`	`* Check for a "mergejoinable" clause even though it's not a join`
`@@ -549,8 +549,8 @@ add_join_info_to_rels(Query root, RestrictInfo restrictinfo,`
`549`	`549`	`*/`
`550`	`550`	`joininfo = find_joininfo_node(get_base_rel(root, cur_relid),`
`551`	`551`	`unjoined_relids);`
`552`		`- joininfo->jinfo_restrictinfo = lcons(restrictinfo,`
`553`		`- joininfo->jinfo_restrictinfo);`
	`552`	`+ joininfo->jinfo_restrictinfo = lappend(joininfo->jinfo_restrictinfo,`
	`553`	`+ restrictinfo);`
`554`	`554`	`}`
`555`	`555`	`}`
`556`	`556`