Remove option to delay phrases and same-element. The gain is smaller than the risk and too hard to use.

5 files changed, 0 insertions, 32 deletions

diff --git a/searchlib/src/tests/fef/properties/properties_test.cpp b/searchlib/src/tests/fef/properties/properties_test.cpp
index 80f886a17fd..e61c372d415 100644
--- a/searchlib/src/tests/fef/properties/properties_test.cpp
+++ b/searchlib/src/tests/fef/properties/properties_test.cpp
@@ -286,14 +286,6 @@ TEST("test stuff") {
             p.add("vespa.matching.split_unpacking_iterators", "false");
             EXPECT_FALSE(matching::SplitUnpackingIterators::check(p));
         }
-        { // vespa.matching.delay_unpacking_iterators
-            EXPECT_EQUAL(matching::DelayUnpackingIterators::NAME, vespalib::string("vespa.matching.delay_unpacking_iterators"));
-            EXPECT_EQUAL(matching::DelayUnpackingIterators::DEFAULT_VALUE, false);
-            Properties p;
-            EXPECT_EQUAL(matching::DelayUnpackingIterators::check(p), false);
-            p.add("vespa.matching.delay_unpacking_iterators", "true");
-            EXPECT_EQUAL(matching::DelayUnpackingIterators::check(p), true);
-        }
         { // vespa.matching.termwise_limit
             EXPECT_EQUAL(matching::TermwiseLimit::NAME, vespalib::string("vespa.matching.termwise_limit"));
             EXPECT_EQUAL(matching::TermwiseLimit::DEFAULT_VALUE, 1.0);
diff --git a/searchlib/src/vespa/searchlib/fef/indexproperties.cpp b/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
index fdde77b667d..6ede2eca73c 100644
--- a/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
+++ b/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
@@ -322,12 +322,6 @@ 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, 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 f8cb51683d5..fb6c0e5560b 100644
--- a/searchlib/src/vespa/searchlib/fef/indexproperties.h
+++ b/searchlib/src/vespa/searchlib/fef/indexproperties.h
@@ -242,18 +242,6 @@ namespace matching {
     };
 
     /**
-     * When enabled, iterators that unpack posting information as part
-     * of matching will be tagged as expensive, in order to delay
-     * their execution within the iterator tree.
-     **/
-    struct DelayUnpackingIterators {
-        static const vespalib::string NAME;
-        static const bool DEFAULT_VALUE;
-        static bool check(const Properties &props) { return check(props, DEFAULT_VALUE); }
-        static bool check(const Properties &props, bool fallback);
-    };
-
-    /**
      * A number in the range [0,1] indicating how much of the corpus
      * the query must match for termwise evaluation to be enabled. 1
      * means never allowed. 0 means always allowed. The default value
diff --git a/searchlib/src/vespa/searchlib/fef/ranksetup.cpp b/searchlib/src/vespa/searchlib/fef/ranksetup.cpp
index 30e220b0a34..f725756c269 100644
--- a/searchlib/src/vespa/searchlib/fef/ranksetup.cpp
+++ b/searchlib/src/vespa/searchlib/fef/ranksetup.cpp
@@ -37,7 +37,6 @@ RankSetup::RankSetup(const BlueprintFactory &factory, const IIndexEnvironment &i
       _secondPhaseRankFeature(),
       _degradationAttribute(),
       _split_unpacking_iterators(false),
-      _delay_unpacking_iterators(false),
       _termwise_limit(1.0),
       _numThreads(0),
       _minHitsPerThread(0),
@@ -98,7 +97,6 @@ RankSetup::configure()
         _feature_rename_map[rename.first] = rename.second;
     }
     split_unpacking_iterators(matching::SplitUnpackingIterators::check(_indexEnv.getProperties()));
-    delay_unpacking_iterators(matching::DelayUnpackingIterators::check(_indexEnv.getProperties()));
     set_termwise_limit(matching::TermwiseLimit::lookup(_indexEnv.getProperties()));
     setNumThreadsPerSearch(matching::NumThreadsPerSearch::lookup(_indexEnv.getProperties()));
     setMinHitsPerThread(matching::MinHitsPerThread::lookup(_indexEnv.getProperties()));
diff --git a/searchlib/src/vespa/searchlib/fef/ranksetup.h b/searchlib/src/vespa/searchlib/fef/ranksetup.h
index 5b39715d5a1..866bf2286db 100644
--- a/searchlib/src/vespa/searchlib/fef/ranksetup.h
+++ b/searchlib/src/vespa/searchlib/fef/ranksetup.h
@@ -47,7 +47,6 @@ private:
     vespalib::string         _secondPhaseRankFeature;
     vespalib::string         _degradationAttribute;
     bool                     _split_unpacking_iterators;
-    bool                     _delay_unpacking_iterators;
     double                   _termwise_limit;
     uint32_t                 _numThreads;
     uint32_t                 _minHitsPerThread;
@@ -144,9 +143,6 @@ public:
     bool split_unpacking_iterators() const { return _split_unpacking_iterators; }
     void split_unpacking_iterators(bool value) { _split_unpacking_iterators = value; }
 
-    bool delay_unpacking_iterators() const { return _delay_unpacking_iterators; }
-    void delay_unpacking_iterators(bool value) { _delay_unpacking_iterators = value; }
-
     /**
      * Set the termwise limit
      *