Commitbef7640

committed

Fix oversights in processing of LIMIT expressions during planning.

1 parent1697568 commitbef7640Copy full SHA for bef7640

File tree

+18

-4

lines changed

+18

-4

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/optimizer/plan/setrefs.c,v 1.100 2004/01/06 04:31:01 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/optimizer/plan/setrefs.c,v 1.101 2004/05/11 13:15:15 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -171,7 +171,6 @@ set_plan_references(Plan plan, List rtable)`
`171`	`171`	`caseT_Sort:`
`172`	`172`	`caseT_Unique:`
`173`	`173`	`caseT_SetOp:`
`174`		`-caseT_Limit:`
`175`	`174`
`176`	`175`	`/*`
`177`	`176`	`* These plan types don't actually bother to evaluate their`
`@@ -184,6 +183,15 @@ set_plan_references(Plan plan, List rtable)`
`184`	`183`	`* the plan tree!`
`185`	`184`	`*/`
`186`	`185`	`break;`
	`186`	`+caseT_Limit:`
	`187`	`+/*`
	`188`	`+ * Like the plan types above, Limit doesn't evaluate its`
	`189`	`+ * tlist or quals. It does have live expressions for`
	`190`	`+ * limit/offset, however.`
	`191`	`+ */`
	`192`	`+fix_expr_references(plan, ((Limit*)plan)->limitOffset);`
	`193`	`+fix_expr_references(plan, ((Limit*)plan)->limitCount);`
	`194`	`+break;`
`187`	`195`	`caseT_Agg:`
`188`	`196`	`caseT_Group:`
`189`	`197`	`set_uppernode_references(plan, (Index)0);`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.88 2004/02/03 17:34:03 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.89 2004/05/11 13:15:15 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1063,14 +1063,20 @@ finalize_plan(Plan plan, List rtable,`
`1063`	`1063`	`&context);`
`1064`	`1064`	`break;`
`1065`	`1065`
	`1066`	`+caseT_Limit:`
	`1067`	`+finalize_primnode(((Limit*)plan)->limitOffset,`
	`1068`	`+&context);`
	`1069`	`+finalize_primnode(((Limit*)plan)->limitCount,`
	`1070`	`+&context);`
	`1071`	`+break;`
	`1072`	`+`
`1066`	`1073`	`caseT_Hash:`
`1067`	`1074`	`caseT_Agg:`
`1068`	`1075`	`caseT_SeqScan:`
`1069`	`1076`	`caseT_Material:`
`1070`	`1077`	`caseT_Sort:`
`1071`	`1078`	`caseT_Unique:`
`1072`	`1079`	`caseT_SetOp:`
`1073`		`-caseT_Limit:`
`1074`	`1080`	`caseT_Group:`
`1075`	`1081`	`break;`
`1076`	`1082`

Comments

(0)