diff options
| author | Tom Lane | 2006-07-26 19:31:51 +0000 |
|---|---|---|
| committer | Tom Lane | 2006-07-26 19:31:51 +0000 |
| commit | a998a692475845e10ba12a24c5af44b22737bd50 (patch) | |
| tree | d82a26dd427190e1492a2fb21ccfe85e16c7da39 /src/backend/optimizer | |
| parent | 5ffa0bb47a3ca975f257d665e38f2ba89625e112 (diff) | |
Code review for bigint-LIMIT patch. Fix missed planner dependency,
eliminate unnecessary code, force initdb because stored rules change
(limit nodes are now supposed to be int8 not int4 expressions).
Update comments and error messages, which still all said 'integer'.
Diffstat (limited to 'src/backend/optimizer')
| -rw-r--r-- | src/backend/optimizer/plan/planagg.c | 8 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/planner.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c index 30814a7e75c..39e77897c0a 100644 --- a/src/backend/optimizer/plan/planagg.c +++ b/src/backend/optimizer/plan/planagg.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.18 2006/07/14 14:52:20 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.19 2006/07/26 19:31:50 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -459,9 +459,9 @@ make_agg_subplan(PlannerInfo *root, MinMaxAggInfo *info) /* set up LIMIT 1 */ subparse->limitOffset = NULL; - subparse->limitCount = (Node *) makeConst(INT4OID, sizeof(int4), - Int32GetDatum(1), - false, true); + subparse->limitCount = (Node *) makeConst(INT8OID, sizeof(int64), + Int64GetDatum(1), + false, false /* not by val */); /* * Generate the plan for the subquery. We already have a Path for the diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 5545da4978f..c02f6e195cd 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.204 2006/07/26 00:34:48 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.205 2006/07/26 19:31:50 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1129,7 +1129,6 @@ preprocess_limit(PlannerInfo *root, double tuple_fraction, else { *offset_est = DatumGetInt64(((Const *) est)->constvalue); - if (*offset_est < 0) *offset_est = 0; /* less than 0 is same as 0 */ } |