diff options
Diffstat (limited to 'src/backend/nodes')
-rw-r--r-- | src/backend/nodes/copyfuncs.c | 4 | ||||
-rw-r--r-- | src/backend/nodes/equalfuncs.c | 10 | ||||
-rw-r--r-- | src/backend/nodes/makefuncs.c | 13 | ||||
-rw-r--r-- | src/backend/nodes/outfuncs.c | 3 | ||||
-rw-r--r-- | src/backend/nodes/readfuncs.c | 3 |
5 files changed, 8 insertions, 25 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 0f02b5d119b..a678d6326b1 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.222 2002/11/25 03:33:27 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.223 2002/11/25 21:29:36 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -769,8 +769,6 @@ _copyConst(Const *from) COPY_SCALAR_FIELD(constisnull); COPY_SCALAR_FIELD(constbyval); - COPY_SCALAR_FIELD(constisset); - COPY_SCALAR_FIELD(constiscast); return newnode; } diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index f417dec4886..83c2cb4245c 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -20,7 +20,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.168 2002/11/25 03:33:27 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.169 2002/11/25 21:29:36 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -190,7 +190,6 @@ _equalConst(Const *a, Const *b) COMPARE_SCALAR_FIELD(constlen); COMPARE_SCALAR_FIELD(constisnull); COMPARE_SCALAR_FIELD(constbyval); - /* XXX What about constisset and constiscast? */ /* * We treat all NULL constants of the same type as equal. Someday this @@ -212,19 +211,12 @@ _equalParam(Param *a, Param *b) switch (a->paramkind) { case PARAM_NAMED: - case PARAM_NEW: - case PARAM_OLD: COMPARE_STRING_FIELD(paramname); break; case PARAM_NUM: case PARAM_EXEC: COMPARE_SCALAR_FIELD(paramid); break; - case PARAM_INVALID: - /* - * XXX: Hmmm... What are we supposed to return in this case ?? - */ - break; default: elog(ERROR, "_equalParam: Invalid paramkind value: %d", a->paramkind); diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c index b92011445e3..a97a6df2fda 100644 --- a/src/backend/nodes/makefuncs.c +++ b/src/backend/nodes/makefuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.35 2002/09/18 21:35:21 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.36 2002/11/25 21:29:36 tgl Exp $ */ #include "postgres.h" @@ -157,9 +157,7 @@ makeConst(Oid consttype, int constlen, Datum constvalue, bool constisnull, - bool constbyval, - bool constisset, - bool constiscast) + bool constbyval) { Const *cnst = makeNode(Const); @@ -168,8 +166,7 @@ makeConst(Oid consttype, cnst->constvalue = constvalue; cnst->constisnull = constisnull; cnst->constbyval = constbyval; - cnst->constisset = constisset; - cnst->constiscast = constiscast; + return cnst; } @@ -188,9 +185,7 @@ makeNullConst(Oid consttype) (int) typLen, (Datum) 0, true, - typByVal, - false, - false); + typByVal); } /* diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index 3302e5f942c..11572a4ebad 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.182 2002/11/25 18:12:09 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.183 2002/11/25 21:29:36 tgl Exp $ * * NOTES * Every node type that can appear in stored rules' parsetrees *must* @@ -735,7 +735,6 @@ _outConst(StringInfo str, Const *node) WRITE_INT_FIELD(constlen); WRITE_BOOL_FIELD(constbyval); WRITE_BOOL_FIELD(constisnull); - /* XXX what about constisset, constiscast? */ appendStringInfo(str, " :constvalue "); if (node->constisnull) diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index ab5d1821ce5..eca2e3017b0 100644 --- a/src/backend/nodes/readfuncs.c +++ b/src/backend/nodes/readfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.139 2002/11/25 18:12:10 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.140 2002/11/25 21:29:38 tgl Exp $ * * NOTES * Path and Plan nodes do not have any readfuncs support, because we @@ -390,7 +390,6 @@ _readConst(void) READ_INT_FIELD(constlen); READ_BOOL_FIELD(constbyval); READ_BOOL_FIELD(constisnull); - /* XXX what about constisset, constiscast? */ token = pg_strtok(&length); /* skip :constvalue */ if (local_node->constisnull) |