From d5789018c7de551bcce45b6924dda588f9858162 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 23 Oct 2008 14:34:34 +0000 Subject: Remove useless ps_OuterTupleSlot field from PlanState. I suppose this was used long ago, but in the current code the ecxt_outertuple field of ExprContext is doing all the work. Spotted by Ran Tang. --- src/backend/executor/nodeHashjoin.c | 5 +---- src/backend/executor/nodeNestloop.c | 12 +----------- 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'src/backend/executor') diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index 4534845b527..319b48b6a80 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeHashjoin.c,v 1.95 2008/08/15 19:20:42 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeHashjoin.c,v 1.96 2008/10/23 14:34:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -193,7 +193,6 @@ ExecHashJoin(HashJoinState *node) return NULL; } - node->js.ps.ps_OuterTupleSlot = outerTupleSlot; econtext->ecxt_outertuple = outerTupleSlot; node->hj_NeedNewOuter = false; node->hj_MatchedOuter = false; @@ -482,7 +481,6 @@ ExecInitHashJoin(HashJoin *node, EState *estate, int eflags) /* child Hash node needs to evaluate inner hash keys, too */ ((HashState *) innerPlanState(hjstate))->hashkeys = rclauses; - hjstate->js.ps.ps_OuterTupleSlot = NULL; hjstate->js.ps.ps_TupFromTlist = false; hjstate->hj_NeedNewOuter = true; hjstate->hj_MatchedOuter = false; @@ -884,7 +882,6 @@ ExecReScanHashJoin(HashJoinState *node, ExprContext *exprCtxt) node->hj_CurBucketNo = 0; node->hj_CurTuple = NULL; - node->js.ps.ps_OuterTupleSlot = NULL; node->js.ps.ps_TupFromTlist = false; node->hj_NeedNewOuter = true; node->hj_MatchedOuter = false; diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c index 27e3582649e..8b6fe76b120 100644 --- a/src/backend/executor/nodeNestloop.c +++ b/src/backend/executor/nodeNestloop.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeNestloop.c,v 1.48 2008/08/15 19:20:42 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeNestloop.c,v 1.49 2008/10/23 14:34:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -78,12 +78,6 @@ ExecNestLoop(NestLoopState *node) innerPlan = innerPlanState(node); econtext = node->js.ps.ps_ExprContext; - /* - * get the current outer tuple - */ - outerTupleSlot = node->js.ps.ps_OuterTupleSlot; - econtext->ecxt_outertuple = outerTupleSlot; - /* * Check to see if we're still projecting out tuples from a previous join * tuple (because there is a function-returning-set in the projection @@ -135,7 +129,6 @@ ExecNestLoop(NestLoopState *node) } ENL1_printf("saving new outer tuple information"); - node->js.ps.ps_OuterTupleSlot = outerTupleSlot; econtext->ecxt_outertuple = outerTupleSlot; node->nl_NeedNewOuter = false; node->nl_MatchedOuter = false; @@ -357,7 +350,6 @@ ExecInitNestLoop(NestLoop *node, EState *estate, int eflags) /* * finally, wipe the current outer tuple clean. */ - nlstate->js.ps.ps_OuterTupleSlot = NULL; nlstate->js.ps.ps_TupFromTlist = false; nlstate->nl_NeedNewOuter = true; nlstate->nl_MatchedOuter = false; @@ -426,8 +418,6 @@ ExecReScanNestLoop(NestLoopState *node, ExprContext *exprCtxt) if (outerPlan->chgParam == NULL) ExecReScan(outerPlan, exprCtxt); - /* let outerPlan to free its result tuple ... */ - node->js.ps.ps_OuterTupleSlot = NULL; node->js.ps.ps_TupFromTlist = false; node->nl_NeedNewOuter = true; node->nl_MatchedOuter = false; -- cgit v1.2.3