diff options
| author | Andres Freund <andres@anarazel.de> | 2018-01-29 12:16:53 -0800 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2018-01-29 12:19:12 -0800 |
| commit | c12693d8f3bbbffcb79f6af476cc647402e1145e (patch) | |
| tree | 94ea605c5cfd798de9a570fcb5e5cc2c7a9f18a1 /src/backend/executor/nodeHash.c | |
| parent | 97d4445a033f1cc02784d42561b52b3441c8eddd (diff) | |
| download | postgresql-c12693d8f3bbbffcb79f6af476cc647402e1145e.tar.gz postgresql-c12693d8f3bbbffcb79f6af476cc647402e1145e.zip | |
Introduce ExecQualAndReset() helper.
It's a common task to evaluate a qual and reset the corresponding
expression context. Currently that requires storing the result of the
qual eval, resetting the context, and then reacting on the result. As
that's awkward several places only reset the context next time through
a node. That's not great, so introduce a helper that evaluates and
resets.
It's a bit ugly that it currently uses MemoryContextReset() instead of
ResetExprContext(), but that seems easier than reordering all of
executor.h.
Author: Andres Freund
Discussion: https://postgr.es/m/20180109222544.f7loxrunqh3xjl5f@alap3.anarazel.de
Diffstat (limited to 'src/backend/executor/nodeHash.c')
| -rw-r--r-- | src/backend/executor/nodeHash.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index a9149ef81ce..c26b8ea44e3 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -1942,10 +1942,7 @@ ExecScanHashBucket(HashJoinState *hjstate, false); /* do not pfree */ econtext->ecxt_innertuple = inntuple; - /* reset temp memory each time to avoid leaks from qual expr */ - ResetExprContext(econtext); - - if (ExecQual(hjclauses, econtext)) + if (ExecQualAndReset(hjclauses, econtext)) { hjstate->hj_CurTuple = hashTuple; return true; @@ -2002,10 +1999,7 @@ ExecParallelScanHashBucket(HashJoinState *hjstate, false); /* do not pfree */ econtext->ecxt_innertuple = inntuple; - /* reset temp memory each time to avoid leaks from qual expr */ - ResetExprContext(econtext); - - if (ExecQual(hjclauses, econtext)) + if (ExecQualAndReset(hjclauses, econtext)) { hjstate->hj_CurTuple = hashTuple; return true; |