diff options
| author | Tom Lane | 2008-08-07 03:04:04 +0000 |
|---|---|---|
| committer | Tom Lane | 2008-08-07 03:04:04 +0000 |
| commit | 368df3042783778031ece2b8580324516cd42de1 (patch) | |
| tree | dd6f9877cdc12654647a97785c4e7267cc7ac945 /src/backend/nodes | |
| parent | 2d1d96b1cea8f67a095e8f28372af4081605f681 (diff) | |
Support hashing for duplicate-elimination in INTERSECT and EXCEPT queries.
This completes my project of improving usage of hashing for duplicate
elimination (aggregate functions with DISTINCT remain undone, but that's
for some other day).
As with the previous patches, this means we can INTERSECT/EXCEPT on datatypes
that can hash but not sort, and it means that INTERSECT/EXCEPT without ORDER
BY are no longer certain to produce sorted output.
Diffstat (limited to 'src/backend/nodes')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 4 | ||||
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index e562949d934..4767b924e9e 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.397 2008/08/07 01:11:46 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.398 2008/08/07 03:04:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -652,10 +652,12 @@ _copySetOp(SetOp *from) * copy remainder of node */ COPY_SCALAR_FIELD(cmd); + COPY_SCALAR_FIELD(strategy); COPY_SCALAR_FIELD(numCols); COPY_POINTER_FIELD(dupColIdx, from->numCols * sizeof(AttrNumber)); COPY_POINTER_FIELD(dupOperators, from->numCols * sizeof(Oid)); COPY_SCALAR_FIELD(flagColIdx); + COPY_SCALAR_FIELD(numGroups); return newnode; } diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index 26f8fb3810a..8440864b0e6 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.331 2008/08/07 01:11:48 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.332 2008/08/07 03:04:03 tgl Exp $ * * NOTES * Every node type that can appear in stored rules' parsetrees *must* @@ -599,6 +599,7 @@ _outSetOp(StringInfo str, SetOp *node) _outPlanInfo(str, (Plan *) node); WRITE_ENUM_FIELD(cmd, SetOpCmd); + WRITE_ENUM_FIELD(strategy, SetOpStrategy); WRITE_INT_FIELD(numCols); appendStringInfo(str, " :dupColIdx"); @@ -610,6 +611,7 @@ _outSetOp(StringInfo str, SetOp *node) appendStringInfo(str, " %u", node->dupOperators[i]); WRITE_INT_FIELD(flagColIdx); + WRITE_LONG_FIELD(numGroups); } static void |