From 045babd97ccd8ba1bf44c14d0bce326c1f1a57be Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Tue, 13 Apr 2021 07:47:33 +0000
Subject: Force having documentdb as shared_ptr.

---
 .../src/apps/tests/persistenceconformance_test.cpp | 30 +++++-----------------
 1 file changed, 7 insertions(+), 23 deletions(-)

(limited to 'searchcore/src/apps/tests/persistenceconformance_test.cpp')

diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp
index d28e7a1f8d3..69d509c25fd 100644
--- a/searchcore/src/apps/tests/persistenceconformance_test.cpp
+++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp
@@ -192,34 +192,18 @@ public:
         config::DirSpec spec(inputCfg + "/config-1");
         TuneFileDocumentDB::SP tuneFileDocDB(new TuneFileDocumentDB());
         DocumentDBConfigHelper mgr(spec, docType.getName());
-        BootstrapConfig::SP b(new BootstrapConfig(1,
-                                                  factory.getTypeCfg(),
-                                                  factory.getTypeRepo(),
+        auto b = std::make_shared<BootstrapConfig>(1, factory.getTypeCfg(), factory.getTypeRepo(),
                                                   std::make_shared<ProtonConfig>(),
                                                   std::make_shared<FiledistributorrpcConfig>(),
                                                   std::make_shared<BucketspacesConfig>(),
-                                                  tuneFileDocDB, HwInfo()));
+                                                  tuneFileDocDB, HwInfo());
         mgr.forwardConfig(b);
         mgr.nextGeneration(0ms);
-        return std::make_shared<DocumentDB>(_baseDir,
-                               mgr.getConfig(),
-                               _tlsSpec,
-                               _queryLimiter,
-                               _clock,
-                               docType,
-                               bucketSpace,
-                               *b->getProtonConfigSP(),
-                               const_cast<DocumentDBFactory &>(*this),
-                               _summaryExecutor,
-                               _summaryExecutor,
-                               _bucketExecutor,
-                               _tls,
-                               _metricsWireService,
-                               _fileHeaderContext,
-                               _config_stores.getConfigStore(docType.toString()),
-                               std::make_shared<vespalib::ThreadStackExecutor>
-                               (16, 128_Ki),
-                               HwInfo());
+        return DocumentDB::create(_baseDir, mgr.getConfig(), _tlsSpec, _queryLimiter, _clock, docType, bucketSpace,
+                                  *b->getProtonConfigSP(), const_cast<DocumentDBFactory &>(*this),
+                                  _summaryExecutor, _summaryExecutor, _bucketExecutor, _tls, _metricsWireService,
+                                  _fileHeaderContext, _config_stores.getConfigStore(docType.toString()),
+                                  std::make_shared<vespalib::ThreadStackExecutor>(16, 128_Ki), HwInfo());
     }
 };
 
-- 
cgit v1.2.3