Fixup for nodeAgg.c refactor.

jeff-davis · jeff-davis · commit b7fabe80df9a · 2020-02-21T09:34:20.000-08:00
Commit 5b618e1 made an unintended behavior change.
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
@@ -1287,7 +1287,10 @@ build_hash_tables(AggState *aggstate)
 
 		Assert(perhash->aggnode->numGroups > 0);
 
-		build_hash_table(aggstate, setno, perhash->aggnode->numGroups);
+		if (perhash->hashtable)
+			ResetTupleHashTable(perhash->hashtable);
+		else
+			build_hash_table(aggstate, setno, perhash->aggnode->numGroups);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1287,7 +1287,10 @@ build_hash_tables(AggState *aggstate)`
`1287`	`1287`
`1288`	`1288`	`Assert(perhash->aggnode->numGroups > 0);`
`1289`	`1289`
`1290`		`- build_hash_table(aggstate, setno, perhash->aggnode->numGroups);`
	`1290`	`+ if (perhash->hashtable)`
	`1291`	`+ ResetTupleHashTable(perhash->hashtable);`
	`1292`	`+ else`
	`1293`	`+ build_hash_table(aggstate, setno, perhash->aggnode->numGroups);`
`1291`	`1294`	`}`
`1292`	`1295`	`}`
`1293`	`1296`