Use make_unique and make_shared instead of new.

19 files changed, 33 insertions, 35 deletions

diff --git a/searchcore/src/vespa/searchcore/grouping/groupingcontext.cpp b/searchcore/src/vespa/searchcore/grouping/groupingcontext.cpp
index 5c9321a6ff3..55e9ce16f70 100644
--- a/searchcore/src/vespa/searchcore/grouping/groupingcontext.cpp
+++ b/searchcore/src/vespa/searchcore/grouping/groupingcontext.cpp
@@ -20,7 +20,7 @@ GroupingContext::deserialize(const char *groupSpec, uint32_t groupSpecLen)
         uint32_t numGroupings = 0;
         nis >> numGroupings;
         for (size_t i = 0; i < numGroupings; i++) {
-            GroupingPtr grouping(new search::aggregation::Grouping);
+            auto grouping = std::make_shared<search::aggregation::Grouping>();
             grouping->deserialize(nis);
             grouping->setClock(&_clock);
             grouping->setTimeOfDoom(_timeOfDoom);
diff --git a/searchcore/src/vespa/searchcore/grouping/groupingsession.cpp b/searchcore/src/vespa/searchcore/grouping/groupingsession.cpp
index 2c2a5ceacff..e336d5b25c9 100644
--- a/searchcore/src/vespa/searchcore/grouping/groupingsession.cpp
+++ b/searchcore/src/vespa/searchcore/grouping/groupingsession.cpp
@@ -41,7 +41,7 @@ GroupingSession::init(GroupingContext & groupingContext, const IAttributeContext
         GroupingPtr g(sessionList[i]);
         // Make internal copy of those we want to keep for another pass
         if (!_sessionId.empty() && g->getLastLevel() < g->levels().size()) {
-            GroupingPtr gp(new Grouping(*g));
+            auto gp = std::make_shared<Grouping>(*g);
             gp->setLastLevel(gp->levels().size());
             _groupingMap[gp->getId()] = gp;
             g = gp;
@@ -62,7 +62,7 @@ GroupingSession::prepareThreadContextCreation(size_t num_threads)
 GroupingContext::UP
 GroupingSession::createThreadContext(size_t thread_id, const IAttributeContext &attrCtx)
 {
-    GroupingContext::UP ctx(new GroupingContext(*_mgrContext));
+    auto ctx = std::make_unique<GroupingContext>(*_mgrContext);
     if (thread_id == 0) {
         GroupingContext::GroupingList &groupingList = _mgrContext->getGroupingList();
         for (size_t i = 0; i < groupingList.size(); ++i) {
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
index 4fcd5aff4f9..0869fc175a7 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
@@ -64,7 +64,7 @@ DocsumContext::initState()
 DocsumReply::UP
 DocsumContext::createReply()
 {
-    DocsumReply::UP reply(new DocsumReply());
+    auto reply = std::make_unique<DocsumReply>();
     search::RawBuf buf(4096);
     _docsumWriter.InitState(_attrMgr, &_docsumState);
     reply->docsums.resize(_docsumState._docsumcnt);
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/fieldcache.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/fieldcache.cpp
index ecc0569cccd..4c76361cf8e 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/fieldcache.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/fieldcache.cpp
@@ -27,7 +27,7 @@ FieldCache::FieldCache(const ResultClass &resClass,
             const Field &field = docType.getField(fieldName);
             LOG(debug, "Caching Field instance for field '%s': %s.%u",
                 fieldName.c_str(), field.getName().data(), field.getId());
-            _cache.push_back(Field::CSP(new Field(field)));
+            _cache.push_back(std::make_shared<const Field>(field));
         } else {
             _cache.push_back(Field::CSP());
         }
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/fieldcacherepo.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/fieldcacherepo.cpp
index b97eba64f4c..25fe684b949 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/fieldcacherepo.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/fieldcacherepo.cpp
@@ -12,17 +12,17 @@ namespace proton {
 
 FieldCacheRepo::FieldCacheRepo() :
     _repo(),
-    _defaultCache(new FieldCache())
+    _defaultCache(std::make_shared<const FieldCache>())
 {
 }
 
 FieldCacheRepo::FieldCacheRepo(const ResultConfig &resConfig,
                                const DocumentType &docType) :
     _repo(),
-    _defaultCache(new FieldCache())
+    _defaultCache(std::make_shared<const FieldCache>())
 {
     for (ResultConfig::const_iterator it(resConfig.begin()), mt(resConfig.end()); it != mt; it++) {
-        FieldCache::CSP cache(new FieldCache(*it, docType));
+        auto cache = std::make_shared<const FieldCache>(*it, docType);
         vespalib::string className(it->GetClassName());
         LOG(debug, "Adding field cache for summary class '%s' to repo",
             className.c_str());
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
index 96f69179482..6016d60b880 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
@@ -794,8 +794,7 @@ DocumentMetaStore::createWhiteListBlueprint() const
 AttributeVector::SearchContext::UP
 DocumentMetaStore::getSearch(std::unique_ptr<search::QueryTermSimple> qTerm, const SearchContextParams &) const
 {
-    return AttributeVector::SearchContext::UP
-            (new documentmetastore::SearchContext(std::move(qTerm), *this));
+    return std::make_unique<documentmetastore::SearchContext>(std::move(qTerm), *this);
 }
 
 DocumentMetaStore::ConstIterator
@@ -1006,7 +1005,7 @@ void
 DocumentMetaStore::holdUnblockShrinkLidSpace()
 {
     assert(_shrinkLidSpaceBlockers > 0);
-    GenerationHeldBase::UP hold(new ShrinkBlockHeld(*this));
+    auto hold = std::make_unique<ShrinkBlockHeld>(*this);
     getGenerationHolder().hold(std::move(hold));
     incGeneration();
 }
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.cpp
index b6486607821..959bdfa9baf 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.cpp
@@ -15,7 +15,7 @@ DocumentMetaStoreContext::DocumentMetaStoreContext(BucketDBOwner::SP bucketDB,
                                                    const vespalib::string &name,
                                                    const search::GrowStrategy &grow,
                                                    const DocumentMetaStore::IGidCompare::SP &gidCompare) :
-    _metaStoreAttr(new DocumentMetaStore(bucketDB, name, grow, gidCompare)),
+    _metaStoreAttr(std::make_shared<DocumentMetaStore>(bucketDB, name, grow, gidCompare)),
     _metaStore(std::dynamic_pointer_cast<IDocumentMetaStore>(_metaStoreAttr))
 {
 }
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.cpp
index 69f754cd594..26586da7784 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.cpp
@@ -27,7 +27,7 @@ PruneRemovedDocumentsOperation(DocumentIdT docIdLimit, uint32_t subDbId)
     : RemoveDocumentsOperation(FeedOperation::PRUNE_REMOVED_DOCUMENTS),
       _subDbId(subDbId)
 {
-    LidVectorContext::SP lidsToRemove(new LidVectorContext(docIdLimit));
+    auto lidsToRemove = std::make_shared<LidVectorContext>(docIdLimit);
     setLidsToRemove(lidsToRemove);
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/removedocumentsoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/removedocumentsoperation.cpp
index ef482a19ca3..14abade84b5 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/removedocumentsoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/removedocumentsoperation.cpp
@@ -33,7 +33,7 @@ RemoveDocumentsOperation::deserializeLidsToRemove(vespalib::nbostream &is)
     for (i = 0; i < mapSize; ++i) {
         uint32_t subDbId;
         is >> subDbId;
-        LidVectorContext::SP lidsToRemove(new LidVectorContext());
+        auto lidsToRemove = std::make_shared<LidVectorContext>();
         lidsToRemove->deserialize(is);
         setLidsToRemove(subDbId, lidsToRemove);
     }
diff --git a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
index c8c5a3a427b..7149bf9ab7f 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
@@ -32,7 +32,7 @@ struct Mixer {
     Blueprint::UP mix(Blueprint::UP indexes) {
         if (attributes.get() == 0) {
             if (indexes.get() == 0) {
-                return Blueprint::UP(new EmptyBlueprint());
+                return std::make_unique<EmptyBlueprint>();
             }
             return Blueprint::UP(std::move(indexes));
         }
diff --git a/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.cpp b/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.cpp
index 5758b9a796f..316cf92597e 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.cpp
@@ -7,8 +7,8 @@ namespace proton::matching {
 FakeSearchContext::FakeSearchContext(size_t initialNumDocs)
     : _clock(),
       _doom(_clock, vespalib::steady_time()),
-      _selector(new search::FixedSourceSelector(0, "fs", initialNumDocs)),
-      _indexes(new IndexCollection(_selector)),
+      _selector(std::make_shared<search::FixedSourceSelector>(0, "fs", initialNumDocs)),
+      _indexes(std::make_shared<IndexCollection>(_selector)),
       _attrSearchable(),
       _docIdLimit(initialNumDocs)
 {
diff --git a/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.h b/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.h
index 5a4ccc892b3..d23dd2ac551 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.h
@@ -35,7 +35,7 @@ public:
     ~FakeSearchContext();
 
     FakeSearchContext &addIdx(uint32_t id) {
-        _indexes->append(id, IndexSearchable::SP(new FakeIndexSearchable()));
+        _indexes->append(id, std::make_shared<FakeIndexSearchable>());
         return *this;
     }
 
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 8b3257ff47b..18475f06fc2 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.cpp
@@ -17,14 +17,14 @@ namespace proton {
 DocumentDBJobTrackers::DocumentDBJobTrackers()
     : _lock(),
       _now(std::chrono::steady_clock::now()),
-      _attributeFlush(new JobTracker(_now, _lock)),
-      _memoryIndexFlush(new JobTracker(_now, _lock)),
-      _diskIndexFusion(new JobTracker(_now, _lock)),
-      _documentStoreFlush(new JobTracker(_now, _lock)),
-      _documentStoreCompact(new JobTracker(_now, _lock)),
-      _bucketMove(new JobTracker(_now, _lock)),
-      _lidSpaceCompact(new JobTracker(_now, _lock)),
-      _removedDocumentsPrune(new JobTracker(_now, _lock))
+      _attributeFlush(std::make_shared<JobTracker>(_now, _lock)),
+      _memoryIndexFlush(std::make_shared<JobTracker>(_now, _lock)),
+      _diskIndexFusion(std::make_shared<JobTracker>(_now, _lock)),
+      _documentStoreFlush(std::make_shared<JobTracker>(_now, _lock)),
+      _documentStoreCompact(std::make_shared<JobTracker>(_now, _lock)),
+      _bucketMove(std::make_shared<JobTracker>(_now, _lock)),
+      _lidSpaceCompact(std::make_shared<JobTracker>(_now, _lock)),
+      _removedDocumentsPrune(std::make_shared<JobTracker>(_now, _lock))
 {
 }
 
@@ -36,7 +36,7 @@ IFlushTarget::SP
 trackFlushTarget(const IJobTracker::SP &tracker,
                  const IFlushTarget::SP &target)
 {
-    return IFlushTarget::SP(new JobTrackedFlushTarget(tracker, target));
+    return std::make_shared<JobTrackedFlushTarget>(tracker, target);
 }
 
 }
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 9eebe5010d2..14d76645fc7 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
@@ -25,7 +25,7 @@ JobTrackedFlushTarget::initFlush(SerialNum currentSerial)
     FlushTask::UP targetTask = _target->initFlush(currentSerial);
     _tracker->end();
     if (targetTask.get() != nullptr) {
-        return FlushTask::UP(new JobTrackedFlushTask(_tracker, std::move(targetTask)));
+        return std::make_unique<JobTrackedFlushTask>(_tracker, std::move(targetTask));
     }
     return FlushTask::UP();
 }
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp
index a6e8ac54e86..85644c2111a 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp
@@ -33,7 +33,7 @@ TransLogServerMetrics::considerAddDomains(const DomainStats &stats)
     for (const auto &elem : stats) {
         const vespalib::string &documentType = elem.first;
         if (_domainMetrics.find(documentType) == _domainMetrics.end()) {
-            _domainMetrics[documentType] = DomainMetrics::UP(new DomainMetrics(_parent, documentType));
+            _domainMetrics[documentType] = std::make_unique<DomainMetrics>(_parent, documentType);
         }
     }
 }
diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp b/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp
index 9b1c66780cd..e939b07c26b 100644
--- a/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp
@@ -101,9 +101,8 @@ getFieldsToPopulate(const ARIConfig &newCfg,
             attrCfg.basicType().asString(),
             toStr(populateField));
         if (populateField) {
-            fieldsToPopulate.push_back(IReprocessingRewriter::SP
-                    (new DocumentFieldPopulator(name,
-                            guard.getSP(), subDbName)));
+            fieldsToPopulate.push_back(std::make_shared<DocumentFieldPopulator>
+                                               (name, guard.getSP(), subDbName));
         }
     }
     return fieldsToPopulate;
diff --git a/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h b/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h
index fe0820b9a39..3333041fb91 100644
--- a/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h
+++ b/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h
@@ -19,7 +19,7 @@ struct AttributeWriterFactory : public IAttributeWriterFactory
         const AttributeWriter &oldAdapter = dynamic_cast<const AttributeWriter &>(*old.get());
         const proton::IAttributeManager::SP &oldMgr = oldAdapter.getAttributeManager();
         proton::IAttributeManager::SP newMgr = oldMgr->create(attrSpec);
-        return IAttributeWriter::SP(new AttributeWriter(newMgr));
+        return std::make_shared<AttributeWriter>(newMgr);
     }
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
index edbf0c631a5..baf89a55ae3 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
@@ -78,7 +78,7 @@ BootstrapConfigManager::update(const ConfigSnapshot & snapshot)
     if (snapshot.isChanged<ProtonConfig>(_configId, currentGen)) {
         LOG(spam, "Proton config is changed");
         std::unique_ptr<ProtonConfig> protonConfig = snapshot.getConfig<ProtonConfig>(_configId);
-        TuneFileDocumentDB::SP tuneFileDocumentDB(new TuneFileDocumentDB);
+        auto tuneFileDocumentDB = std::make_shared<TuneFileDocumentDB>();
         TuneFileDocumentDB &tune = *tuneFileDocumentDB;
         ProtonConfig &conf = *protonConfig;
         tune._index._indexing._write.setFromConfig<ProtonConfig::Indexing::Write>(conf.indexing.write.io);
diff --git a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
index fa0e0f33469..eb3c8ce6aa4 100644
--- a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
@@ -64,7 +64,7 @@ ClusterStateHandler::performSetClusterState(const ClusterState *calc,
         (calc->nodeInitializing() ? "true" : "false"),
         _changedHandlers.size());
     if (!_changedHandlers.empty()) {
-        IBucketStateCalculator::SP newCalc(new ClusterStateAdapter(*calc));
+        auto newCalc = std::make_shared<ClusterStateAdapter>(*calc);
         typedef std::vector<IClusterStateChangedHandler *> Chv;
         Chv &chs(_changedHandlers);
         for (Chv::const_iterator it = chs.begin(), ite = chs.end(); it != ite;