diff options
| author | Tor Brede Vekterli <vekterli@oath.com> | 2018-01-18 11:27:48 +0000 |
|---|---|---|
| committer | Geir Storli <geirst@yahoo-inc.com> | 2018-02-01 13:30:38 +0000 |
| commit | 39a95f693cf118bdb63fa38ec036863ff8f5c681 (patch) | |
| tree | d0c5fca3282eb8cbd2a8e2da522f72b8d22e337a /documentapi | |
| parent | 2fbbefd54be3b72730a27c394b134b439d33c212 (diff) | |
Selectively enable multiple bucket spaces in C++ document protocol
Diffstat (limited to 'documentapi')
3 files changed, 9 insertions, 5 deletions
diff --git a/documentapi/src/tests/messages/testbase.cpp b/documentapi/src/tests/messages/testbase.cpp index 8f2729964a6..6af240fcf6e 100644 --- a/documentapi/src/tests/messages/testbase.cpp +++ b/documentapi/src/tests/messages/testbase.cpp @@ -18,7 +18,7 @@ TestBase::TestBase() : TEST_PATH("../../../test/cfg/testdoctypes.cfg")))), _dataPath(TEST_PATH("../../../test/crosslanguagefiles")), _loadTypes(), - _protocol(_loadTypes, _repo), + _protocol(_loadTypes, _repo, "", true), _tests() { _loadTypes.addLoadType(34, "foo", Priority::PRI_NORMAL_2); diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp index b2588657825..c5defa607a3 100644 --- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp @@ -25,7 +25,8 @@ const mbus::string DocumentProtocol::NAME = "document"; DocumentProtocol::DocumentProtocol(const LoadTypeSet& loadTypes, DocumentTypeRepo::SP repo, - const string &configId) : + const string &configId, + bool enableMultipleBucketSpaces) : _routingPolicyRepository(new RoutingPolicyRepository()), _routableRepository(new RoutableRepository(loadTypes)), _systemState(SystemState::newInstance("")), @@ -107,10 +108,12 @@ DocumentProtocol::DocumentProtocol(const LoadTypeSet& loadTypes, putRoutableFactory(MESSAGE_REMOVEDOCUMENT, IRoutableFactory::SP(new RoutableFactories52::RemoveDocumentMessageFactory()), from52); // Add 6.x serialization (TODO finalize version) - putRoutableFactory(MESSAGE_CREATEVISITOR, IRoutableFactory::SP(new RoutableFactories60::CreateVisitorMessageFactory(*_repo)), from6); + if (enableMultipleBucketSpaces) { + putRoutableFactory(MESSAGE_CREATEVISITOR, IRoutableFactory::SP(new RoutableFactories60::CreateVisitorMessageFactory(*_repo)), from6); + } } -DocumentProtocol::~DocumentProtocol() { } +DocumentProtocol::~DocumentProtocol() = default; mbus::IRoutingPolicy::UP DocumentProtocol::createPolicy(const mbus::string &name, const mbus::string ¶m) const diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h index c3417d85197..15a9e4c010a 100644 --- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h +++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h @@ -200,7 +200,8 @@ public: */ DocumentProtocol(const LoadTypeSet& loadTypes, std::shared_ptr<document::DocumentTypeRepo> repo, - const string &configId = ""); + const string &configId = "", + bool enableMultipleBucketSpaces = false); ~DocumentProtocol(); /** |