diff options
Diffstat (limited to 'searchcore/src')
4 files changed, 8 insertions, 6 deletions
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.cpp index 123e2b7577d..47c1ec709fd 100644 --- a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.cpp +++ b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.cpp @@ -23,6 +23,7 @@ #include <vespa/vespalib/util/stringfmt.h> #include <filesystem> #include <thread> +#include <cassert> #include <vespa/log/log.h> LOG_SETUP(".bmcluster.bm_cluster"); diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp index fbb17a43ee6..032307c1157 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp @@ -242,7 +242,7 @@ StoreOnlyDocSubDB::setupSummaryManager(SummaryManager::SP summaryManager) _rSummaryMgr = std::move(summaryManager); _iSummaryMgr = _rSummaryMgr; // Upcast allowed with std::shared_ptr _flushedDocumentStoreSerialNum = _iSummaryMgr->getBackingStore().lastSyncToken(); - _summaryAdapter.reset(new SummaryAdapter(_rSummaryMgr)); + _summaryAdapter = std::make_shared<SummaryAdapter>(_rSummaryMgr); } diff --git a/searchcore/src/vespa/searchcore/proton/server/summaryadapter.cpp b/searchcore/src/vespa/searchcore/proton/server/summaryadapter.cpp index 57786a5f788..038af801b80 100644 --- a/searchcore/src/vespa/searchcore/proton/server/summaryadapter.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/summaryadapter.cpp @@ -3,6 +3,7 @@ #include "summaryadapter.h" #include <vespa/searchcore/proton/docsummary/summarymanager.h> #include <vespa/vespalib/objects/nbostream.h> +#include <cassert> #include <vespa/log/log.h> LOG_SETUP(".proton.server.summaryadapter"); @@ -11,12 +12,12 @@ using namespace document; namespace proton { -SummaryAdapter::SummaryAdapter(const SummaryManager::SP &mgr) - : _mgr(mgr), +SummaryAdapter::SummaryAdapter(SummaryManager::SP mgr) + : _mgr(std::move(mgr)), _lastSerial(_mgr->getBackingStore().lastSyncToken()) {} -SummaryAdapter::~SummaryAdapter() {} +SummaryAdapter::~SummaryAdapter() = default; bool SummaryAdapter::ignore(SerialNum serialNum) const { diff --git a/searchcore/src/vespa/searchcore/proton/server/summaryadapter.h b/searchcore/src/vespa/searchcore/proton/server/summaryadapter.h index 89b3827628c..0402d860577 100644 --- a/searchcore/src/vespa/searchcore/proton/server/summaryadapter.h +++ b/searchcore/src/vespa/searchcore/proton/server/summaryadapter.h @@ -17,8 +17,8 @@ private: ISummaryManager & imgr() const; public: - SummaryAdapter(const std::shared_ptr<SummaryManager> &mgr); - ~SummaryAdapter(); + explicit SummaryAdapter(std::shared_ptr<SummaryManager> mgr); + ~SummaryAdapter() override; void put(SerialNum serialNum, const DocumentIdT lid, const Document &doc) override; void put(SerialNum serialNum, const DocumentIdT lid, const vespalib::nbostream &doc) override; |