diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-10-13 21:56:14 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-10-13 21:56:14 +0000 |
| commit | 7b0919047fe3f5e223f0f3e01236eee635c4bc88 (patch) | |
| tree | ec466faa1eaa32ad9ad49012e056e5b542f70548 | |
| parent | 44ed69c8f3b3e21153af60cc22287fd0258878fe (diff) | |
| download | postgresql-7b0919047fe3f5e223f0f3e01236eee635c4bc88.tar.gz | |
Fix breakage in hashjoin from recent backpatch of left-join bug fix.
(That's what I get for not testing the back branches *before* committing.)
| -rw-r--r-- | src/backend/executor/nodeHashjoin.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index 64ab1cc233..37f74a7f2d 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.39.2.1 2004/09/17 18:29:40 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.39.2.2 2004/10/13 21:56:14 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -23,13 +23,13 @@ #include "utils/memutils.h" -static TupleTableSlot *ExecHashJoinOuterGetTuple(Plan *node, Plan *parent, +static TupleTableSlot *ExecHashJoinOuterGetTuple(Plan *node, HashJoin *parent, HashJoinState *hjstate); static TupleTableSlot *ExecHashJoinGetSavedTuple(HashJoinState *hjstate, BufFile *file, TupleTableSlot *tupleSlot); static int ExecHashJoinGetBatch(int bucketno, HashJoinTable hashtable); -static int ExecHashJoinNewBatch(HashJoinState *hjstate); +static int ExecHashJoinNewBatch(HashJoinState *hjstate, HashJoin *node); /* ---------------------------------------------------------------- @@ -154,7 +154,7 @@ ExecHashJoin(HashJoin *node) if (hjstate->hj_NeedNewOuter) { outerTupleSlot = ExecHashJoinOuterGetTuple(outerNode, - (Plan *) node, + node, hjstate); if (TupIsNull(outerTupleSlot)) { @@ -470,7 +470,7 @@ ExecEndHashJoin(HashJoin *node) */ static TupleTableSlot * -ExecHashJoinOuterGetTuple(Plan *node, Plan *parent, HashJoinState *hjstate) +ExecHashJoinOuterGetTuple(Plan *node, HashJoin *parent, HashJoinState *hjstate) { HashJoinTable hashtable = hjstate->hj_HashTable; int curbatch = hashtable->curbatch; @@ -478,7 +478,7 @@ ExecHashJoinOuterGetTuple(Plan *node, Plan *parent, HashJoinState *hjstate) if (curbatch == 0) { /* if it is the first pass */ - slot = ExecProcNode(node, parent); + slot = ExecProcNode(node, (Plan *) parent); if (!TupIsNull(slot)) return slot; @@ -486,7 +486,7 @@ ExecHashJoinOuterGetTuple(Plan *node, Plan *parent, HashJoinState *hjstate) * We have just reached the end of the first pass. Try to switch * to a saved batch. */ - curbatch = ExecHashJoinNewBatch(hjstate); + curbatch = ExecHashJoinNewBatch(hjstate, parent); } /* @@ -500,7 +500,7 @@ ExecHashJoinOuterGetTuple(Plan *node, Plan *parent, HashJoinState *hjstate) hjstate->hj_OuterTupleSlot); if (!TupIsNull(slot)) return slot; - curbatch = ExecHashJoinNewBatch(hjstate); + curbatch = ExecHashJoinNewBatch(hjstate, parent); } /* Out of batches... */ @@ -546,7 +546,7 @@ ExecHashJoinGetSavedTuple(HashJoinState *hjstate, * ---------------------------------------------------------------- */ static int -ExecHashJoinNewBatch(HashJoinState *hjstate) +ExecHashJoinNewBatch(HashJoinState *hjstate, HashJoin *node) { HashJoinTable hashtable = hjstate->hj_HashTable; int nbatch = hashtable->nbatch; @@ -576,7 +576,7 @@ ExecHashJoinNewBatch(HashJoinState *hjstate) while (newbatch <= nbatch && (outerBatchSize[newbatch - 1] == 0L || (innerBatchSize[newbatch - 1] == 0L && - hjstate->js.jointype != JOIN_LEFT))) + node->join.jointype != JOIN_LEFT))) { BufFileClose(hashtable->innerBatchFile[newbatch - 1]); hashtable->innerBatchFile[newbatch - 1] = NULL; |