Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a998a69

Browse files
tglsfdctglsfdc
committed
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'.
1 parent 5ffa0bb commit a998a69

File tree

9 files changed

+54
-66
lines changed

9 files changed

+54
-66
lines changed

‎src/backend/executor/nodeLimit.c

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.26 2006/07/26 00:34:48 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.27 2006/07/26 19:31:50 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -23,7 +23,6 @@
2323

2424
#include "executor/executor.h"
2525
#include "executor/nodeLimit.h"
26-
#include "catalog/pg_type.h"
2726

2827
static void recompute_limits(LimitState *node);
2928

@@ -227,24 +226,14 @@ recompute_limits(LimitState *node)
227226
{
228227
ExprContext *econtext = node->ps.ps_ExprContext;
229228
bool isNull;
230-
Oid type;
231-
229+
232230
if (node->limitOffset)
233231
{
234-
type = ((Const *) node->limitOffset->expr)->consttype;
235-
236-
if (type == INT8OID)
237-
node->offset =
232+
node->offset =
238233
DatumGetInt64(ExecEvalExprSwitchContext(node->limitOffset,
239234
econtext,
240235
&isNull,
241236
NULL));
242-
else
243-
node->offset = DatumGetInt32(ExecEvalExprSwitchContext(node->limitOffset,
244-
econtext,
245-
&isNull,
246-
NULL));
247-
248237
/* Interpret NULL offset as no offset */
249238
if (isNull)
250239
node->offset = 0;
@@ -260,21 +249,11 @@ recompute_limits(LimitState *node)
260249
if (node->limitCount)
261250
{
262251
node->noCount = false;
263-
type = ((Const *) node->limitCount->expr)->consttype;
264-
265-
if (type == INT8OID)
266-
node->count =
252+
node->count =
267253
DatumGetInt64(ExecEvalExprSwitchContext(node->limitCount,
268254
econtext,
269255
&isNull,
270256
NULL));
271-
else
272-
node->count = DatumGetInt32(ExecEvalExprSwitchContext(node->limitCount,
273-
econtext,
274-
&isNull,
275-
NULL));
276-
277-
278257
/* Interpret NULL count as no count (LIMIT ALL) */
279258
if (isNull)
280259
node->noCount = true;

‎src/backend/optimizer/plan/planagg.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.18 2006/07/14 14:52:20 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.19 2006/07/26 19:31:50 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -459,9 +459,9 @@ make_agg_subplan(PlannerInfo *root, MinMaxAggInfo *info)
459459

460460
/* set up LIMIT 1 */
461461
subparse->limitOffset = NULL;
462-
subparse->limitCount = (Node *) makeConst(INT4OID, sizeof(int4),
463-
Int32GetDatum(1),
464-
false, true);
462+
subparse->limitCount = (Node *) makeConst(INT8OID, sizeof(int64),
463+
Int64GetDatum(1),
464+
false, false /* not by val */);
465465

466466
/*
467467
* Generate the plan for the subquery. We already have a Path for the

‎src/backend/optimizer/plan/planner.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.204 2006/07/26 00:34:48 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.205 2006/07/26 19:31:50 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1129,7 +1129,6 @@ preprocess_limit(PlannerInfo *root, double tuple_fraction,
11291129
else
11301130
{
11311131
*offset_est = DatumGetInt64(((Const *) est)->constvalue);
1132-
11331132
if (*offset_est < 0)
11341133
*offset_est = 0; /* less than 0 is same as 0 */
11351134
}

‎src/backend/parser/parse_clause.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.154 2006/07/26 00:34:48 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.155 2006/07/26 19:31:51 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1074,9 +1074,12 @@ transformWhereClause(ParseState *pstate, Node *clause,
10741074

10751075
/*
10761076
* transformLimitClause -
1077-
* Transform the expression and make sure it is of type integer.
1077+
* Transform the expression and make sure it is of type bigint.
10781078
* Used for LIMIT and allied clauses.
10791079
*
1080+
* Note: as of Postgres 8.2, LIMIT expressions are expected to yield int8,
1081+
* rather than int4 as before.
1082+
*
10801083
* constructName does not affect the semantics, but is used in error messages
10811084
*/
10821085
Node *
@@ -1090,7 +1093,7 @@ transformLimitClause(ParseState *pstate, Node *clause,
10901093

10911094
qual = transformExpr(pstate, clause);
10921095

1093-
qual = coerce_to_integer64(pstate, qual, constructName);
1096+
qual = coerce_to_bigint(pstate, qual, constructName);
10941097

10951098
/*
10961099
* LIMIT can't refer to any vars or aggregates of the current query; we

‎src/backend/parser/parse_coerce.c

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.142 2006/07/26 00:34:48 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.143 2006/07/26 19:31:51 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -780,7 +780,8 @@ coerce_record_to_complex(ParseState *pstate, Node *node,
780780
return (Node *) rowexpr;
781781
}
782782

783-
/* coerce_to_boolean()
783+
/*
784+
* coerce_to_boolean()
784785
* Coerce an argument of a construct that requires boolean input
785786
* (AND, OR, NOT, etc). Also check that input is not a set.
786787
*
@@ -819,8 +820,9 @@ coerce_to_boolean(ParseState *pstate, Node *node,
819820
return node;
820821
}
821822

822-
/* coerce_to_integer()
823-
* Coerce an argument of a construct that requires integer input
823+
/*
824+
* coerce_to_integer()
825+
* Coerce an argument of a construct that requires integer input.
824826
* Also check that input is not a set.
825827
*
826828
* Returns the possibly-transformed node tree.
@@ -857,45 +859,47 @@ coerce_to_integer(ParseState *pstate, Node *node,
857859

858860
return node;
859861
}
860-
861-
/* coerce_to_integer64()
862-
* Coerce an argument of a construct that requires integer input
863-
* (LIMIT, OFFSET). Also check that input is not a set.
862+
863+
/*
864+
* coerce_to_bigint()
865+
* Coerce an argument of a construct that requires int8 input.
866+
* Also check that input is not a set.
864867
*
865868
* Returns the possibly-transformed node tree.
866869
*
867870
* As with coerce_type, pstate may be NULL if no special unknown-Param
868871
* processing is wanted.
869872
*/
870873
Node *
871-
coerce_to_integer64(ParseState *pstate, Node *node,
872-
const char *constructName)
874+
coerce_to_bigint(ParseState *pstate, Node *node,
875+
const char *constructName)
873876
{
874-
Oid inputTypeId = exprType(node);
877+
Oid inputTypeId = exprType(node);
875878

876879
if (inputTypeId != INT8OID)
877880
{
878881
node = coerce_to_target_type(pstate, node, inputTypeId,
879-
INT8OID, -1, COERCION_ASSIGNMENT,
882+
INT8OID, -1,
883+
COERCION_ASSIGNMENT,
880884
COERCE_IMPLICIT_CAST);
881885
if (node == NULL)
882-
ereport(ERROR,
883-
(errcode(ERRCODE_DATATYPE_MISMATCH),
884-
/* translator: first %s is name of a SQL construct, eg LIMIT */
885-
errmsg("argument of %s must be type integer, not type %s",
886-
constructName, format_type_be(inputTypeId))));
886+
ereport(ERROR,
887+
(errcode(ERRCODE_DATATYPE_MISMATCH),
888+
/* translator: first %s is name of a SQL construct, eg LIMIT */
889+
errmsg("argument of %s must be type bigint, not type %s",
890+
constructName, format_type_be(inputTypeId))));
887891
}
888892

889893
if (expression_returns_set(node))
890894
ereport(ERROR,
891-
(errcode(ERRCODE_DATATYPE_MISMATCH),
892-
/* translator: %s is name of a SQL construct, eg LIMIT */
893-
errmsg("argument of %s must not return a set",
894-
constructName)));
895+
(errcode(ERRCODE_DATATYPE_MISMATCH),
896+
/* translator: %s is name of a SQL construct, eg LIMIT */
897+
errmsg("argument of %s must not return a set",
898+
constructName)));
895899

896900
return node;
897901
}
898-
902+
899903

900904
/* select_common_type()
901905
* Determine the common supertype of a list of input expression types.

‎src/include/catalog/catversion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
3838
* Portions Copyright (c) 1994, Regents of the University of California
3939
*
40-
* $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.340 2006/07/25 03:51:21 tgl Exp $
40+
* $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.341 2006/07/26 19:31:51 tgl Exp $
4141
*
4242
*-------------------------------------------------------------------------
4343
*/
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/* yyyymmddN */
56-
#define CATALOG_VERSION_NO 200607241
56+
#define CATALOG_VERSION_NO 200607261
5757

5858
#endif

‎src/include/nodes/parsenodes.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.317 2006/07/13 16:49:19 momjian Exp $
10+
* $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.318 2006/07/26 19:31:51 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -112,8 +112,8 @@ typedef struct Query
112112

113113
List *sortClause; /* a list of SortClause's */
114114

115-
Node *limitOffset; /* # of result tuples to skip */
116-
Node *limitCount; /* # of result tuples to return */
115+
Node *limitOffset; /* # of result tuples to skip (int8 expr) */
116+
Node *limitCount; /* # of result tuples to return (int8 expr) */
117117

118118
List *rowMarks; /* a list of RowMarkClause's */
119119

‎src/include/nodes/plannodes.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.83 2006/03/05 15:58:57 momjian Exp $
10+
* $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.84 2006/07/26 19:31:51 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -463,6 +463,9 @@ typedef struct SetOp
463463

464464
/* ----------------
465465
* limit node
466+
*
467+
* Note: as of Postgres 8.2, the offset and count expressions are expected
468+
* to yield int8, rather than int4 as before.
466469
* ----------------
467470
*/
468471
typedef struct Limit

‎src/include/parser/parse_coerce.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.64 2006/07/26 00:34:48 momjian Exp $
10+
* $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.65 2006/07/26 19:31:51 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -57,9 +57,9 @@ extern Node *coerce_to_boolean(ParseState *pstate, Node *node,
5757
const char *constructName);
5858
extern Node *coerce_to_integer(ParseState *pstate, Node *node,
5959
const char *constructName);
60-
extern Node *coerce_to_integer64(ParseState *pstate, Node *node,
61-
const char *constructName);
62-
60+
extern Node *coerce_to_bigint(ParseState *pstate, Node *node,
61+
const char *constructName);
62+
6363
extern Oid select_common_type(List *typeids, const char *context);
6464
extern Node *coerce_to_common_type(ParseState *pstate, Node *node,
6565
Oid targetTypeId,

0 commit comments

Comments
 (0)