Some minor code health by typedef -> using and not exposing more than necessary, or stating the obvoius.

11 files changed, 54 insertions, 57 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.cpp b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.cpp
index af250b61d03..2e56b7010f9 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.cpp
@@ -28,15 +28,15 @@ DocumentDBJobTrackers::DocumentDBJobTrackers()
 {
 }
 
-DocumentDBJobTrackers::~DocumentDBJobTrackers() {}
+DocumentDBJobTrackers::~DocumentDBJobTrackers() = default;
 
 namespace {
 
 IFlushTarget::SP
-trackFlushTarget(const IJobTracker::SP &tracker,
-                 const IFlushTarget::SP &target)
+trackFlushTarget(std::shared_ptr<IJobTracker> tracker,
+                 std::shared_ptr<IFlushTarget> target)
 {
-    return std::make_shared<JobTrackedFlushTarget>(tracker, target);
+    return std::make_shared<JobTrackedFlushTarget>(std::move(tracker), std::move(target));
 }
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h
index a05fbb49a41..cd7ec612d98 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h
@@ -4,8 +4,6 @@
 #include "documentdb_tagged_metrics.h"
 #include "job_tracker.h"
 #include <vespa/searchcorespi/flush/iflushtarget.h>
-#include <chrono>
-#include <mutex>
 
 namespace proton {
 
@@ -16,20 +14,23 @@ namespace proton {
 class DocumentDBJobTrackers
 {
 private:
-    std::mutex        _lock;
     using time_point = std::chrono::time_point<std::chrono::steady_clock>;
-    time_point        _now;
-    JobTracker::SP    _attributeFlush;
-    JobTracker::SP    _memoryIndexFlush;
-    JobTracker::SP    _diskIndexFusion;
-    JobTracker::SP    _documentStoreFlush;
-    JobTracker::SP    _documentStoreCompact;
-    JobTracker::SP    _bucketMove;
-    JobTracker::SP    _lidSpaceCompact;
-    JobTracker::SP    _removedDocumentsPrune;
+    using JobTrackerSP = std::shared_ptr<JobTracker>;
+    std::mutex      _lock;
+    time_point      _now;
+    JobTrackerSP    _attributeFlush;
+    JobTrackerSP    _memoryIndexFlush;
+    JobTrackerSP    _diskIndexFusion;
+    JobTrackerSP    _documentStoreFlush;
+    JobTrackerSP    _documentStoreCompact;
+    JobTrackerSP    _bucketMove;
+    JobTrackerSP    _lidSpaceCompact;
+    JobTrackerSP    _removedDocumentsPrune;
 
 public:
     DocumentDBJobTrackers();
+    DocumentDBJobTrackers(const DocumentDBJobTrackers &) = delete;
+    DocumentDBJobTrackers & operator = (const DocumentDBJobTrackers &) = delete;
     ~DocumentDBJobTrackers();
 
     IJobTracker &getAttributeFlush() { return *_attributeFlush; }
@@ -37,9 +38,9 @@ public:
     IJobTracker &getDiskIndexFusion() { return *_diskIndexFusion; }
     IJobTracker &getDocumentStoreFlush() { return *_documentStoreFlush; }
     IJobTracker &getDocumentStoreCompact() { return *_documentStoreCompact; }
-    IJobTracker::SP getBucketMove() { return _bucketMove; }
-    IJobTracker::SP getLidSpaceCompact() { return _lidSpaceCompact; }
-    IJobTracker::SP getRemovedDocumentsPrune() { return _removedDocumentsPrune; }
+    std::shared_ptr<IJobTracker> getBucketMove() { return _bucketMove; }
+    std::shared_ptr<IJobTracker> getLidSpaceCompact() { return _lidSpaceCompact; }
+    std::shared_ptr<IJobTracker> getRemovedDocumentsPrune() { return _removedDocumentsPrune; }
 
     searchcorespi::IFlushTarget::List
     trackFlushTargets(const searchcorespi::IFlushTarget::List &flushTargets);
@@ -47,5 +48,4 @@ public:
     void updateMetrics(DocumentDBTaggedMetrics::JobMetrics &metrics);
 };
 
-} // namespace proton
-
+}
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/i_job_tracker.h b/searchcore/src/vespa/searchcore/proton/metrics/i_job_tracker.h
index 646a9f07672..eec8cfbc44a 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/i_job_tracker.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/i_job_tracker.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include <memory>
-
 namespace proton {
 
 /**
@@ -11,9 +9,7 @@ namespace proton {
  */
 struct IJobTracker
 {
-    typedef std::shared_ptr<IJobTracker> SP;
-
-    virtual ~IJobTracker() {}
+    virtual ~IJobTracker() = default;
 
     virtual void start() = 0;
     virtual void end() = 0;
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.cpp b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.cpp
index 8de3c29d02b..5b49c724c6f 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.cpp
@@ -8,11 +8,11 @@ using searchcorespi::FlushTask;
 
 namespace proton {
 
-JobTrackedFlushTarget::JobTrackedFlushTarget(const IJobTracker::SP &tracker,
-                                             const IFlushTarget::SP &target)
+JobTrackedFlushTarget::JobTrackedFlushTarget(std::shared_ptr<IJobTracker> tracker,
+                                             std::shared_ptr<IFlushTarget> target)
     : IFlushTarget(target->getName(), target->getType(), target->getComponent()),
-      _tracker(tracker),
-      _target(target)
+      _tracker(std::move(tracker)),
+      _target(std::move(target))
 {
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.h b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.h
index 7a9bae7f662..35d1b0b0b12 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.h
@@ -13,12 +13,12 @@ namespace proton {
 class JobTrackedFlushTarget : public searchcorespi::IFlushTarget
 {
 private:
-    IJobTracker::SP                 _tracker;
-    searchcorespi::IFlushTarget::SP _target;
+    std::shared_ptr<IJobTracker>                 _tracker;
+    std::shared_ptr<searchcorespi::IFlushTarget> _target;
 
 public:
-    JobTrackedFlushTarget(const IJobTracker::SP &tracker,
-                          const searchcorespi::IFlushTarget::SP &target);
+    JobTrackedFlushTarget(std::shared_ptr<IJobTracker> tracker,
+                          std::shared_ptr<searchcorespi::IFlushTarget> target);
     ~JobTrackedFlushTarget();
 
     const IJobTracker &getTracker() const { return *_tracker; }
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.cpp b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.cpp
index f5cf0b1afff..3e06c8321fd 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.cpp
@@ -6,13 +6,14 @@ using searchcorespi::FlushTask;
 
 namespace proton {
 
-JobTrackedFlushTask::JobTrackedFlushTask(const IJobTracker::SP &tracker,
-                                         FlushTask::UP task)
-    : _tracker(tracker),
+JobTrackedFlushTask::JobTrackedFlushTask(std::shared_ptr<IJobTracker> tracker, FlushTask::UP task)
+    : _tracker(std::move(tracker)),
       _task(std::move(task))
 {
 }
 
+JobTrackedFlushTask::~JobTrackedFlushTask() = default;
+
 void
 JobTrackedFlushTask::run()
 {
@@ -21,4 +22,4 @@ JobTrackedFlushTask::run()
     _tracker->end();
 }
 
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.h b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.h
index fe8d59b9dd6..a10ccbdffd6 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.h
@@ -12,16 +12,18 @@ namespace proton {
 class JobTrackedFlushTask : public searchcorespi::FlushTask
 {
 private:
-    IJobTracker::SP              _tracker;
+    std::shared_ptr<IJobTracker>  _tracker;
     searchcorespi::FlushTask::UP _task;
 
 public:
-    JobTrackedFlushTask(const IJobTracker::SP &tracker,
+    JobTrackedFlushTask(std::shared_ptr<IJobTracker> tracker,
                         searchcorespi::FlushTask::UP task);
+    JobTrackedFlushTask(const JobTrackedFlushTask &) = delete;
+    JobTrackedFlushTask & operator = (const JobTrackedFlushTask &) = delete;
+    ~JobTrackedFlushTask() override;
 
-    // Implements searchcorespi::FlushTask
-    virtual void run() override;
-    virtual search::SerialNum getFlushSerial() const override {
+    void run() override;
+    search::SerialNum getFlushSerial() const override {
         return _task->getFlushSerial();
     }
 };
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h b/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h
index 49b63a6d018..dee974f8b56 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h
@@ -19,8 +19,6 @@ private:
     std::mutex     &_lock;
 
 public:
-    typedef std::shared_ptr<JobTracker> SP;
-
     JobTracker(time_point now, std::mutex &lock);
 
     /**
@@ -29,10 +27,8 @@ public:
      */
     double sampleLoad(time_point now, const std::lock_guard<std::mutex> &guard);
 
-    // Implements IJobTracker
-    virtual void start() override;
-    virtual void end() override;
+    void start() override;
+    void end() override;
 };
 
-} // namespace proton
-
+}
diff --git a/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.cpp b/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.cpp
index e317c86df05..c0d8168ab61 100644
--- a/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.cpp
@@ -4,7 +4,7 @@
 
 namespace proton {
 
-JobTrackedMaintenanceJob::JobTrackedMaintenanceJob(IJobTracker::SP tracker,
+JobTrackedMaintenanceJob::JobTrackedMaintenanceJob(std::shared_ptr<IJobTracker> tracker,
                                                    IMaintenanceJob::SP job)
     : IMaintenanceJob(job->getName(), job->getDelay(), job->getInterval()),
       _tracker(std::move(tracker)),
diff --git a/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h b/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h
index 1953393bad7..20ecfdf023d 100644
--- a/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h
+++ b/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h
@@ -12,12 +12,14 @@ namespace proton {
 class JobTrackedMaintenanceJob final : public IMaintenanceJob
 {
 private:
-    IJobTracker::SP     _tracker;
-    IMaintenanceJob::SP _job;
-    bool                _running;
+    std::shared_ptr<IJobTracker>  _tracker;
+    IMaintenanceJob::SP           _job;
+    bool                          _running;
 
 public:
-    JobTrackedMaintenanceJob(IJobTracker::SP tracker, IMaintenanceJob::SP job);
+    JobTrackedMaintenanceJob(std::shared_ptr<IJobTracker> tracker, IMaintenanceJob::SP job);
+    JobTrackedMaintenanceJob(const JobTrackedMaintenanceJob &) = delete;
+    JobTrackedMaintenanceJob & operator = (const JobTrackedMaintenanceJob &) = delete;
     ~JobTrackedMaintenanceJob() override;
 
     bool isBlocked() const override { return _job->isBlocked(); }
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 1f9ae5ee6b3..49b301da26e 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
@@ -17,7 +17,7 @@ namespace proton {
 namespace {
 
 IMaintenanceJob::UP
-trackJob(IJobTracker::SP tracker, std::shared_ptr<IMaintenanceJob> job)
+trackJob(std::shared_ptr<IJobTracker> tracker, std::shared_ptr<IMaintenanceJob> job)
 {
     return std::make_unique<JobTrackedMaintenanceJob>(std::move(tracker), std::move(job));
 }
@@ -28,7 +28,7 @@ injectLidSpaceCompactionJobs(MaintenanceController &controller,
                              storage::spi::BucketExecutor & bucketExecutor,
                              ILidSpaceCompactionHandler::Vector lscHandlers,
                              IOperationStorer &opStorer,
-                             IJobTracker::SP tracker,
+                             std::shared_ptr<IJobTracker> tracker,
                              IDiskMemUsageNotifier &diskMemUsageNotifier,
                              IClusterStateChangedNotifier &clusterStateChangedNotifier,
                              const std::shared_ptr<IBucketStateCalculator> &calc,