aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-11-27 17:08:23 +0100
committerGitHub <noreply@github.com>2023-11-27 17:08:23 +0100
commit7ad3607c2216017a0c32348e107a01e868ed8841 (patch)
tree8b0bdf65e6ee0d853d8d156a20a2f2e3dee6e20c
parent9a8996780443e62f0bbbd38d4859e28aad5cce4b (diff)
parente7e494b18ca831ae46f7e2307f53cb44b5af906c (diff)
Merge pull request #29480 from vespa-engine/havardpe/eliminate-self-in-all-passes
consider self-elimination in all optimize passes
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/blueprint.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp b/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp
index 30aee5e0e83..a8e2e77623f 100644
--- a/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp
@@ -555,9 +555,7 @@ IntermediateBlueprint::optimize(Blueprint* &self, OptimizePass pass)
if (pass == OptimizePass::LAST) {
sort(_children);
}
- if (pass == OptimizePass::FIRST) {
- maybe_eliminate_self(self, get_replacement());
- }
+ maybe_eliminate_self(self, get_replacement());
}
void
@@ -737,9 +735,7 @@ LeafBlueprint::optimize(Blueprint* &self, OptimizePass pass)
{
assert(self == this);
optimize_self(pass);
- if (pass == OptimizePass::FIRST) {
- maybe_eliminate_self(self, get_replacement());
- }
+ maybe_eliminate_self(self, get_replacement());
}
void