From aeb502346b73153992f491f638d084b7b506dde6 Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Thu, 31 Mar 2005 02:02:52 +0000
Subject: [PATCH] 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.

---
 src/backend/executor/nodeHash.c     | 10 +++-------
 src/backend/executor/nodeHashjoin.c |  5 ++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index daf24c3d5a..97e6738bd3 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -8,7 +8,7 @@
  *
  *
  * 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
 	 */
 	outerNode = outerPlanState(node);
-
 	hashtable = node->hashtable;
 
 	/*
@@ -78,11 +77,8 @@ ExecHash(HashState *node)
 		ExecHashTableInsert(hashtable, ExecFetchSlotTuple(slot), hashvalue);
 	}
 
-	/*
-	 * Return the slot so that we have the tuple descriptor when we need
-	 * to save/restore them.  -Jeff 11 July 1991  (XXX isn't this dead code?)
-	 */
-	return slot;
+	/* We needn't return a tuple slot or anything else */
+	return NULL;
 }
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index 26d7bde335..4811b7068e 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.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
 	 * on the previous try.
 	 */
-	if (node->js.jointype == JOIN_IN &&
-		node->hj_MatchedOuter)
+	if (node->js.jointype == JOIN_IN && node->hj_MatchedOuter)
 		node->hj_NeedNewOuter = true;
 
 	/*