diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-12-10 20:00:05 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-12-10 21:04:11 +0000 |
commit | d30f8f848b9ab2c3d321b75c2fa1818ef64ce038 (patch) | |
tree | f4d5f2e9db4ec826d7bfdd99dd794ee6ac19f807 /searchcore/src/tests/proton/documentdb | |
parent | b6a476ea1f7b5f07710e62d7fb00142503289c04 (diff) |
Remove retry parameter not in use anymore.
Diffstat (limited to 'searchcore/src/tests/proton/documentdb')
3 files changed, 7 insertions, 15 deletions
diff --git a/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp b/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp index 73160d1db94..4825dc6e8a7 100644 --- a/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp @@ -49,19 +49,19 @@ struct Fixture } LidSet retval; for (uint32_t i = 0; i < count; ++i) { - uint32_t lid = next(compactLidLimit, false); + uint32_t lid = next(compactLidLimit); retval.insert(lid); EXPECT_TRUE(_itr->valid() || lid <= compactLidLimit); } - EXPECT_EQUAL(0u, next(compactLidLimit, false)); + EXPECT_EQUAL(0u, next(compactLidLimit)); EXPECT_FALSE(_itr->valid()); return retval; } - uint32_t next(uint32_t compactLidLimit, bool retry = false) { + uint32_t next(uint32_t compactLidLimit) { if (!_itr) { _itr = std::make_unique<DocumentScanIterator>(_metaStore); } - return _itr->next(compactLidLimit, retry).lid; + return _itr->next(compactLidLimit).lid; } }; @@ -82,14 +82,6 @@ TEST_F("require that only lids > lid limit are returned", Fixture) assertLidSet({5,6,7,8}, f.scan(4, 4)); } -TEST_F("require that we start scan at previous doc if retry is set", Fixture) -{ - f.add({1,2,3,4,5,6,7,8}); - uint32_t lid1 = f.next(4, false); - uint32_t lid2 = f.next(4, true); - EXPECT_EQUAL(lid1, lid2); -} - TEST_MAIN() { TEST_RUN_ALL(); diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_common.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_common.cpp index 3abeaf37062..57989688a4f 100644 --- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_common.cpp +++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_common.cpp @@ -19,8 +19,8 @@ MyScanIterator::valid() const { return _validItr; } -search::DocumentMetaData MyScanIterator::next(uint32_t compactLidLimit, bool retry) { - if (!retry && _itr != _lids.begin()) { +search::DocumentMetaData MyScanIterator::next(uint32_t compactLidLimit) { + if (_itr != _lids.begin()) { ++_itr; } for (; _itr != _lids.end() && (*_itr) <= compactLidLimit; ++_itr) {} diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_common.h b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_common.h index 8e1b23eba67..b404fc6956a 100644 --- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_common.h +++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_common.h @@ -56,7 +56,7 @@ struct MyScanIterator : public IDocumentScanIterator { explicit MyScanIterator(const MyHandler & handler, const LidVector &lids); ~MyScanIterator() override; bool valid() const override; - search::DocumentMetaData next(uint32_t compactLidLimit, bool retry) override; + search::DocumentMetaData next(uint32_t compactLidLimit) override; }; struct MyHandler : public ILidSpaceCompactionHandler { |