diff options
9 files changed, 13 insertions, 36 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 diff --git a/searchlib/src/tests/fef/properties/properties_test.cpp b/searchlib/src/tests/fef/properties/properties_test.cpp index e61c372d415..816ffe5b0b3 100644 --- a/searchlib/src/tests/fef/properties/properties_test.cpp +++ b/searchlib/src/tests/fef/properties/properties_test.cpp @@ -278,14 +278,6 @@ TEST("test stuff") { p.add("vespa.dump.ignoredefaultfeatures", "true"); EXPECT_TRUE(dump::IgnoreDefaultFeatures::check(p)); } - { // vespa.matching.split_unpacking_iterators - EXPECT_EQUAL(matching::SplitUnpackingIterators::NAME, vespalib::string("vespa.matching.split_unpacking_iterators")); - EXPECT_TRUE(matching::SplitUnpackingIterators::DEFAULT_VALUE); - Properties p; - EXPECT_TRUE(matching::SplitUnpackingIterators::check(p)); - p.add("vespa.matching.split_unpacking_iterators", "false"); - EXPECT_FALSE(matching::SplitUnpackingIterators::check(p)); - } { // 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 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 * |