Fix bug I introduced in recent patch to make hash joins discard null tuples

tglsfdc · tglsfdc · commit 3c5985b47302 · 2007-02-22T22:49:27.000Z
immediately: ExecHashGetHashValue failed to restore the caller's memory
context before taking the failure exit.
diff --git 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.110 2007/01/30 01:33:36 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.111 2007/02/22 22:49:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -731,7 +731,10 @@ ExecHashGetHashValue(HashJoinTable hashtable,
 		if (isNull)
 		{
 			if (hashtable->hashStrict[i] && !keep_nulls)
-				return false;	/* cannot match */
+			{
+				MemoryContextSwitchTo(oldContext);
+				return false;							/* cannot match */
+			}
 			/* else, leave hashkey unmodified, equivalent to hashcode 0 */
 		}
 		else

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.110 2007/01/30 01:33:36 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.111 2007/02/22 22:49:27 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -731,7 +731,10 @@ ExecHashGetHashValue(HashJoinTable hashtable,`
`731`	`731`	`if (isNull)`
`732`	`732`	`{`
`733`	`733`	`if (hashtable->hashStrict[i] && !keep_nulls)`
`734`		`- return false; /* cannot match */`
	`734`	`+ {`
	`735`	`+ MemoryContextSwitchTo(oldContext);`
	`736`	`+ return false; /* cannot match */`
	`737`	`+ }`
`735`	`738`	`/* else, leave hashkey unmodified, equivalent to hashcode 0 */`
`736`	`739`	`}`
`737`	`740`	`else`