From b45b1f751db93c347fe7359274897e248ad6b927 Mon Sep 17 00:00:00 2001
From: Geir Storli <geirst@oath.com>
Date: Fri, 23 Nov 2018 12:01:31 +0000
Subject: Remove experimental enable-multiple-bucket-spaces flag.

The feature has been default on since late May 2018.
---
 .../src/tests/mbusprot/storageprotocoltest.cpp     |  2 +-
 .../vespa/storageapi/mbusprot/storageprotocol.cpp  | 26 +++++++---------------
 .../vespa/storageapi/mbusprot/storageprotocol.h    |  4 +---
 3 files changed, 10 insertions(+), 22 deletions(-)

(limited to 'storageapi')

diff --git a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
index da7e8cb743e..f634667afd5 100644
--- a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
+++ b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
@@ -56,7 +56,7 @@ struct StorageProtocolTest : public CppUnit::TestFixture {
           _testDoc(_docMan.createDocument()),
           _testDocId(_testDoc->getId()),
           _bucket(makeDocumentBucket(document::BucketId(16, 0x51))),
-          _protocol(_docMan.getTypeRepoSP(), _loadTypes, true)
+          _protocol(_docMan.getTypeRepoSP(), _loadTypes)
     {
         _loadTypes.addLoadType(34, "foo", documentapi::Priority::PRI_NORMAL_2);
     }
diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
index f83188f7dd8..7e6be0a84f5 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp
@@ -16,13 +16,11 @@ namespace storage::mbusprot {
 mbus::string StorageProtocol::NAME = "StorageProtocol";
 
 StorageProtocol::StorageProtocol(const std::shared_ptr<const document::DocumentTypeRepo> repo,
-                                 const documentapi::LoadTypeSet& loadTypes,
-                                 bool configForcedBucketSpaceSerialization)
+                                 const documentapi::LoadTypeSet& loadTypes)
     : _serializer5_0(repo, loadTypes),
       _serializer5_1(repo, loadTypes),
       _serializer5_2(repo, loadTypes),
-      _serializer6_0(repo, loadTypes),
-      _configForcedBucketSpaceSerialization(configForcedBucketSpaceSerialization)
+      _serializer6_0(repo, loadTypes)
 {
 }
 
@@ -106,14 +104,10 @@ StorageProtocol::encode(const vespalib::Version& version,
         } else if (version < version5_2) {
             return encodeMessage(_serializer5_1, routable, message, version5_1, version);
         } else {
-            if (_configForcedBucketSpaceSerialization) {
-                return encodeMessage(_serializer6_0, routable, message, version6_0, version);
+            if (version < version6_0) {
+                return encodeMessage(_serializer5_2, routable, message, version5_2, version);
             } else {
-               if (version < version6_0) {
-                   return encodeMessage(_serializer5_2, routable, message, version5_2, version);
-               } else {
-                   return encodeMessage(_serializer6_0, routable, message, version6_0, version);
-               }
+                return encodeMessage(_serializer6_0, routable, message, version6_0, version);
             }
         }
 
@@ -184,14 +178,10 @@ StorageProtocol::decode(const vespalib::Version & version,
         } else if (version < version5_2) {
             return decodeMessage(_serializer5_1, data, type, version5_1, version);
         } else {
-            if (_configForcedBucketSpaceSerialization) {
-                return decodeMessage(_serializer6_0, data, type, version6_0, version);
+            if (version < version6_0) {
+                return decodeMessage(_serializer5_2, data, type, version5_2, version);
             } else {
-                if (version < version6_0) {
-                    return decodeMessage(_serializer5_2, data, type, version5_2, version);
-                } else {
-                    return decodeMessage(_serializer6_0, data, type, version6_0, version);
-                }
+                return decodeMessage(_serializer6_0, data, type, version6_0, version);
             }
         }
     } catch (std::exception & e) {
diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h
index 56f271db1d0..1acd7c9675f 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h
+++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h
@@ -15,8 +15,7 @@ public:
     static mbus::string NAME;
 
     StorageProtocol(const std::shared_ptr<const document::DocumentTypeRepo>,
-                    const documentapi::LoadTypeSet& loadTypes,
-                    bool activateBucketSpaceSerialization = false);
+                    const documentapi::LoadTypeSet& loadTypes);
     ~StorageProtocol();
 
     const mbus::string& getName() const override { return NAME; }
@@ -29,7 +28,6 @@ private:
     ProtocolSerialization5_1 _serializer5_1;
     ProtocolSerialization5_2 _serializer5_2;
     ProtocolSerialization6_0 _serializer6_0;
-    bool _configForcedBucketSpaceSerialization;
 };
 
 }
-- 
cgit v1.2.3