diff options
6 files changed, 16 insertions, 51 deletions
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/scaniterator_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/scaniterator_test.cpp index 0fa3dcd4932..4ec38ff7170 100644 --- a/searchcore/src/tests/proton/documentdb/documentbucketmover/scaniterator_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/scaniterator_test.cpp @@ -12,7 +12,6 @@ using namespace proton::move::test; using document::BucketId; using ScanItr = bucketdb::ScanIterator; -using ScanPass = ScanItr::Pass; struct ScanTestBase : public ::testing::Test { @@ -24,11 +23,11 @@ struct ScanTestBase : public ::testing::Test ~ScanTestBase(); ScanItr getItr() { - return ScanItr(_bucketDB->takeGuard(), BucketId()); + return getItr(BucketId()); } - ScanItr getItr(BucketId bucket, BucketId endBucket = BucketId(), ScanPass pass = ScanPass::FIRST) { - return ScanItr(_bucketDB->takeGuard(), pass, bucket, endBucket); + ScanItr getItr(BucketId bucket) { + return ScanItr(_bucketDB->takeGuard(), bucket); } }; @@ -99,7 +98,8 @@ advanceToFirstBucketWithDocs(ScanItr &itr, SubDbType subDbType) } } -void assertEquals(const BucketVector &exp, ScanItr &itr, SubDbType subDbType) +void +assertEquals(const BucketVector &exp, ScanItr &itr, SubDbType subDbType) { for (size_t i = 0; i < exp.size(); ++i) { advanceToFirstBucketWithDocs(itr, subDbType); @@ -129,18 +129,13 @@ TEST_F(ScanTest, require_that_we_can_iterate_all_buckets_from_start_to_end) TEST_F(ScanTest, require_that_we_can_iterate_from_the_middle_of_not_ready_buckets) { - BucketId bucket = _notReady.bucket(2); + BucketId bucket = _notReady.bucket(4); { - ScanItr itr = getItr(bucket, bucket, ScanPass::FIRST); + ScanItr itr = getItr(bucket); assertEquals(BucketVector(). add(_notReady.bucket(4)), itr, SubDbType::NOTREADY); } { - ScanItr itr = getItr(BucketId(), bucket, ScanPass::SECOND); - assertEquals(BucketVector(). - add(_notReady.bucket(2)), itr, SubDbType::NOTREADY); - } - { ScanItr itr = getItr(); assertEquals(BucketVector(). add(_ready.bucket(6)). @@ -150,7 +145,6 @@ TEST_F(ScanTest, require_that_we_can_iterate_from_the_middle_of_not_ready_bucket TEST_F(ScanTest, require_that_we_can_iterate_from_the_middle_of_ready_buckets) { - BucketId bucket = _ready.bucket(6); { ScanItr itr = getItr(); assertEquals(BucketVector(). @@ -158,15 +152,12 @@ TEST_F(ScanTest, require_that_we_can_iterate_from_the_middle_of_ready_buckets) add(_notReady.bucket(4)), itr, SubDbType::NOTREADY); } { - ScanItr itr = getItr(bucket, bucket, ScanPass::FIRST); + BucketId bucket = _ready.bucket(6); + ScanItr itr = getItr(bucket); assertEquals(BucketVector(). + add(_ready.bucket(6)). add(_ready.bucket(8)), itr, SubDbType::READY); } - { - ScanItr itr = getItr(BucketId(), bucket, ScanPass::SECOND); - assertEquals(BucketVector(). - add(_ready.bucket(6)), itr, SubDbType::READY); - } } TEST_F(OnlyNotReadyScanTest, require_that_we_can_iterate_only_not_ready_buckets) diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketscaniterator.cpp b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketscaniterator.cpp index d535d7cd7da..c691e786add 100644 --- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketscaniterator.cpp +++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketscaniterator.cpp @@ -3,17 +3,9 @@ #include "bucketscaniterator.h" using document::BucketId; -using storage::spi::BucketInfo; namespace proton::bucketdb { -ScanIterator::ScanIterator(const Guard & db, Pass pass, BucketId lastBucket, BucketId endBucket) - : _db(std::move(db)), - _itr(lastBucket.isSet() ? _db->upperBound(lastBucket) : _db->begin()), - _end(pass == Pass::SECOND && endBucket.isSet() ? - _db->upperBound(endBucket) : _db->end()) -{ } - ScanIterator::ScanIterator(const Guard & db, BucketId bucket) : _db(std::move(db)), _itr(_db->lowerBound(bucket)), diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketscaniterator.h b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketscaniterator.h index 2d5b71c8b29..1b68cfc1e59 100644 --- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketscaniterator.h +++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketscaniterator.h @@ -7,13 +7,6 @@ namespace proton::bucketdb { -struct ScanPosition { - document::BucketId _lastBucket; - - ScanPosition() : _lastBucket() { } - bool validBucket() const { return _lastBucket.isSet(); } -}; - class ScanIterator { private: @@ -24,8 +17,6 @@ private: BucketIterator _end; public: - enum class Pass {FIRST, SECOND}; - ScanIterator(const Guard & db, Pass pass, BucketId lastBucket, BucketId endBucket); ScanIterator(const Guard & db, BucketId bucket); ScanIterator(const ScanIterator &) = delete; ScanIterator(ScanIterator &&rhs) = delete; diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketsessionbase.cpp b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketsessionbase.cpp index 3ad632625a4..b46fd0a7a3e 100644 --- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketsessionbase.cpp +++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketsessionbase.cpp @@ -22,8 +22,7 @@ BucketSessionBase::extractInfo(const BucketId &bucket, BucketState *&state) bool -BucketSessionBase::calcFixupNeed(BucketState *state, bool wantActive, - bool fixup) +BucketSessionBase::calcFixupNeed(BucketState *state, bool wantActive, bool fixup) { if (state && state->isActive() != wantActive) { if (fixup) { diff --git a/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.cpp b/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.cpp index 386d8367e52..5ade2e263c6 100644 --- a/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.cpp @@ -6,7 +6,6 @@ #include "iclusterstatechangednotifier.h" #include "i_disk_mem_usage_notifier.h" #include "ibucketmodifiedhandler.h" -#include "move_operation_limiter.h" #include "document_db_maintenance_config.h" #include <vespa/searchcore/proton/metrics/documentdb_tagged_metrics.h> #include <vespa/searchcore/proton/bucketdb/i_bucket_create_notifier.h> diff --git a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h index 5ef0bb39a5c..a11098ad131 100644 --- a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h +++ b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h @@ -26,16 +26,12 @@ private: // storage::spi::BucketIdListResult::List _modifiedBuckets; std::set<document::BucketId> _modifiedBuckets; - void - performSetClusterState(const storage::spi::ClusterState *calc, - IGenericResultHandler *resultHandler); + void performSetClusterState(const storage::spi::ClusterState *calc, IGenericResultHandler *resultHandler); - void - performGetModifiedBuckets(IBucketIdListResultHandler *resultHandler); + void performGetModifiedBuckets(IBucketIdListResultHandler *resultHandler); // Implements IBucketModifiedHandler - virtual void - notifyBucketModified(const document::BucketId &bucket) override; + void notifyBucketModified(const document::BucketId &bucket) override; public: ClusterStateHandler(vespalib::Executor &executor); @@ -47,12 +43,9 @@ public: /** * Implements the cluster state aspect of IPersistenceHandler. */ - void - handleSetClusterState(const storage::spi::ClusterState &calc, - IGenericResultHandler &resultHandler); + void handleSetClusterState(const storage::spi::ClusterState &calc, IGenericResultHandler &resultHandler); - void - handleGetModifiedBuckets(IBucketIdListResultHandler &resultHandler); + void handleGetModifiedBuckets(IBucketIdListResultHandler &resultHandler); }; } // namespace proton |