diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 1999-07-25 17:53:27 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 1999-07-25 17:53:27 +0000 |
| commit | 8ae29a1d40749a69b760aeab1f67a1265c234b8e (patch) | |
| tree | c16cb90746a7d46169d660850cec185b7b1f9427 /src/backend/nodes | |
| parent | ac4913a0dd433ac1c2207014f886338f2ccd5fef (diff) | |
| download | postgresql-8ae29a1d40749a69b760aeab1f67a1265c234b8e.tar.gz | |
Remove 'restrictinfojoinid' field from RestrictInfo nodes.
The only place it was being used was as temporary storage in indxpath.c,
and the logic was wrong: the same restrictinfo node could get chosen to
carry the info for two different joins. Right fix is to return a second
list of unjoined-relids parallel to the list of clause groups.
Diffstat (limited to 'src/backend/nodes')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 3 | ||||
| -rw-r--r-- | src/backend/nodes/freefuncs.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index ba41233205..ca17faf8a5 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.87 1999/07/24 23:21:06 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.88 1999/07/25 17:53:27 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1321,7 +1321,6 @@ _copyRestrictInfo(RestrictInfo *from) Node_Copy(from, newnode, indexids); Node_Copy(from, newnode, mergejoinorder); newnode->hashjoinoperator = from->hashjoinoperator; - newnode->restrictinfojoinid = listCopy(from->restrictinfojoinid); return newnode; } diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c index 066f7704e0..8bedf17fdb 100644 --- a/src/backend/nodes/freefuncs.c +++ b/src/backend/nodes/freefuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.22 1999/07/17 20:17:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.23 1999/07/25 17:53:27 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -929,7 +929,6 @@ _freeRestrictInfo(RestrictInfo *node) freeObject(node->clause); freeObject(node->indexids); freeObject(node->mergejoinorder); - freeList(node->restrictinfojoinid); pfree(node); } |