diff options
author | Lester Solbakken <lesters@oath.com> | 2018-09-06 10:01:28 +0200 |
---|---|---|
committer | Lester Solbakken <lesters@oath.com> | 2018-09-06 10:01:28 +0200 |
commit | 3c497896a20b1e4636a628802b5e722800a20bd2 (patch) | |
tree | 24413159410db63490ad197fd06f86eca74d9e14 /searchcore | |
parent | f41d2b1147f4fdf11c9a7df2a256823cd46e0048 (diff) |
Add using HeapSize to avoid long namespace qualifiers
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/tests/proton/matching/matching_test.cpp | 3 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/matcher.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp index 4813bf3bdc7..7c6779fdc63 100644 --- a/searchcore/src/tests/proton/matching/matching_test.cpp +++ b/searchcore/src/tests/proton/matching/matching_test.cpp @@ -53,6 +53,7 @@ using namespace search; using search::attribute::test::MockAttributeContext; using search::index::schema::DataType; using storage::spi::Timestamp; +using search::fef::indexproperties::hitcollector::HeapSize; void inject_match_phase_limiting(Properties &setup, const vespalib::string &attribute, size_t max_hits, bool descending) { @@ -287,7 +288,7 @@ struct MyWorld { Matcher::SP matcher = createMatcher(); search::fef::Properties overrides; auto mtf = matcher->create_match_tools_factory(*req, searchContext, attributeContext, metaStore, overrides); - auto diversity = mtf->createDiversifier(search::fef::indexproperties::hitcollector::HeapSize::lookup(config)); + auto diversity = mtf->createDiversifier(HeapSize::lookup(config)); EXPECT_EQUAL(expectDiverse, static_cast<bool>(diversity)); } diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp index 13562c4e45a..b32af7e3e5a 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp @@ -28,6 +28,7 @@ using search::FeatureSet; using search::attribute::IAttributeContext; using search::fef::MatchDataLayout; using search::fef::MatchData; +using search::fef::indexproperties::hitcollector::HeapSize; using search::queryeval::Blueprint; using search::queryeval::SearchIterator; using vespalib::Doom; @@ -243,8 +244,7 @@ Matcher::match(const SearchRequest &request, vespalib::ThreadBundle &threadBundl } const Properties & rankProperties = request.propertiesMap.rankProperties(); - uint32_t heapSize = search::fef::indexproperties::hitcollector:: HeapSize::lookup(rankProperties, - _rankSetup->getHeapSize()); + uint32_t heapSize = HeapSize::lookup(rankProperties, _rankSetup->getHeapSize()); MatchParams params(searchContext.getDocIdLimit(), heapSize, _rankSetup->getArraySize(), _rankSetup->getRankScoreDropLimit(), request.offset, request.maxhits, |