Now we always split phrases.

4 files changed, 0 insertions, 24 deletions

diff --git a/searchlib/src/vespa/searchlib/fef/indexproperties.cpp b/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
index ce0d73807a0..c93ebdb241c 100644
--- a/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
+++ b/searchlib/src/vespa/searchlib/fef/indexproperties.cpp
@@ -321,12 +321,6 @@ IgnoreDefaultFeatures::check(const Properties &props)
 
 namespace matching {
 
-const vespalib::string SplitUnpackingIterators::NAME("vespa.matching.split_unpacking_iterators");
-const bool SplitUnpackingIterators::DEFAULT_VALUE(true);
-bool SplitUnpackingIterators::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 a2b83fc2193..3ebfe781400 100644
--- a/searchlib/src/vespa/searchlib/fef/indexproperties.h
+++ b/searchlib/src/vespa/searchlib/fef/indexproperties.h
@@ -238,18 +238,6 @@ namespace mutate::on_summary {
 namespace matching {
 
     /**
-     * When enabled, iterators that unpack posting information as part
-     * of matching may be split into multiple parts (some cheap, some
-     * expensive).
-     **/
-    struct SplitUnpackingIterators {
-        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 a314ce9c5e1..305a534344c 100644
--- a/searchlib/src/vespa/searchlib/fef/ranksetup.cpp
+++ b/searchlib/src/vespa/searchlib/fef/ranksetup.cpp
@@ -36,7 +36,6 @@ RankSetup::RankSetup(const BlueprintFactory &factory, const IIndexEnvironment &i
       _firstPhaseRankFeature(),
       _secondPhaseRankFeature(),
       _degradationAttribute(),
-      _split_unpacking_iterators(false),
       _termwise_limit(1.0),
       _numThreads(0),
       _minHitsPerThread(0),
@@ -97,7 +96,6 @@ RankSetup::configure()
     for (const auto & rename : feature_rename::Rename::lookup(_indexEnv.getProperties())) {
         _feature_rename_map[rename.first] = rename.second;
     }
-    split_unpacking_iterators(matching::SplitUnpackingIterators::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 7e08e3c7d17..403b4410537 100644
--- a/searchlib/src/vespa/searchlib/fef/ranksetup.h
+++ b/searchlib/src/vespa/searchlib/fef/ranksetup.h
@@ -46,7 +46,6 @@ private:
     vespalib::string         _firstPhaseRankFeature;
     vespalib::string         _secondPhaseRankFeature;
     vespalib::string         _degradationAttribute;
-    bool                     _split_unpacking_iterators;
     double                   _termwise_limit;
     uint32_t                 _numThreads;
     uint32_t                 _minHitsPerThread;
@@ -141,9 +140,6 @@ public:
      **/
     const vespalib::string &getSecondPhaseRank() const { return _secondPhaseRankFeature; }
 
-    bool split_unpacking_iterators() const { return _split_unpacking_iterators; }
-    void split_unpacking_iterators(bool value) { _split_unpacking_iterators = value; }
-
     /**
      * Set the termwise limit
      *