Merge pull request #26998 from vespa-engine/toregge/change-visitor-factory-make-visitor-environment-member-function-return-typev8.161.74

Change return type for VisitorFactory::makeVisitorEnvironment member …

9 files changed, 15 insertions, 17 deletions

diff --git a/storage/src/vespa/storage/common/visitorfactory.h b/storage/src/vespa/storage/common/visitorfactory.h
index a60ffadbdb0..8ee7577a9e3 100644
--- a/storage/src/vespa/storage/common/visitorfactory.h
+++ b/storage/src/vespa/storage/common/visitorfactory.h
@@ -16,7 +16,6 @@ class Visitor;
 
 class VisitorEnvironment {
 public:
-    using UP = std::unique_ptr<VisitorEnvironment>;
     VisitorEnvironment() = default;
     virtual ~VisitorEnvironment() = default;
 };
@@ -28,7 +27,7 @@ public:
 
     virtual ~VisitorFactory() = default;
 
-    virtual VisitorEnvironment::UP makeVisitorEnvironment(StorageComponent&) = 0;
+    virtual std::shared_ptr<VisitorEnvironment> makeVisitorEnvironment(StorageComponent&) = 0;
 
     virtual storage::Visitor *makeVisitor(
             StorageComponent&, VisitorEnvironment& env,
diff --git a/storage/src/vespa/storage/visiting/countvisitor.h b/storage/src/vespa/storage/visiting/countvisitor.h
index 8ae67a5e0d2..e00f2e9aa07 100644
--- a/storage/src/vespa/storage/visiting/countvisitor.h
+++ b/storage/src/vespa/storage/visiting/countvisitor.h
@@ -42,9 +42,9 @@ private:
 
 struct CountVisitorFactory : public VisitorFactory {
 
-    VisitorEnvironment::UP
+    std::shared_ptr<VisitorEnvironment>
     makeVisitorEnvironment(StorageComponent&) override {
-        return VisitorEnvironment::UP(new VisitorEnvironment);
+        return std::make_shared<VisitorEnvironment>();
     };
 
     Visitor*
diff --git a/storage/src/vespa/storage/visiting/dumpvisitorsingle.h b/storage/src/vespa/storage/visiting/dumpvisitorsingle.h
index c98bad17e84..abe3bb662a7 100644
--- a/storage/src/vespa/storage/visiting/dumpvisitorsingle.h
+++ b/storage/src/vespa/storage/visiting/dumpvisitorsingle.h
@@ -24,9 +24,9 @@ private:
 
 struct DumpVisitorSingleFactory : public VisitorFactory {
 
-    VisitorEnvironment::UP
+    std::shared_ptr<VisitorEnvironment>
     makeVisitorEnvironment(StorageComponent&) override {
-        return std::make_unique<VisitorEnvironment>();
+        return std::make_shared<VisitorEnvironment>();
     };
 
     Visitor*
diff --git a/storage/src/vespa/storage/visiting/recoveryvisitor.h b/storage/src/vespa/storage/visiting/recoveryvisitor.h
index e850eca3f37..e6b3b040701 100644
--- a/storage/src/vespa/storage/visiting/recoveryvisitor.h
+++ b/storage/src/vespa/storage/visiting/recoveryvisitor.h
@@ -38,9 +38,9 @@ private:
 
 struct RecoveryVisitorFactory : public VisitorFactory {
 
-    VisitorEnvironment::UP
+    std::shared_ptr<VisitorEnvironment>
     makeVisitorEnvironment(StorageComponent&) override {
-        return std::make_unique<VisitorEnvironment>();
+        return std::make_shared<VisitorEnvironment>();
     };
 
     Visitor*
diff --git a/storage/src/vespa/storage/visiting/reindexing_visitor.h b/storage/src/vespa/storage/visiting/reindexing_visitor.h
index d9e18542818..658b9433517 100644
--- a/storage/src/vespa/storage/visiting/reindexing_visitor.h
+++ b/storage/src/vespa/storage/visiting/reindexing_visitor.h
@@ -26,8 +26,8 @@ private:
 };
 
 struct ReindexingVisitorFactory : public VisitorFactory {
-    VisitorEnvironment::UP makeVisitorEnvironment(StorageComponent&) override {
-        return std::make_unique<VisitorEnvironment>();
+    std::shared_ptr<VisitorEnvironment> makeVisitorEnvironment(StorageComponent&) override {
+        return std::make_shared<VisitorEnvironment>();
     };
 
     Visitor* makeVisitor(StorageComponent& c, VisitorEnvironment&, const vdslib::Parameters&) override {
diff --git a/storage/src/vespa/storage/visiting/testvisitor.h b/storage/src/vespa/storage/visiting/testvisitor.h
index 989581ac121..fdfc4b7709f 100644
--- a/storage/src/vespa/storage/visiting/testvisitor.h
+++ b/storage/src/vespa/storage/visiting/testvisitor.h
@@ -40,9 +40,9 @@ private:
 
 struct TestVisitorFactory : public VisitorFactory {
 
-    VisitorEnvironment::UP
+    std::shared_ptr<VisitorEnvironment>
     makeVisitorEnvironment(StorageComponent&) override {
-        return VisitorEnvironment::UP(new VisitorEnvironment);
+        return std::make_shared<VisitorEnvironment>();
     };
 
     Visitor*
diff --git a/storage/src/vespa/storage/visiting/visitorthread.cpp b/storage/src/vespa/storage/visiting/visitorthread.cpp
index 3e72cea830c..a531fea800e 100644
--- a/storage/src/vespa/storage/visiting/visitorthread.cpp
+++ b/storage/src/vespa/storage/visiting/visitorthread.cpp
@@ -351,8 +351,7 @@ VisitorThread::createVisitor(vespalib::stringref libName,
 
     auto libIter = _libs.find(str);
     if (libIter == _libs.end()) {
-        _libs[str] = std::shared_ptr<VisitorEnvironment>(
-                it->second->makeVisitorEnvironment(_component).release());
+        _libs[str] = it->second->makeVisitorEnvironment(_component);
         libIter = _libs.find(str);
     }
 
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index a7fb80f1749..e81292b4170 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -464,10 +464,10 @@ SearchVisitorFactory::SearchVisitorFactory(const config::ConfigUri & configUri)
       _configUri(configUri)
 {}
 
-VisitorEnvironment::UP
+std::shared_ptr<VisitorEnvironment>
 SearchVisitorFactory::makeVisitorEnvironment(StorageComponent&)
 {
-    return std::make_unique<SearchEnvironment>(_configUri);
+    return std::make_shared<SearchEnvironment>(_configUri);
 }
 
 storage::Visitor*
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
index d0684cd4421..24b7bd64aec 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
@@ -490,7 +490,7 @@ private:
 
 class SearchVisitorFactory : public storage::VisitorFactory {
     config::ConfigUri _configUri;
-    storage::VisitorEnvironment::UP makeVisitorEnvironment(storage::StorageComponent&) override;
+    std::shared_ptr<storage::VisitorEnvironment> makeVisitorEnvironment(storage::StorageComponent&) override;
 
     storage::Visitor* makeVisitor(storage::StorageComponent&, storage::VisitorEnvironment&env,
                          const vdslib::Parameters& params) override;