database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

Remove Value node struct

Browse Source 
The Value node struct is a weird construct.  It is its own node type,
but most of the time, it actually has a node type of Integer, Float,
String, or BitString.  As a consequence, the struct name and the node
type don't match most of the time, and so it has to be treated
specially a lot.  There doesn't seem to be any value in the special
construct.  There is very little code that wants to accept all Value
variants but nothing else (and even if it did, this doesn't provide
any convenient way to check it), and most code wants either just one
particular node type (usually String), or it accepts a broader set of
node types besides just Value.

This change removes the Value struct and node type and replaces them
by separate Integer, Float, String, and BitString node types that are
proper node types and structs of their own and behave mostly like
normal node types.

Also, this removes the T_Null node tag, which was previously also a
possible variant of Value but wasn't actually used outside of the
Value contained in A_Const.  Replace that by an isnull field in
A_Const.

Reviewed-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Reviewed-by: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/5ba6bc5b-3f95-04f2-2419-f8ddb4c046fb@enterprisedb.com
This commit is contained in:
Peter Eisentraut
2021-09-09 07:58:12 +02:00
parent cbdf75bf80
commit 639a86e36a
30 changed files with 371 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/backend/nodes/equalfuncs.c
View File

@@ -2409,7 +2409,7 @@ _equalParamRef(const ParamRef *a, const ParamRef *b)
static bool
_equalA_Const(const A_Const *a, const A_Const *b)
{
if (!equal(&a->val, &b->val)) /* hack for in-line Value field */
if (!equal(&a->val, &b->val)) /* hack for in-line val field */
return false;
COMPARE_LOCATION_FIELD(location);
@@ -3089,27 +3089,33 @@ _equalList(const List *a, const List *b)
*/
static bool
_equalValue(const Value *a, const Value *b)
_equalInteger(const Integer *a, const Integer *b)
{
COMPARE_SCALAR_FIELD(type);
COMPARE_SCALAR_FIELD(val);
switch (a->type)
{
case T_Integer:
COMPARE_SCALAR_FIELD(val.ival);
break;
case T_Float:
case T_String:
case T_BitString:
COMPARE_STRING_FIELD(val.str);
break;
case T_Null:
/* nothing to do */
break;
default:
elog(ERROR, "unrecognized node type: %d", (int) a->type);
break;
}
return true;
}
static bool
_equalFloat(const Float *a, const Float *b)
{
COMPARE_STRING_FIELD(val);
return true;
}
static bool
_equalString(const String *a, const String *b)
{
COMPARE_STRING_FIELD(val);
return true;
}
static bool
_equalBitString(const BitString *a, const BitString *b)
{
COMPARE_STRING_FIELD(val);
return true;
}
@@ -3337,11 +3343,16 @@ equal(const void *a, const void *b)
break;
case T_Integer:
retval = _equalInteger(a, b);
break;
case T_Float:
retval = _equalFloat(a, b);
break;
case T_String:
retval = _equalString(a, b);
break;
case T_BitString:
case T_Null:
retval = _equalValue(a, b);
retval = _equalBitString(a, b);
break;
/*