General code health in the vicinity.

4 files changed, 13 insertions, 14 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
index 6165e94715c..6abbf477959 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
@@ -31,7 +31,6 @@ using vespalib::compression::CompressionConfig;
 using search::DocumentStore;
 using search::IDocumentStore;
 using search::LogDocumentStore;
-using search::LogDataStore;
 using search::WriteableFileChunk;
 using vespalib::makeLambdaTask;
 
@@ -83,14 +82,14 @@ ShrinkSummaryLidSpaceFlushTarget::initFlush(SerialNum currentSerial)
 SummaryManager::SummarySetup::
 SummarySetup(const vespalib::string & baseDir, const DocTypeName & docTypeName, const SummaryConfig & summaryCfg,
              const SummarymapConfig & summarymapCfg, const JuniperrcConfig & juniperCfg,
-             const search::IAttributeManager::SP &attributeMgr, const search::IDocumentStore::SP & docStore,
-             const std::shared_ptr<const DocumentTypeRepo> &repo)
+             search::IAttributeManager::SP attributeMgr, search::IDocumentStore::SP docStore,
+             std::shared_ptr<const DocumentTypeRepo> repo)
     : _docsumWriter(),
       _wordFolder(std::make_unique<Fast_NormalizeWordFolder>()),
       _juniperProps(juniperCfg),
       _juniperConfig(),
-      _attributeMgr(attributeMgr),
-      _docStore(docStore),
+      _attributeMgr(std::move(attributeMgr)),
+      _docStore(std::move(docStore)),
       _fieldCacheRepo(),
       _repo(repo),
       _markupFields()
@@ -151,7 +150,7 @@ SummaryManager::SummaryManager(vespalib::ThreadExecutor & executor, const LogDoc
                                const search::GrowStrategy & growStrategy, const vespalib::string &baseDir,
                                const DocTypeName &docTypeName, const TuneFileSummary &tuneFileSummary,
                                const FileHeaderContext &fileHeaderContext, search::transactionlog::SyncProxy &tlSyncer,
-                               const search::IBucketizer::SP & bucketizer)
+                               search::IBucketizer::SP bucketizer)
     : _baseDir(baseDir),
       _docTypeName(docTypeName),
       _docStore(),
@@ -159,7 +158,7 @@ SummaryManager::SummaryManager(vespalib::ThreadExecutor & executor, const LogDoc
       _currentSerial(0u)
 {
     _docStore = std::make_shared<LogDocumentStore>(executor, baseDir, storeConfig, growStrategy, tuneFileSummary,
-                                                   fileHeaderContext, tlSyncer, bucketizer);
+                                                   fileHeaderContext, tlSyncer, std::move(bucketizer));
 }
 
 SummaryManager::~SummaryManager() = default;
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h
index 4fde28e69de..f81fdedef83 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h
@@ -40,9 +40,9 @@ public:
                      const vespa::config::search::SummaryConfig & summaryCfg,
                      const vespa::config::search::SummarymapConfig & summarymapCfg,
                      const vespa::config::search::summary::JuniperrcConfig & juniperCfg,
-                     const search::IAttributeManager::SP &attributeMgr,
-                     const search::IDocumentStore::SP & docStore,
-                     const std::shared_ptr<const document::DocumentTypeRepo> &repo);
+                     search::IAttributeManager::SP attributeMgr,
+                     search::IDocumentStore::SP docStore,
+                     std::shared_ptr<const document::DocumentTypeRepo> repo);
 
         search::docsummary::IDocsumWriter & getDocsumWriter() const override { return *_docsumWriter; }
         search::docsummary::ResultConfig & getResultConfig() override { return *_docsumWriter->GetResultConfig(); }
@@ -71,8 +71,8 @@ public:
                    const search::TuneFileSummary &tuneFileSummary,
                    const search::common::FileHeaderContext &fileHeaderContext,
                    search::transactionlog::SyncProxy &tlSyncer,
-                   const std::shared_ptr<search::IBucketizer> & bucketizer);
-    ~SummaryManager();
+                   std::shared_ptr<search::IBucketizer> bucketizer);
+    ~SummaryManager() override;
 
     void putDocument(uint64_t syncToken, search::DocumentIdT lid, const document::Document & doc);
     void putDocument(uint64_t syncToken, search::DocumentIdT lid, const vespalib::nbostream & doc);
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanagerinitializer.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanagerinitializer.cpp
index 2f29231577a..29346903aef 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanagerinitializer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanagerinitializer.cpp
@@ -8,7 +8,7 @@ namespace proton {
 
 SummaryManagerInitializer::
 SummaryManagerInitializer(const search::GrowStrategy &grow,
-                          const vespalib::string baseDir,
+                          const vespalib::string & baseDir,
                           const vespalib::string &subDbName,
                           const DocTypeName &docTypeName,
                           vespalib::ThreadExecutor &summaryExecutor,
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanagerinitializer.h b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanagerinitializer.h
index 6c2d3e3d4cc..0d2eb01ee8d 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanagerinitializer.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanagerinitializer.h
@@ -33,7 +33,7 @@ public:
 
     // Note: lifetime of result must be handled by caller.
     SummaryManagerInitializer(const search::GrowStrategy &grow,
-                              const vespalib::string baseDir,
+                              const vespalib::string & baseDir,
                               const vespalib::string &subDbName,
                               const DocTypeName &docTypeName,
                               vespalib::ThreadExecutor & summaryExecutor,