diff options
Diffstat (limited to 'src/backend/nodes')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 20 | ||||
| -rw-r--r-- | src/backend/nodes/equalfuncs.c | 15 | ||||
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 15 |
3 files changed, 6 insertions, 44 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 2f7642276c..25a7056500 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 - * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.305 2005/06/05 22:32:54 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.306 2005/06/09 04:18:58 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1237,6 +1237,7 @@ _copyRestrictInfo(RestrictInfo *from) COPY_SCALAR_FIELD(valid_everywhere); COPY_SCALAR_FIELD(can_join); COPY_BITMAPSET_FIELD(clause_relids); + COPY_BITMAPSET_FIELD(required_relids); COPY_BITMAPSET_FIELD(left_relids); COPY_BITMAPSET_FIELD(right_relids); COPY_NODE_FIELD(orclause); @@ -1263,20 +1264,6 @@ _copyRestrictInfo(RestrictInfo *from) } /* - * _copyJoinInfo - */ -static JoinInfo * -_copyJoinInfo(JoinInfo *from) -{ - JoinInfo *newnode = makeNode(JoinInfo); - - COPY_BITMAPSET_FIELD(unjoined_relids); - COPY_NODE_FIELD(jinfo_restrictinfo); - - return newnode; -} - -/* * _copyInClauseInfo */ static InClauseInfo * @@ -2857,9 +2844,6 @@ copyObject(void *from) case T_RestrictInfo: retval = _copyRestrictInfo(from); break; - case T_JoinInfo: - retval = _copyJoinInfo(from); - break; case T_InClauseInfo: retval = _copyInClauseInfo(from); break; diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index a1d951112c..e625ca7f32 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -18,7 +18,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.242 2005/06/05 22:32:54 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.243 2005/06/09 04:18:58 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -594,6 +594,7 @@ _equalRestrictInfo(RestrictInfo *a, RestrictInfo *b) COMPARE_NODE_FIELD(clause); COMPARE_SCALAR_FIELD(is_pushed_down); COMPARE_SCALAR_FIELD(valid_everywhere); + COMPARE_BITMAPSET_FIELD(required_relids); /* * We ignore all the remaining fields, since they may not be set yet, @@ -604,15 +605,6 @@ _equalRestrictInfo(RestrictInfo *a, RestrictInfo *b) } static bool -_equalJoinInfo(JoinInfo *a, JoinInfo *b) -{ - COMPARE_BITMAPSET_FIELD(unjoined_relids); - COMPARE_NODE_FIELD(jinfo_restrictinfo); - - return true; -} - -static bool _equalInClauseInfo(InClauseInfo *a, InClauseInfo *b) { COMPARE_BITMAPSET_FIELD(lefthand); @@ -1915,9 +1907,6 @@ equal(void *a, void *b) case T_RestrictInfo: retval = _equalRestrictInfo(a, b); break; - case T_JoinInfo: - retval = _equalJoinInfo(a, b); - break; case T_InClauseInfo: retval = _equalInClauseInfo(a, b); break; diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index 8310894e0c..2be5e1d98f 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.254 2005/06/06 04:13:35 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.255 2005/06/09 04:18:58 tgl Exp $ * * NOTES * Every node type that can appear in stored rules' parsetrees *must* @@ -1227,6 +1227,7 @@ _outRestrictInfo(StringInfo str, RestrictInfo *node) WRITE_BOOL_FIELD(valid_everywhere); WRITE_BOOL_FIELD(can_join); WRITE_BITMAPSET_FIELD(clause_relids); + WRITE_BITMAPSET_FIELD(required_relids); WRITE_BITMAPSET_FIELD(left_relids); WRITE_BITMAPSET_FIELD(right_relids); WRITE_NODE_FIELD(orclause); @@ -1239,15 +1240,6 @@ _outRestrictInfo(StringInfo str, RestrictInfo *node) } static void -_outJoinInfo(StringInfo str, JoinInfo *node) -{ - WRITE_NODE_TYPE("JOININFO"); - - WRITE_BITMAPSET_FIELD(unjoined_relids); - WRITE_NODE_FIELD(jinfo_restrictinfo); -} - -static void _outInnerIndexscanInfo(StringInfo str, InnerIndexscanInfo *node) { WRITE_NODE_TYPE("INNERINDEXSCANINFO"); @@ -1989,9 +1981,6 @@ _outNode(StringInfo str, void *obj) case T_RestrictInfo: _outRestrictInfo(str, obj); break; - case T_JoinInfo: - _outJoinInfo(str, obj); - break; case T_InnerIndexscanInfo: _outInnerIndexscanInfo(str, obj); break; |