Now we always split phrases.

4 files changed, 13 insertions, 4 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
index e5a0ac3c3fe..8894473dcc7 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
@@ -190,8 +190,7 @@ MatchToolsFactory(QueryLimiter               & queryLimiter,
     trace.addEvent(4, "Start query setup");
     _query.setWhiteListBlueprint(metaStore.createWhiteListBlueprint());
     trace.addEvent(5, "Deserialize and build query tree");
-    _valid = _query.buildTree(queryStack, location, viewResolver, indexEnv,
-                              SplitUnpackingIterators::check(_queryEnv.getProperties(), _rankSetup.split_unpacking_iterators()));
+    _valid = _query.buildTree(queryStack, location, viewResolver, indexEnv, true);
     if (_valid) {
         _query.extractTerms(_queryEnv.terms());
         _query.extractLocations(_queryEnv.locations());
diff --git a/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp b/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp
index 450779dd97d..189ca1b3449 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp
@@ -112,7 +112,7 @@ PartialResult::PartialResult(size_t maxSize_in, bool hasSortData_in)
     }
 }
 
-PartialResult::~PartialResult() {}
+PartialResult::~PartialResult() = default;
 
 void
 PartialResult::merge(Source &rhs)
diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.cpp b/searchcore/src/vespa/searchcore/proton/matching/query.cpp
index 3379fd74a9b..a5fbb588ea1 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/query.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/query.cpp
@@ -165,6 +165,12 @@ Query::~Query() = default;
 
 bool
 Query::buildTree(vespalib::stringref stack, const string &location,
+                 const ViewResolver &resolver, const IIndexEnvironment &indexEnv)
+{
+    return buildTree(stack, location, resolver, indexEnv, true);
+}
+bool
+Query::buildTree(vespalib::stringref stack, const string &location,
                  const ViewResolver &resolver, const IIndexEnvironment &indexEnv,
                  bool split_unpacking_iterators)
 {
diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.h b/searchcore/src/vespa/searchcore/proton/matching/query.h
index 596f8019fb3..b0299307e92 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/query.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/query.h
@@ -55,7 +55,11 @@ public:
                    const vespalib::string &location,
                    const ViewResolver &resolver,
                    const search::fef::IIndexEnvironment &idxEnv,
-                   bool split_unpacking_iterators = false);
+                   bool split_unpacking_iterators);
+    bool buildTree(vespalib::stringref stack,
+                   const vespalib::string &location,
+                   const ViewResolver &resolver,
+                   const search::fef::IIndexEnvironment &idxEnv);
 
     /**
      * Extract query terms from the query tree; to be used to build