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/apps | |
parent | bb999bf3807c6f46c22ad5725ba7e3f590489744 (diff) |
Use storage::spi::test::makeBucketSpace() in tests when creating bucket space.
Diffstat (limited to 'searchcore/src/apps')
-rw-r--r-- | searchcore/src/apps/tests/persistenceconformance_test.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp index e95f572f7e3..64786903dab 100644 --- a/searchcore/src/apps/tests/persistenceconformance_test.cpp +++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp @@ -2,40 +2,42 @@ #include <vespa/vespalib/testkit/testapp.h> +#include <tests/proton/common/dummydbowner.h> #include <vespa/config-imported-fields.h> #include <vespa/config-rank-profiles.h> #include <vespa/config-summarymap.h> -#include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/document/base/testdocman.h> +#include <vespa/fastos/file.h> #include <vespa/persistence/conformancetest/conformancetest.h> +#include <vespa/persistence/spi/test.h> #include <vespa/searchcommon/common/schemaconfigurer.h> +#include <vespa/searchcore/proton/common/hw_info.h> #include <vespa/searchcore/proton/matching/querylimiter.h> +#include <vespa/searchcore/proton/metrics/metricswireservice.h> #include <vespa/searchcore/proton/persistenceengine/ipersistenceengineowner.h> #include <vespa/searchcore/proton/persistenceengine/persistenceengine.h> +#include <vespa/searchcore/proton/server/bootstrapconfig.h> #include <vespa/searchcore/proton/server/document_db_maintenance_config.h> #include <vespa/searchcore/proton/server/documentdb.h> #include <vespa/searchcore/proton/server/documentdbconfigmanager.h> #include <vespa/searchcore/proton/server/fileconfigmanager.h> #include <vespa/searchcore/proton/server/memoryconfigstore.h> -#include <vespa/searchcore/proton/server/bootstrapconfig.h> -#include <vespa/searchcore/proton/metrics/metricswireservice.h> #include <vespa/searchcore/proton/server/persistencehandlerproxy.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/transactionlog/translogserver.h> -#include <tests/proton/common/dummydbowner.h> +#include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/vespalib/io/fileutil.h> -#include <vespa/searchcore/proton/common/hw_info.h> -#include <vespa/fastos/file.h> #include <vespa/log/log.h> LOG_SETUP("persistenceconformance_test"); using namespace config; using namespace proton; -using namespace vespa::config::search; +using namespace cloud::config::filedistribution; +using namespace storage::spi::test; using namespace vespa::config::search::core; using namespace vespa::config::search::summary; -using namespace cloud::config::filedistribution; +using namespace vespa::config::search; using std::shared_ptr; using document::DocumentType; @@ -186,7 +188,7 @@ public: _queryLimiter, _clock, docType, - document::BucketSpace::placeHolder(), + makeBucketSpace(), *b->getProtonConfigSP(), const_cast<DocumentDBFactory &>(*this), _summaryExecutor, @@ -317,7 +319,7 @@ public: LOG(info, "putHandler(%s)", itr->first.toString().c_str()); IPersistenceHandler::SP proxy( new PersistenceHandlerProxy(itr->second)); - putHandler(document::BucketSpace::placeHolder(), itr->first, proxy); + putHandler(itr->second->getBucketSpace(), itr->first, proxy); } } |