diff options
author | Geir Storli <geirst@oath.com> | 2017-10-06 11:16:03 +0000 |
---|---|---|
committer | Geir Storli <geirst@oath.com> | 2017-10-06 11:16:03 +0000 |
commit | 8c4d49f36f0c9c85076f2b2d3e74580610f6e550 (patch) | |
tree | b333d4de98733a62cbeae69a27214b19aa7c8d57 /searchcore/src/tests/proton/documentdb/documentdb_test.cpp | |
parent | bb999bf3807c6f46c22ad5725ba7e3f590489744 (diff) |
Use storage::spi::test::makeBucketSpace() in tests when creating bucket space.
Diffstat (limited to 'searchcore/src/tests/proton/documentdb/documentdb_test.cpp')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/documentdb_test.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp index f737b2ed92c..5e3e5cd78be 100644 --- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp @@ -1,6 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <tests/proton/common/dummydbowner.h> +#include <vespa/document/datatype/documenttype.h> +#include <vespa/fastos/file.h> +#include <vespa/messagebus/emptyreply.h> +#include <vespa/messagebus/testlib/receptor.h> +#include <vespa/persistence/spi/test.h> #include <vespa/searchcore/proton/attribute/flushableattribute.h> #include <vespa/searchcore/proton/common/feedtoken.h> #include <vespa/searchcore/proton/common/statusreport.h> @@ -19,20 +24,17 @@ #include <vespa/searchcorespi/index/indexflushtarget.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/transactionlog/translogserver.h> -#include <vespa/messagebus/emptyreply.h> -#include <vespa/messagebus/testlib/receptor.h> -#include <vespa/document/datatype/documenttype.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/fastos/file.h> +using namespace cloud::config::filedistribution; +using namespace proton; +using namespace storage::spi::test; +using namespace vespalib::slime; using document::DocumentType; using document::DocumentTypeRepo; using document::DocumenttypesConfig; -using namespace cloud::config::filedistribution; -using namespace proton; -using namespace vespalib::slime; using search::TuneFileDocumentDB; using search::index::DummyFileHeaderContext; using search::index::Schema; @@ -114,7 +116,7 @@ Fixture::Fixture() mgr.forwardConfig(b); mgr.nextGeneration(0); _db.reset(new DocumentDB(".", mgr.getConfig(), "tcp/localhost:9014", _queryLimiter, _clock, DocTypeName("typea"), - document::BucketSpace::placeHolder(), + makeBucketSpace(), *b->getProtonConfigSP(), _myDBOwner, _summaryExecutor, _summaryExecutor, _tls, _dummy, _fileHeaderContext, ConfigStore::UP(new MemoryConfigStore), std::make_shared<vespalib::ThreadStackExecutor>(16, 128 * 1024), _hwInfo)); |