diff options
author | Tor Brede Vekterli <vekterli@oath.com> | 2018-01-18 14:08:07 +0000 |
---|---|---|
committer | Geir Storli <geirst@oath.com> | 2018-01-29 15:32:14 +0000 |
commit | 539d67d9a3bca7723af9f4b484f9a041c7053be5 (patch) | |
tree | 7c976b1b85e69debc3dfe1f6480de9e5da20e91d /documentapi | |
parent | 9c8e5bff07378ba8d127b73b2eb6fd52ba7c7b1f (diff) |
Remove conditional enabling of protocol feature in favor of version
Cannot selectively enable for DocumentProtocol since bucket space config
only applies per-cluster, while the protocol is application-global.
Diffstat (limited to 'documentapi')
6 files changed, 9 insertions, 13 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java index dac3d50db40..9804b6175a4 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java @@ -298,7 +298,7 @@ public class DocumentProtocol implements Protocol { VersionSpecification version50 = new VersionSpecification(5, 0); VersionSpecification version51 = new VersionSpecification(5, 1); VersionSpecification version52 = new VersionSpecification(5, 115); - VersionSpecification version6 = new VersionSpecification(6, 999); // TODO change once stable protocol + VersionSpecification version6 = new VersionSpecification(6, 197); // TODO change once stable protocol List<VersionSpecification> from50 = Arrays.asList(version50, version51, version52); List<VersionSpecification> from51 = Arrays.asList(version51, version52); diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java index ca54173701e..7655d170223 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java @@ -16,8 +16,8 @@ public class Messages60TestCase extends Messages52TestCase { @Override protected Version version() { - return new Version(6, 999, 0); - } // TODO finalize version + return new Version(6, 197); // TODO finalize version + } @Override protected boolean shouldTestCoverage() { diff --git a/documentapi/src/tests/messages/messages60test.h b/documentapi/src/tests/messages/messages60test.h index 2b61c118f18..5f36b9d3ace 100644 --- a/documentapi/src/tests/messages/messages60test.h +++ b/documentapi/src/tests/messages/messages60test.h @@ -6,7 +6,7 @@ class Messages60Test : public Messages52Test { protected: // TODO finalize version - const vespalib::Version getVersion() const override { return vespalib::Version(6, 999, 0); } + const vespalib::Version getVersion() const override { return vespalib::Version(6, 197); } public: Messages60Test(); bool testCreateVisitorMessage(); diff --git a/documentapi/src/tests/messages/testbase.cpp b/documentapi/src/tests/messages/testbase.cpp index 6af240fcf6e..8f2729964a6 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, "", true), + _protocol(_loadTypes, _repo), _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 c5defa607a3..9a440f107f7 100644 --- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp @@ -25,8 +25,7 @@ const mbus::string DocumentProtocol::NAME = "document"; DocumentProtocol::DocumentProtocol(const LoadTypeSet& loadTypes, DocumentTypeRepo::SP repo, - const string &configId, - bool enableMultipleBucketSpaces) : + const string &configId) : _routingPolicyRepository(new RoutingPolicyRepository()), _routableRepository(new RoutableRepository(loadTypes)), _systemState(SystemState::newInstance("")), @@ -51,7 +50,7 @@ DocumentProtocol::DocumentProtocol(const LoadTypeSet& loadTypes, vespalib::VersionSpecification version50(5, 0); vespalib::VersionSpecification version51(5, 1); vespalib::VersionSpecification version52(5, 115); - vespalib::VersionSpecification version6(6, 999); // TODO finalize version + vespalib::VersionSpecification version6(6, 197); // TODO finalize version std::vector<vespalib::VersionSpecification> from50 = { version50, version51, version52 }; std::vector<vespalib::VersionSpecification> from51 = { version51, version52 }; @@ -108,9 +107,7 @@ DocumentProtocol::DocumentProtocol(const LoadTypeSet& loadTypes, putRoutableFactory(MESSAGE_REMOVEDOCUMENT, IRoutableFactory::SP(new RoutableFactories52::RemoveDocumentMessageFactory()), from52); // Add 6.x serialization (TODO finalize version) - if (enableMultipleBucketSpaces) { - putRoutableFactory(MESSAGE_CREATEVISITOR, IRoutableFactory::SP(new RoutableFactories60::CreateVisitorMessageFactory(*_repo)), from6); - } + putRoutableFactory(MESSAGE_CREATEVISITOR, IRoutableFactory::SP(new RoutableFactories60::CreateVisitorMessageFactory(*_repo)), from6); } DocumentProtocol::~DocumentProtocol() = default; diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h index 15a9e4c010a..c3417d85197 100644 --- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h +++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h @@ -200,8 +200,7 @@ public: */ DocumentProtocol(const LoadTypeSet& loadTypes, std::shared_ptr<document::DocumentTypeRepo> repo, - const string &configId = "", - bool enableMultipleBucketSpaces = false); + const string &configId = ""); ~DocumentProtocol(); /** |