Rename prune removed documents job from PruneRemovedDocumentsJobV2 to PruneRemovedDocumentsJob as the orginal has been removed.

4 files changed, 28 insertions, 28 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
index 73b9c17398a..73b7404ce31 100644
--- a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
@@ -80,7 +80,7 @@ vespa_add_library(searchcore_server STATIC
     proton_disk_layout.cpp
     proton_thread_pools_explorer.cpp
     prune_session_cache_job.cpp
-    pruneremoveddocumentsjob_v2.cpp
+    pruneremoveddocumentsjob.cpp
     putdonecontext.cpp
     reconfig_params.cpp
     remove_operations_rate_tracker.cpp
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
index 6bc1907f367..215d4721b87 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
@@ -7,7 +7,7 @@
 #include "lid_space_compaction_handler.h"
 #include "maintenance_jobs_injector.h"
 #include "prune_session_cache_job.h"
-#include "pruneremoveddocumentsjob_v2.h"
+#include "pruneremoveddocumentsjob.h"
 #include "sample_attribute_usage_job.h"
 #include <vespa/searchcore/proton/attribute/attribute_config_inspector.h>
 
@@ -99,10 +99,10 @@ MaintenanceJobsInjector::injectJobs(MaintenanceController &controller,
 
     controller.registerJobInMasterThread(
             trackJob(jobTrackers.getRemovedDocumentsPrune(),
-                     PruneRemovedDocumentsJobV2::create(config.getPruneRemovedDocumentsConfig(), controller.retainDB(),
-                                                        *mRemSubDB.meta_store(), mRemSubDB.sub_db_id(), bucketSpace,
-                                                        docTypeName, prdHandler, controller.masterThread(),
-                                                        bucketExecutor)));
+                     PruneRemovedDocumentsJob::create(config.getPruneRemovedDocumentsConfig(), controller.retainDB(),
+                                                      *mRemSubDB.meta_store(), mRemSubDB.sub_db_id(), bucketSpace,
+                                                      docTypeName, prdHandler, controller.masterThread(),
+                                                      bucketExecutor)));
 
 
     if (!config.getLidSpaceCompactionConfig().isDisabled()) {
diff --git a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob_v2.cpp b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp
index 7bfdaf678b7..45e33a965ef 100644
--- a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob_v2.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp
@@ -1,6 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include "pruneremoveddocumentsjob_v2.h"
+#include "pruneremoveddocumentsjob.h"
 #include "ipruneremoveddocumentshandler.h"
 #include <vespa/persistence/spi/bucket_tasks.h>
 #include <vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.h>
@@ -20,11 +20,11 @@ using vespalib::makeLambdaTask;
 
 namespace proton {
 
-PruneRemovedDocumentsJobV2::
-PruneRemovedDocumentsJobV2(const DocumentDBPruneConfig &config, RetainGuard dbRetainer, const IDocumentMetaStore &metaStore,
-                           uint32_t subDbId, document::BucketSpace bucketSpace, const vespalib::string &docTypeName,
-                           IPruneRemovedDocumentsHandler &handler, IThreadService & master,
-                           BucketExecutor & bucketExecutor)
+PruneRemovedDocumentsJob::
+PruneRemovedDocumentsJob(const DocumentDBPruneConfig &config, RetainGuard dbRetainer, const IDocumentMetaStore &metaStore,
+                         uint32_t subDbId, document::BucketSpace bucketSpace, const vespalib::string &docTypeName,
+                         IPruneRemovedDocumentsHandler &handler, IThreadService & master,
+                         BucketExecutor & bucketExecutor)
     : BlockableMaintenanceJob("prune_removed_documents." + docTypeName,
                               config.getDelay(), config.getInterval()),
       _metaStore(metaStore),
@@ -40,9 +40,9 @@ PruneRemovedDocumentsJobV2(const DocumentDBPruneConfig &config, RetainGuard dbRe
 {
 }
 
-class PruneRemovedDocumentsJobV2::PruneTask : public storage::spi::BucketTask {
+class PruneRemovedDocumentsJob::PruneTask : public storage::spi::BucketTask {
 public:
-    PruneTask(std::shared_ptr<PruneRemovedDocumentsJobV2> job, uint32_t lid, const RawDocumentMetaData & meta, IDestructorCallback::SP opsTracker)
+    PruneTask(std::shared_ptr<PruneRemovedDocumentsJob> job, uint32_t lid, const RawDocumentMetaData & meta, IDestructorCallback::SP opsTracker)
         : _job(std::move(job)),
           _lid(lid),
           _meta(meta),
@@ -53,14 +53,14 @@ public:
         assert(bucket.getBucketId() == _meta.getBucketId());
     }
 private:
-    std::shared_ptr<PruneRemovedDocumentsJobV2> _job;
+    std::shared_ptr<PruneRemovedDocumentsJob> _job;
     uint32_t                                    _lid;
     const RawDocumentMetaData                   _meta;
     IDestructorCallback::SP                     _opsTracker;
 };
 
 void
-PruneRemovedDocumentsJobV2::PruneTask::run(const Bucket & bucket, IDestructorCallback::SP onDone) {
+PruneRemovedDocumentsJob::PruneTask::run(const Bucket & bucket, IDestructorCallback::SP onDone) {
     assert(bucket.getBucketId() == _meta.getBucketId());
     using DoneContext = vespalib::KeepAlive<std::pair<IDestructorCallback::SP, IDestructorCallback::SP>>;
     auto & job = *_job;
@@ -73,7 +73,7 @@ PruneRemovedDocumentsJobV2::PruneTask::run(const Bucket & bucket, IDestructorCal
 }
 
 void
-PruneRemovedDocumentsJobV2::remove(uint32_t lid, const RawDocumentMetaData & oldMeta) {
+PruneRemovedDocumentsJob::remove(uint32_t lid, const RawDocumentMetaData & oldMeta) {
     if (stopped()) return;
     if ( ! _metaStore.validLid(lid)) return;
     const RawDocumentMetaData &meta = _metaStore.getRawMetaData(lid);
@@ -87,7 +87,7 @@ PruneRemovedDocumentsJobV2::remove(uint32_t lid, const RawDocumentMetaData & old
 }
 
 bool
-PruneRemovedDocumentsJobV2::run()
+PruneRemovedDocumentsJob::run()
 {
     vespalib::system_time now = vespalib::system_clock::now();
     const Timestamp ageLimit(static_cast<Timestamp::Type>
diff --git a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob_v2.h b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h
index b0eefedf8e2..9216b10e5a9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob_v2.h
+++ b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h
@@ -21,8 +21,8 @@ class RawDocumentMetaData;
  * Job that regularly checks whether old removed documents should be
  * forgotten.
  */
-class PruneRemovedDocumentsJobV2 : public BlockableMaintenanceJob,
-                                 public std::enable_shared_from_this<PruneRemovedDocumentsJobV2>
+class PruneRemovedDocumentsJob : public BlockableMaintenanceJob,
+                                 public std::enable_shared_from_this<PruneRemovedDocumentsJob>
 {
 private:
     class PruneTask;
@@ -45,20 +45,20 @@ private:
 
     void remove(uint32_t lid, const RawDocumentMetaData & meta);
 
-    PruneRemovedDocumentsJobV2(const DocumentDBPruneConfig &config, RetainGuard dbRetainer, const IDocumentMetaStore &metaStore,
-                               uint32_t subDbId, document::BucketSpace bucketSpace, const vespalib::string &docTypeName,
-                               IPruneRemovedDocumentsHandler &handler, IThreadService & master,
-                               BucketExecutor & bucketExecutor);
+    PruneRemovedDocumentsJob(const DocumentDBPruneConfig &config, RetainGuard dbRetainer, const IDocumentMetaStore &metaStore,
+                             uint32_t subDbId, document::BucketSpace bucketSpace, const vespalib::string &docTypeName,
+                             IPruneRemovedDocumentsHandler &handler, IThreadService & master,
+                             BucketExecutor & bucketExecutor);
     bool run() override;
 public:
-    static std::shared_ptr<PruneRemovedDocumentsJobV2>
+    static std::shared_ptr<PruneRemovedDocumentsJob>
     create(const Config &config, RetainGuard dbRetainer, const IDocumentMetaStore &metaStore, uint32_t subDbId,
            document::BucketSpace bucketSpace, const vespalib::string &docTypeName,
            IPruneRemovedDocumentsHandler &handler, IThreadService & master, BucketExecutor & bucketExecutor)
    {
-        return std::shared_ptr<PruneRemovedDocumentsJobV2>(
-                new PruneRemovedDocumentsJobV2(config, std::move(dbRetainer), metaStore, subDbId, bucketSpace,
-                                               docTypeName, handler, master, bucketExecutor));
+        return std::shared_ptr<PruneRemovedDocumentsJob>(
+                new PruneRemovedDocumentsJob(config, std::move(dbRetainer), metaStore, subDbId, bucketSpace,
+                                             docTypeName, handler, master, bucketExecutor));
     }
 };