From 05a6c815d28405f98c06a6bfb226ecc9f64fc69d Mon Sep 17 00:00:00 2001
From: Tor Brede Vekterli <vekterli@yahoo-inc.com>
Date: Wed, 9 May 2018 09:13:44 +0000
Subject: Implicitly enable multiple bucket spaces in content backend

Config can still force new protocol version to be used even if
version handshake indicates it should not be.
---
 storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp | 8 ++++----
 storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'storageapi')

diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
index 33fca0f161a..f83188f7dd8 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
@@ -17,12 +17,12 @@ mbus::string StorageProtocol::NAME = "StorageProtocol";
 
 StorageProtocol::StorageProtocol(const std::shared_ptr<const document::DocumentTypeRepo> repo,
                                  const documentapi::LoadTypeSet& loadTypes,
-                                 bool activateBucketSpaceSerialization)
+                                 bool configForcedBucketSpaceSerialization)
     : _serializer5_0(repo, loadTypes),
       _serializer5_1(repo, loadTypes),
       _serializer5_2(repo, loadTypes),
       _serializer6_0(repo, loadTypes),
-      _activateBucketSpaceSerialization(activateBucketSpaceSerialization)
+      _configForcedBucketSpaceSerialization(configForcedBucketSpaceSerialization)
 {
 }
 
@@ -106,7 +106,7 @@ StorageProtocol::encode(const vespalib::Version& version,
         } else if (version < version5_2) {
             return encodeMessage(_serializer5_1, routable, message, version5_1, version);
         } else {
-            if (_activateBucketSpaceSerialization) {
+            if (_configForcedBucketSpaceSerialization) {
                 return encodeMessage(_serializer6_0, routable, message, version6_0, version);
             } else {
                if (version < version6_0) {
@@ -184,7 +184,7 @@ StorageProtocol::decode(const vespalib::Version & version,
         } else if (version < version5_2) {
             return decodeMessage(_serializer5_1, data, type, version5_1, version);
         } else {
-            if (_activateBucketSpaceSerialization) {
+            if (_configForcedBucketSpaceSerialization) {
                 return decodeMessage(_serializer6_0, data, type, version6_0, version);
             } else {
                 if (version < version6_0) {
diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h
index d85e9d55d1a..56f271db1d0 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h
+++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h
@@ -29,7 +29,7 @@ private:
     ProtocolSerialization5_1 _serializer5_1;
     ProtocolSerialization5_2 _serializer5_2;
     ProtocolSerialization6_0 _serializer6_0;
-    bool _activateBucketSpaceSerialization;
+    bool _configForcedBucketSpaceSerialization;
 };
 
 }
-- 
cgit v1.2.3