diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-03-16 21:38:10 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-03-16 21:38:10 +0000 |
commit | f97aebd162987d00bd9b9f592ff54e9e90f11843 (patch) | |
tree | 78c6ff493070f92e7fda262a2c25e2545f0d2b21 /src/backend/executor/nodeSetOp.c | |
parent | 712f053587b552769d1d3f6fe0ec03ab79c05d26 (diff) | |
download | postgresql-f97aebd162987d00bd9b9f592ff54e9e90f11843.tar.gz postgresql-f97aebd162987d00bd9b9f592ff54e9e90f11843.zip |
Revise TupleTableSlot code to avoid unnecessary construction and disassembly
of tuples when passing data up through multiple plan nodes. A slot can now
hold either a normal "physical" HeapTuple, or a "virtual" tuple consisting
of Datum/isnull arrays. Upper plan levels can usually just copy the Datum
arrays, avoiding heap_formtuple() and possible subsequent nocachegetattr()
calls to extract the data again. This work extends Atsushi Ogawa's earlier
patch, which provided the key idea of adding Datum arrays to TupleTableSlots.
(I believe however that something like this was foreseen way back in Berkeley
days --- see the old comment on ExecProject.) A test case involving many
levels of join of fairly wide tables (about 80 columns altogether) showed
about 3x overall speedup, though simple queries will probably not be
helped very much.
I have also duplicated some code in heaptuple.c in order to provide versions
of heap_formtuple and friends that use "bool" arrays to indicate null
attributes, instead of the old convention of "char" arrays containing either
'n' or ' '. This provides a better match to the convention used by
ExecEvalExpr. While I have not made a concerted effort to get rid of uses
of the old routines, I think they should be deprecated and eventually removed.
Diffstat (limited to 'src/backend/executor/nodeSetOp.c')
-rw-r--r-- | src/backend/executor/nodeSetOp.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c index 2ecd2fda9f8..a0de4db74d4 100644 --- a/src/backend/executor/nodeSetOp.c +++ b/src/backend/executor/nodeSetOp.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeSetOp.c,v 1.15 2004/12/31 21:59:45 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeSetOp.c,v 1.16 2005/03/16 21:38:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -49,14 +49,12 @@ ExecSetOp(SetOpState *node) SetOp *plannode = (SetOp *) node->ps.plan; TupleTableSlot *resultTupleSlot; PlanState *outerPlan; - TupleDesc tupDesc; /* * get information from the node */ outerPlan = outerPlanState(node); resultTupleSlot = node->ps.ps_ResultTupleSlot; - tupDesc = ExecGetResultType(&node->ps); /* * If the previously-returned tuple needs to be returned more than @@ -105,11 +103,7 @@ ExecSetOp(SetOpState *node) */ if (node->subplan_done) return NULL; /* no more tuples */ - ExecStoreTuple(heap_copytuple(inputTupleSlot->val), - resultTupleSlot, - InvalidBuffer, - true); /* free copied tuple at - * ExecClearTuple */ + ExecCopySlot(resultTupleSlot, inputTupleSlot); node->numLeft = 0; node->numRight = 0; endOfGroup = false; @@ -127,9 +121,8 @@ ExecSetOp(SetOpState *node) * Else test if the new tuple and the previously saved tuple * match. */ - if (execTuplesMatch(inputTupleSlot->val, - resultTupleSlot->val, - tupDesc, + if (execTuplesMatch(inputTupleSlot, + resultTupleSlot, plannode->numCols, plannode->dupColIdx, node->eqfunctions, node->tempContext)) @@ -189,9 +182,8 @@ ExecSetOp(SetOpState *node) int flag; bool isNull; - flag = DatumGetInt32(heap_getattr(inputTupleSlot->val, + flag = DatumGetInt32(slot_getattr(inputTupleSlot, plannode->flagColIdx, - tupDesc, &isNull)); Assert(!isNull); if (flag) |