Merge pull request #30905 from vespa-engine/havardpe/improve-strict-and-sort-when-allowedv8.330.52

improve strict and sorting when allowed

1 files changed, 3 insertions, 0 deletions

diff --git a/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp b/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp
index fb1bb0b6cf1..449a6a044b9 100644
--- a/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp
@@ -261,6 +261,9 @@ AndBlueprint::sort(Children &children, bool strict, bool sort_by_cost) const
 {
     if (sort_by_cost) {
         AndFlow::sort(children, strict);
+        if (strict && opt_allow_force_strict()) {
+            AndFlow::reorder_for_extra_strictness(children, true, 3);
+        }
     } else {
         std::sort(children.begin(), children.end(), TieredLessEstimate());
     }