diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-01-03 23:09:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-03 23:09:22 +0100 |
commit | 95addf42546ee16c5979a92ebd7eff6f8b51003c (patch) | |
tree | 9a5cf77e156ce1c7238959577b1c907e10bd0a95 /searchlib | |
parent | f4a5dd6d202bd6ca5aba9a878947ade59659dd5b (diff) |
Revert "Compact lid space on source selector."
Diffstat (limited to 'searchlib')
4 files changed, 6 insertions, 28 deletions
diff --git a/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp b/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp index 1eda0b7cb67..a223b87a73f 100644 --- a/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp +++ b/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp @@ -41,7 +41,7 @@ private: void requireThatSelectorCanCloneAndSubtract(); void requireThatSelectorCanCloneAndSubtract(); template <typename SelectorType> - void requireThatSelectorCanSaveAndLoad(bool compactLidSpace); + void requireThatSelectorCanSaveAndLoad(); void requireThatSelectorCanSaveAndLoad(); template <typename SelectorType> void requireThatCompleteSourceRangeIsHandled(); @@ -140,15 +140,12 @@ Test::requireThatSelectorCanCloneAndSubtract() template <typename SelectorType> void -Test::requireThatSelectorCanSaveAndLoad(bool compactLidSpace) +Test::requireThatSelectorCanSaveAndLoad() { SelectorType selector(default_source, base_file_name2); setSources(selector); selector.setBaseId(base_id); selector.setSource(maxDocId + 1, default_source); - if (compactLidSpace) { - selector.compactLidSpace(maxDocId - 4); - } FastOS_FileInterface::EmptyAndRemoveDirectory(index_dir.c_str()); FastOS_FileInterface::MakeDirIfNotPresentOrExit(index_dir.c_str()); @@ -158,13 +155,9 @@ Test::requireThatSelectorCanSaveAndLoad(bool compactLidSpace) save_info->save(TuneFileAttributes(), DummyFileHeaderContext()); typename SelectorType::UP selector2(SelectorType::load(base_file_name)); - testSourceSelector(docs, arraysize(docs) - compactLidSpace, default_source, *selector2); + testSourceSelector(docs, arraysize(docs), default_source, *selector2); EXPECT_EQUAL(base_id, selector2->getBaseId()); - if (compactLidSpace) { - EXPECT_EQUAL(maxDocId - 4, selector2->getDocIdLimit()); - } else { - EXPECT_EQUAL(maxDocId + 2, selector2->getDocIdLimit()); - } + EXPECT_EQUAL(maxDocId + 2, selector2->getDocIdLimit()); FastOS_FileInterface::EmptyAndRemoveDirectory(index_dir.c_str()); } @@ -172,8 +165,7 @@ Test::requireThatSelectorCanSaveAndLoad(bool compactLidSpace) void Test::requireThatSelectorCanSaveAndLoad() { - requireThatSelectorCanSaveAndLoad<FixedSourceSelector>(false); - requireThatSelectorCanSaveAndLoad<FixedSourceSelector>(true); + requireThatSelectorCanSaveAndLoad<FixedSourceSelector>(); } template <typename SelectorType> diff --git a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp index 385ffc95c40..ae2f0234e60 100644 --- a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp +++ b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp @@ -88,10 +88,4 @@ FixedSourceSelector::setSource(uint32_t docId, queryeval::Source source) _source.commit(); } -void -FixedSourceSelector::compactLidSpace(uint32_t lidLimit) -{ - _source.compactLidSpace(lidLimit + 1); -} - } // namespace search diff --git a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h index f92bb1e0eb2..4dbfc22c270 100644 --- a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h +++ b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h @@ -38,9 +38,8 @@ public: // Inherit doc from ISourceSelector void setSource(uint32_t docId, queryeval::Source source) final override; uint32_t getDocIdLimit() const final override { - return _source.getCommittedDocIdLimit() - 1; + return _source.getNumDocs() - 1; } - void compactLidSpace(uint32_t lidLimit) override; std::unique_ptr<IIterator> createIterator() const final override { return std::make_unique<Iterator>(*this); } diff --git a/searchlib/src/vespa/searchlib/queryeval/isourceselector.h b/searchlib/src/vespa/searchlib/queryeval/isourceselector.h index 7151a785c26..88a3cb57a8a 100644 --- a/searchlib/src/vespa/searchlib/queryeval/isourceselector.h +++ b/searchlib/src/vespa/searchlib/queryeval/isourceselector.h @@ -73,13 +73,6 @@ public: virtual uint32_t getDocIdLimit() const = 0; /** - * Sets the lid limit in this selector. - * - * @param lidLimit the new lid limit (one above highest valid doc id). - */ - virtual void compactLidSpace(uint32_t lidLimit) = 0; - - /** * Create a new iterator over the data held by this source * selector. * |