diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-11 13:15:23 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-11 13:15:23 +0000 |
| commit | b8de9b216ffaa52d6c4cac09292f2c0e9fbf8c53 (patch) | |
| tree | 7b4cfb08d0e0f04b8cc5ef40070958ae12fbf057 /src/backend | |
| parent | 40ac7eddd9917dc25a021fe9a19ac47bb198946b (diff) | |
| download | postgresql-b8de9b216ffaa52d6c4cac09292f2c0e9fbf8c53.tar.gz postgresql-b8de9b216ffaa52d6c4cac09292f2c0e9fbf8c53.zip | |
Fix oversights in processing of LIMIT expressions during planning.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/optimizer/plan/setrefs.c | 12 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/subselect.c | 10 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index ec21c1a8d3b..495eaa97300 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.97 2003/08/08 21:41:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.97.4.1 2004/05/11 13:15:23 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -189,7 +189,6 @@ set_plan_references(Plan *plan, List *rtable) case T_Sort: case T_Unique: case T_SetOp: - case T_Limit: /* * These plan types don't actually bother to evaluate their @@ -202,6 +201,15 @@ set_plan_references(Plan *plan, List *rtable) * the plan tree! */ break; + case T_Limit: + /* + * Like the plan types above, Limit doesn't evaluate its + * tlist or quals. It does have live expressions for + * limit/offset, however. + */ + fix_expr_references(plan, ((Limit *) plan)->limitOffset); + fix_expr_references(plan, ((Limit *) plan)->limitCount); + break; case T_Agg: case T_Group: set_uppernode_references(plan, (Index) 0); diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c index 5da291835ad..be53ba80be7 100644 --- a/src/backend/optimizer/plan/subselect.c +++ b/src/backend/optimizer/plan/subselect.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.83.2.1 2003/11/25 23:59:32 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.83.2.2 2004/05/11 13:15:23 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1018,6 +1018,13 @@ finalize_plan(Plan *plan, List *rtable, &context); break; + case T_Limit: + finalize_primnode(((Limit *) plan)->limitOffset, + &context); + finalize_primnode(((Limit *) plan)->limitCount, + &context); + break; + case T_Hash: finalize_primnode((Node *) ((Hash *) plan)->hashkeys, &context); @@ -1029,7 +1036,6 @@ finalize_plan(Plan *plan, List *rtable, case T_Sort: case T_Unique: case T_SetOp: - case T_Limit: case T_Group: break; |