Change internal integer representation of Value node

petere · petere · commit 6cf86f435472 · 2018-03-13T09:56:25.000-04:00
A Value node would store an integer as a long.  This causes needless
portability risks, as long can be of varying sizes.  Change it to use
int instead.  All code using this was already careful to only store
32-bit values anyway.

Reviewed-by: Michael Paquier &lt;michael@paquier.xyz&gt;
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
@@ -3235,7 +3235,7 @@ _outValue(StringInfo str, const Value *value)
 	switch (value->type)
 	{
 		case T_Integer:
-			appendStringInfo(str, "%ld", value->val.ival);
+			appendStringInfo(str, "%d", value->val.ival);
 			break;
 		case T_Float:
 
diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c
@@ -224,13 +224,9 @@ nodeTokenType(char *token, int length)
 
 		errno = 0;
 		val = strtol(token, &endptr, 10);
-		(void) val;				/* avoid compiler warning if unused */
-		if (endptr != token + length || errno == ERANGE
-#ifdef HAVE_LONG_INT_64
-		/* if long > 32 bits, check for overflow of int4 */
-			|| val != (long) ((int32) val)
-#endif
-			)
+		if (endptr != token + length || errno == ERANGE ||
+			/* check for overflow of int */
+			val != (int) val)
 			return T_Float;
 		return T_Integer;
 	}
@@ -387,9 +383,9 @@ nodeRead(char *token, int tok_len)
 		case T_Integer:
 
 			/*
-			 * we know that the token terminates on a char atol will stop at
+			 * we know that the token terminates on a char atoi will stop at
 			 */
-			result = (Node *) makeInteger(atol(token));
+			result = (Node *) makeInteger(atoi(token));
 			break;
 		case T_Float:
 			{
diff --git a/src/backend/nodes/value.c b/src/backend/nodes/value.c
@@ -20,7 +20,7 @@
  *	makeInteger
  */
 Value *
-makeInteger(long i)
+makeInteger(int i)
 {
 	Value	   *v = makeNode(Value);
 
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
@@ -1216,12 +1216,9 @@ process_integer_literal(const char *token, YYSTYPE *lval)
 
 	errno = 0;
 	val = strtol(token, &endptr, 10);
-	if (*endptr != '\0' || errno == ERANGE
-#ifdef HAVE_LONG_INT_64
-	/* if long > 32 bits, check for overflow of int4 */
-		|| val != (long) ((int32) val)
-#endif
-		)
+	if (*endptr != '\0' || errno == ERANGE ||
+		/* check for overflow of int */
+		val != (int) val)
 	{
 		/* integer too large, treat it as a float */
 		lval->str = pstrdup(token);
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -6913,7 +6913,7 @@ flatten_set_variable_args(const char *name, List *args)
 		switch (nodeTag(&con->val))
 		{
 			case T_Integer:
-				appendStringInfo(&buf, "%ld", intVal(&con->val));
+				appendStringInfo(&buf, "%d", intVal(&con->val));
 				break;
 			case T_Float:
 				/* represented as a string, so just copy it */
diff --git a/src/include/nodes/value.h b/src/include/nodes/value.h
@@ -34,7 +34,7 @@
  * better to use the more general representation.)
  *
  * Note that an integer-looking string will get lexed as T_Float if
- * the value is too large to fit in a 'long'.
+ * the value is too large to fit in an 'int'.
  *
  * Nulls, of course, don't need the value part at all.
  *----------------------
@@ -44,7 +44,7 @@ typedef struct Value
 	NodeTag		type;			/* tag appropriately (eg. T_String) */
 	union ValUnion
 	{
-		long		ival;		/* machine integer */
+		int			ival;		/* machine integer */
 		char	   *str;		/* string */
 	}			val;
 } Value;
@@ -53,7 +53,7 @@ typedef struct Value
 #define floatVal(v)		atof(((Value *)(v))->val.str)
 #define strVal(v)		(((Value *)(v))->val.str)
 
-extern Value *makeInteger(long i);
+extern Value *makeInteger(int i);
 extern Value *makeFloat(char *numericStr);
 extern Value *makeString(char *str);
 extern Value *makeBitString(char *str);
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
@@ -732,12 +732,9 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 
 						errno = 0;
 						val = strtol((char *)yytext, &endptr,10);
-						if (*endptr != '\0' || errno == ERANGE
-#ifdef HAVE_LONG_INT_64
-							/* if long > 32 bits, check for overflow of int4 */
-							|| val != (long) ((int32) val)
-#endif
-							)
+						if (*endptr != '\0' || errno == ERANGE ||
+							/* check for overflow of int */
+							val != (int) val)
 						{
 							errno = 0;
 							base_yylval.str = mm_strdup(yytext);

Original file line number	Diff line number	Diff line change
`@@ -3235,7 +3235,7 @@ _outValue(StringInfo str, const Value *value)`
`3235`	`3235`	`switch (value->type)`
`3236`	`3236`	`{`
`3237`	`3237`	`case T_Integer:`
`3238`		`- appendStringInfo(str, "%ld", value->val.ival);`
	`3238`	`+ appendStringInfo(str, "%d", value->val.ival);`
`3239`	`3239`	`break;`
`3240`	`3240`	`case T_Float:`
`3241`	`3241`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`* makeInteger`
`21`	`21`	`*/`
`22`	`22`	`Value *`
`23`		`-makeInteger(long i)`
	`23`	`+makeInteger(int i)`
`24`	`24`	`{`
`25`	`25`	`Value *v = makeNode(Value);`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -6913,7 +6913,7 @@ flatten_set_variable_args(const char name, List args)`
`6913`	`6913`	`switch (nodeTag(&con->val))`
`6914`	`6914`	`{`
`6915`	`6915`	`case T_Integer:`
`6916`		`- appendStringInfo(&buf, "%ld", intVal(&con->val));`
	`6916`	`+ appendStringInfo(&buf, "%d", intVal(&con->val));`
`6917`	`6917`	`break;`
`6918`	`6918`	`case T_Float:`
`6919`	`6919`	`/* represented as a string, so just copy it */`