Remove retry parameter not in use anymore.

8 files changed, 17 insertions, 30 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 {
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.cpp b/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.cpp
index 4265d4c7099..c0f27e729af 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.cpp
@@ -23,12 +23,9 @@ DocumentScanIterator::valid() const
 }
 
 DocumentMetaData
-DocumentScanIterator::next(uint32_t compactLidLimit, bool retry)
+DocumentScanIterator::next(uint32_t compactLidLimit)
 {
-    if (!retry) {
-        --_lastLid;
-    }
-    for (; _lastLid > compactLidLimit; --_lastLid) {
+    for (--_lastLid; _lastLid > compactLidLimit; --_lastLid) {
         if (_metaStore.validLid(_lastLid)) {
             const RawDocumentMetaData &metaData = _metaStore.getRawMetaData(_lastLid);
             return DocumentMetaData(_lastLid, metaData.getTimestamp(),
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h b/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h
index b7c5131171a..ebdeb902474 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h
+++ b/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h
@@ -21,7 +21,7 @@ private:
 public:
     DocumentScanIterator(const IDocumentMetaStore &_metaStore);
     bool valid() const override;
-    search::DocumentMetaData next(uint32_t compactLidLimit, bool retry) override;
+    search::DocumentMetaData next(uint32_t compactLidLimit) override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/i_document_scan_iterator.h b/searchcore/src/vespa/searchcore/proton/server/i_document_scan_iterator.h
index 60e3d1c6081..b3c14173b0e 100644
--- a/searchcore/src/vespa/searchcore/proton/server/i_document_scan_iterator.h
+++ b/searchcore/src/vespa/searchcore/proton/server/i_document_scan_iterator.h
@@ -27,9 +27,8 @@ struct IDocumentScanIterator
      * Returns an invalid document if no documents satisfy the limit.
      *
      * @param compactLidLimit The returned document must have lid larger than this limit.
-     * @param retry Whether we should start the scan with the previous returned document.
      */
-    virtual search::DocumentMetaData next(uint32_t compactLidLimit, bool retry) = 0;
+    virtual search::DocumentMetaData next(uint32_t compactLidLimit) = 0;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp
index a5c1d1fc2c9..58019d9a73a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp
@@ -73,7 +73,7 @@ bool
 CompactionJob::scanDocuments(const LidUsageStats &stats)
 {
     if (_scanItr->valid()) {
-        DocumentMetaData document = getNextDocument(stats, false);
+        DocumentMetaData document = getNextDocument(stats);
         if (document.valid()) {
             Bucket metaBucket(document::Bucket(_bucketSpace, document.bucketId));
             _bucketExecutor.execute(metaBucket, std::make_unique<MoveTask>(shared_from_this(), document, getLimiter().beginOperation()));
@@ -190,9 +190,9 @@ CompactionJob::create(const DocumentDBLidSpaceCompactionConfig &config,
 }
 
 DocumentMetaData
-CompactionJob::getNextDocument(const LidUsageStats &stats, bool retryLastDocument)
+CompactionJob::getNextDocument(const LidUsageStats &stats)
 {
-    return _scanItr->next(std::max(stats.getLowestFreeLid(), stats.getUsedLids()), retryLastDocument);
+    return _scanItr->next(std::max(stats.getLowestFreeLid(), stats.getUsedLids()));
 }
 
 bool
@@ -201,7 +201,6 @@ CompactionJob::run()
     if (isBlocked()) {
         return true; // indicate work is done since no work can be done
     }
-    LidUsageStats stats = _handler->getLidStatus();
     if (remove_batch_is_ongoing()) {
         // Note that we don't set the job as blocked as the decision to un-block it is not driven externally.
         LOG(info, "%s: Lid space compaction is disabled while remove batch (delete buckets) is ongoing",
@@ -222,8 +221,9 @@ CompactionJob::run()
         _is_disabled = false;
     }
 
+    LidUsageStats stats = _handler->getLidStatus();
     if (_scanItr && !_scanItr->valid()) {
-        if (shouldRestartScanDocuments(_handler->getLidStatus())) {
+        if (shouldRestartScanDocuments(stats)) {
             _scanItr = _handler->getIterator();
         } else {
             _scanItr = IDocumentScanIterator::UP();
diff --git a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.h b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.h
index 917ff12be4a..fcdcc322f65 100644
--- a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.h
+++ b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.h
@@ -58,7 +58,7 @@ private:
     void compactLidSpace(const search::LidUsageStats &stats);
     bool remove_batch_is_ongoing() const;
     bool remove_is_ongoing() const;
-    search::DocumentMetaData getNextDocument(const search::LidUsageStats &stats, bool retryLastDocument);
+    search::DocumentMetaData getNextDocument(const search::LidUsageStats &stats);
 
     bool scanDocuments(const search::LidUsageStats &stats);
     static void moveDocument(std::shared_ptr<CompactionJob> job, const search::DocumentMetaData & metaThen,
@@ -98,4 +98,3 @@ public:
 };
 
 } // namespace proton
-