diff options
author | Tor Egge <Tor.Egge@online.no> | 2023-05-05 15:35:31 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2023-05-05 15:35:31 +0200 |
commit | ac563a1082aa0acde930f9339fec3a149ce4f46f (patch) | |
tree | 1c82939390192ff714bcac1c3f6bd04cd388f518 /storage/src | |
parent | f1e2793ff19e51aada9ea50222f6ba2c7aadaa13 (diff) |
Change return type for VisitorFactory::makeVisitorEnvironment member function
from unique pointer to shared pointer.
Diffstat (limited to 'storage/src')
7 files changed, 12 insertions, 14 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); } |