From 356687bd825e5ca7230d43c1bffe7a59ad2e77bd Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sat, 9 Feb 2019 00:35:57 -0800 Subject: Reset, not recreate, execGrouping.c style hashtables. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This uses the facility added in the preceding commit to fix performance issues caused by rebuilding the hashtable (with its comparator expression being the most expensive bit), after every reset. That's especially important when the comparator is JIT compiled. Bug: #15592 #15486 Reported-By: Jakub Janeček, Dmitry Marakasov Author: Andres Freund Discussion: https://postgr.es/m/15486-05850f065da42931@postgresql.org https://postgr.es/m/20190114180423.ywhdg2iagzvh43we@alap3.anarazel.de Backpatch: 11, where I broke this in bf6c614a2f2c5 --- src/backend/executor/nodeRecursiveunion.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'src/backend/executor/nodeRecursiveunion.c') diff --git a/src/backend/executor/nodeRecursiveunion.c b/src/backend/executor/nodeRecursiveunion.c index d2488ad988e..9b74ed3208c 100644 --- a/src/backend/executor/nodeRecursiveunion.c +++ b/src/backend/executor/nodeRecursiveunion.c @@ -37,17 +37,18 @@ build_hash_table(RecursiveUnionState *rustate) Assert(node->numCols > 0); Assert(node->numGroups > 0); - rustate->hashtable = BuildTupleHashTable(&rustate->ps, - desc, - node->numCols, - node->dupColIdx, - rustate->eqfuncoids, - rustate->hashfunctions, - node->numGroups, - 0, - rustate->tableContext, - rustate->tempContext, - false); + rustate->hashtable = BuildTupleHashTableExt(&rustate->ps, + desc, + node->numCols, + node->dupColIdx, + rustate->eqfuncoids, + rustate->hashfunctions, + node->numGroups, + 0, + rustate->ps.state->es_query_cxt, + rustate->tableContext, + rustate->tempContext, + false); } @@ -317,9 +318,9 @@ ExecReScanRecursiveUnion(RecursiveUnionState *node) if (node->tableContext) MemoryContextResetAndDeleteChildren(node->tableContext); - /* And rebuild empty hashtable if needed */ + /* Empty hashtable if needed */ if (plan->numCols > 0) - build_hash_table(node); + ResetTupleHashTable(node->hashtable); /* reset processing state */ node->recursing = false; -- cgit v1.2.3