Minor code cleanup: ExecHash() was returning a null TupleTableSlot, and an

old comment in the code claimed that this was necessary. Since it is not
actually necessary any more, it is clearer to remove the comment and
just return NULL instead -- the return value of ExecHash() is not used.
This commit is contained in:
Neil Conway 2005-03-31 02:02:52 +00:00
parent e1b398c6f5
commit aeb502346b
2 changed files with 5 additions and 10 deletions

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.91 2005/03/16 21:38:07 tgl Exp $ * $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.92 2005/03/31 02:02:52 neilc Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -54,7 +54,6 @@ ExecHash(HashState *node)
* get state info from node * get state info from node
*/ */
outerNode = outerPlanState(node); outerNode = outerPlanState(node);
hashtable = node->hashtable; hashtable = node->hashtable;
/* /*
@ -78,11 +77,8 @@ ExecHash(HashState *node)
ExecHashTableInsert(hashtable, ExecFetchSlotTuple(slot), hashvalue); ExecHashTableInsert(hashtable, ExecFetchSlotTuple(slot), hashvalue);
} }
/* /* We needn't return a tuple slot or anything else */
* Return the slot so that we have the tuple descriptor when we need return NULL;
* to save/restore them. -Jeff 11 July 1991 (XXX isn't this dead code?)
*/
return slot;
} }
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeHashjoin.c,v 1.69 2005/03/16 21:38:07 tgl Exp $ * $PostgreSQL: pgsql/src/backend/executor/nodeHashjoin.c,v 1.70 2005/03/31 02:02:52 neilc Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -97,8 +97,7 @@ ExecHashJoin(HashJoinState *node)
* outer tuple; so we can stop scanning the inner scan if we matched * outer tuple; so we can stop scanning the inner scan if we matched
* on the previous try. * on the previous try.
*/ */
if (node->js.jointype == JOIN_IN && if (node->js.jointype == JOIN_IN && node->hj_MatchedOuter)
node->hj_MatchedOuter)
node->hj_NeedNewOuter = true; node->hj_NeedNewOuter = true;
/* /*