diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-04-06 16:34:07 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-04-06 16:34:07 +0000 |
| commit | ad161bcc8a3792d18ef2f3ebe66bb1e22d42b6f2 (patch) | |
| tree | 18ec8963fbd1d6dd62ad214bfe3552fc2e7d06eb /src/backend/nodes/outfuncs.c | |
| parent | 0f3748a28c42d09d794ff00af3f1f992eaa5fd7c (diff) | |
| download | postgresql-ad161bcc8a3792d18ef2f3ebe66bb1e22d42b6f2.tar.gz postgresql-ad161bcc8a3792d18ef2f3ebe66bb1e22d42b6f2.zip | |
Merge Resdom nodes into TargetEntry nodes to simplify code and save a
few palloc's. I also chose to eliminate the restype and restypmod fields
entirely, since they are redundant with information stored in the node's
contained expression; re-examining the expression at need seems simpler
and more reliable than trying to keep restype/restypmod up to date.
initdb forced due to change in contents of stored rules.
Diffstat (limited to 'src/backend/nodes/outfuncs.c')
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index bb2b2c35f90..91a7abf5749 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.245 2004/12/31 21:59:55 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.246 2005/04/06 16:34:05 tgl Exp $ * * NOTES * Every node type that can appear in stored rules' parsetrees *must* @@ -521,21 +521,6 @@ _outHash(StringInfo str, Hash *node) *****************************************************************************/ static void -_outResdom(StringInfo str, Resdom *node) -{ - WRITE_NODE_TYPE("RESDOM"); - - WRITE_INT_FIELD(resno); - WRITE_OID_FIELD(restype); - WRITE_INT_FIELD(restypmod); - WRITE_STRING_FIELD(resname); - WRITE_UINT_FIELD(ressortgroupref); - WRITE_OID_FIELD(resorigtbl); - WRITE_INT_FIELD(resorigcol); - WRITE_BOOL_FIELD(resjunk); -} - -static void _outAlias(StringInfo str, Alias *node) { WRITE_NODE_TYPE("ALIAS"); @@ -900,8 +885,13 @@ _outTargetEntry(StringInfo str, TargetEntry *node) { WRITE_NODE_TYPE("TARGETENTRY"); - WRITE_NODE_FIELD(resdom); WRITE_NODE_FIELD(expr); + WRITE_INT_FIELD(resno); + WRITE_STRING_FIELD(resname); + WRITE_UINT_FIELD(ressortgroupref); + WRITE_OID_FIELD(resorigtbl); + WRITE_INT_FIELD(resorigcol); + WRITE_BOOL_FIELD(resjunk); } static void @@ -1684,9 +1674,6 @@ _outNode(StringInfo str, void *obj) case T_Hash: _outHash(str, obj); break; - case T_Resdom: - _outResdom(str, obj); - break; case T_Alias: _outAlias(str, obj); break; |