diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-10-07 19:27:04 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-10-07 19:27:04 +0000 |
| commit | 0d115dde82bf368ae0f9755113bd8fd53ac0b64b (patch) | |
| tree | a6a1b7b4cfcf1b8ecd49ec280898fc678efdd67d /src/backend/nodes | |
| parent | 059349be0c7fb2bfc1076d70c8307f5e31d8ff59 (diff) | |
| download | postgresql-0d115dde82bf368ae0f9755113bd8fd53ac0b64b.tar.gz postgresql-0d115dde82bf368ae0f9755113bd8fd53ac0b64b.zip | |
Extend CTE patch to support recursive UNION (ie, without ALL). The
implementation uses an in-memory hash table, so it will poop out for very
large recursive results ... but the performance characteristics of a
sort-based implementation would be pretty unpleasant too.
Diffstat (limited to 'src/backend/nodes')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 9 | ||||
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 15 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 1e7eb605f5f..f0a49155024 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.407 2008/10/06 17:39:25 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.408 2008/10/07 19:27:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -193,6 +193,13 @@ _copyRecursiveUnion(RecursiveUnion *from) * copy remainder of node */ COPY_SCALAR_FIELD(wtParam); + COPY_SCALAR_FIELD(numCols); + if (from->numCols > 0) + { + COPY_POINTER_FIELD(dupColIdx, from->numCols * sizeof(AttrNumber)); + COPY_POINTER_FIELD(dupOperators, from->numCols * sizeof(Oid)); + } + COPY_SCALAR_FIELD(numGroups); return newnode; } diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index b25ef4b577a..75a04ce2fa1 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.341 2008/10/06 17:39:26 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.342 2008/10/07 19:27:04 tgl Exp $ * * NOTES * Every node type that can appear in stored rules' parsetrees *must* @@ -334,11 +334,24 @@ _outAppend(StringInfo str, Append *node) static void _outRecursiveUnion(StringInfo str, RecursiveUnion *node) { + int i; + WRITE_NODE_TYPE("RECURSIVEUNION"); _outPlanInfo(str, (Plan *) node); WRITE_INT_FIELD(wtParam); + WRITE_INT_FIELD(numCols); + + appendStringInfo(str, " :dupColIdx"); + for (i = 0; i < node->numCols; i++) + appendStringInfo(str, " %d", node->dupColIdx[i]); + + appendStringInfo(str, " :dupOperators"); + for (i = 0; i < node->numCols; i++) + appendStringInfo(str, " %u", node->dupOperators[i]); + + WRITE_LONG_FIELD(numGroups); } static void |