diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-01-23 21:21:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-23 21:21:01 +0100 |
commit | 239a320c3ecc7e7e376d968fbca73754e269d185 (patch) | |
tree | f002ad4ce0171512d27f4ef31aa400b42775f102 /searchcore/src/tests/proton/documentdb/documentdb_test.cpp | |
parent | 166d5e91805b55c1d7606a87f82a2e74ffa84cde (diff) |
Revert "Wire in the BucketExecutor."
Diffstat (limited to 'searchcore/src/tests/proton/documentdb/documentdb_test.cpp')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/documentdb_test.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp index 91046fbb567..4064fc24105 100644 --- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp @@ -19,7 +19,6 @@ #include <vespa/searchcore/proton/server/document_db_explorer.h> #include <vespa/searchcore/proton/server/documentdbconfigmanager.h> #include <vespa/searchcore/proton/server/memoryconfigstore.h> -#include <vespa/persistence/dummyimpl/dummy_bucket_executor.h> #include <vespa/searchcorespi/index/indexflushtarget.h> #include <vespa/searchlib/attribute/attribute_read_guard.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> @@ -70,7 +69,6 @@ struct Fixture { MyDBOwner _myDBOwner; vespalib::ThreadStackExecutor _summaryExecutor; HwInfo _hwInfo; - storage::spi::dummy::DummyBucketExecutor _bucketExecutor; DocumentDB::SP _db; DummyFileHeaderContext _fileHeaderContext; TransLogServer _tls; @@ -86,31 +84,31 @@ Fixture::Fixture() _myDBOwner(), _summaryExecutor(8, 128*1024), _hwInfo(), - _bucketExecutor(2), _db(), _fileHeaderContext(), _tls("tmp", 9014, ".", _fileHeaderContext), _queryLimiter(), _clock() { - auto documenttypesConfig = std::make_shared<DocumenttypesConfig>(); + DocumentDBConfig::DocumenttypesConfigSP documenttypesConfig(new DocumenttypesConfig()); DocumentType docType("typea", 0); - auto repo = std::make_shared<DocumentTypeRepo>(docType); - auto tuneFileDocumentDB = std::make_shared<TuneFileDocumentDB>(); + std::shared_ptr<const DocumentTypeRepo> repo(new DocumentTypeRepo(docType)); + TuneFileDocumentDB::SP tuneFileDocumentDB(new TuneFileDocumentDB); config::DirSpec spec(TEST_PATH("cfg")); DocumentDBConfigHelper mgr(spec, "typea"); - auto b = std::make_shared<BootstrapConfig>(1, documenttypesConfig, repo, + BootstrapConfig::SP + b(new BootstrapConfig(1, documenttypesConfig, repo, std::make_shared<ProtonConfig>(), std::make_shared<FiledistributorrpcConfig>(), std::make_shared<BucketspacesConfig>(), - tuneFileDocumentDB, HwInfo()); + tuneFileDocumentDB, HwInfo())); mgr.forwardConfig(b); mgr.nextGeneration(0ms); - _db = std::make_shared<DocumentDB>(".", mgr.getConfig(), "tcp/localhost:9014", _queryLimiter, _clock, DocTypeName("typea"), + _db.reset(new DocumentDB(".", mgr.getConfig(), "tcp/localhost:9014", _queryLimiter, _clock, DocTypeName("typea"), makeBucketSpace(), - *b->getProtonConfigSP(), _myDBOwner, _summaryExecutor, _summaryExecutor, _bucketExecutor, _tls, _dummy, - _fileHeaderContext, std::make_unique<MemoryConfigStore>(), - std::make_shared<vespalib::ThreadStackExecutor>(16, 128 * 1024), _hwInfo); + *b->getProtonConfigSP(), _myDBOwner, _summaryExecutor, _summaryExecutor, _tls, _dummy, + _fileHeaderContext, ConfigStore::UP(new MemoryConfigStore), + std::make_shared<vespalib::ThreadStackExecutor>(16, 128 * 1024), _hwInfo)); _db->start(); _db->waitForOnlineState(); } |