Allow query time control of spli/delay query optimisations.

2 files changed, 10 insertions, 4 deletions

diff --git a/searchlib/src/vespa/searchlib/fef/indexproperties.cpp b/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
index 168f5e4369f..ec2d02c2460 100644
--- a/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
+++ b/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
@@ -318,11 +318,15 @@ namespace matching {
 
 const vespalib::string SplitUnpackingIterators::NAME("vespa.matching.split_unpacking_iterators");
 const bool SplitUnpackingIterators::DEFAULT_VALUE(false);
-bool SplitUnpackingIterators::check(const Properties &props) { return lookupBool(props, NAME, DEFAULT_VALUE); }
+bool SplitUnpackingIterators::check(const Properties &props, bool fallback) {
+    return lookupBool(props, NAME, fallback);
+}
 
 const vespalib::string DelayUnpackingIterators::NAME("vespa.matching.delay_unpacking_iterators");
 const bool DelayUnpackingIterators::DEFAULT_VALUE(false);
-bool DelayUnpackingIterators::check(const Properties &props) { return lookupBool(props, NAME, DEFAULT_VALUE); }
+bool DelayUnpackingIterators::check(const Properties &props, bool fallback) {
+    return lookupBool(props, NAME, fallback);
+}
 
 const vespalib::string TermwiseLimit::NAME("vespa.matching.termwise_limit");
 const double TermwiseLimit::DEFAULT_VALUE(1.0);
diff --git a/searchlib/src/vespa/searchlib/fef/indexproperties.h b/searchlib/src/vespa/searchlib/fef/indexproperties.h
index ce3798a6c8e..f8cb51683d5 100644
--- a/searchlib/src/vespa/searchlib/fef/indexproperties.h
+++ b/searchlib/src/vespa/searchlib/fef/indexproperties.h
@@ -237,7 +237,8 @@ namespace matching {
     struct SplitUnpackingIterators {
         static const vespalib::string NAME;
         static const bool DEFAULT_VALUE;
-        static bool check(const Properties &props);
+        static bool check(const Properties &props) { return check(props, DEFAULT_VALUE); }
+        static bool check(const Properties &props, bool fallback);
     };
 
     /**
@@ -248,7 +249,8 @@ namespace matching {
     struct DelayUnpackingIterators {
         static const vespalib::string NAME;
         static const bool DEFAULT_VALUE;
-        static bool check(const Properties &props);
+        static bool check(const Properties &props) { return check(props, DEFAULT_VALUE); }
+        static bool check(const Properties &props, bool fallback);
     };
 
     /**