GC unused disk_distribution config.

2 files changed, 3 insertions, 9 deletions

diff --git a/storage/src/tests/common/global_bucket_space_distribution_converter_test.cpp b/storage/src/tests/common/global_bucket_space_distribution_converter_test.cpp
index 5631ec71e4d..61f62d86544 100644
--- a/storage/src/tests/common/global_bucket_space_distribution_converter_test.cpp
+++ b/storage/src/tests/common/global_bucket_space_distribution_converter_test.cpp
@@ -48,7 +48,6 @@ group[0].nodes[1].index 1
 group[0].nodes[1].retired false
 group[0].nodes[2].index 2
 group[0].nodes[2].retired false
-disk_distribution MODULO_BID
 )");
 
 }
@@ -117,7 +116,6 @@ group[2].nodes[1].index 4
 group[2].nodes[1].retired false
 group[2].nodes[2].index 5
 group[2].nodes[2].retired false
-disk_distribution MODULO_BID
 )");
     EXPECT_EQ(expected_global_config, default_to_global_config(default_config));
 }
@@ -200,7 +198,6 @@ group[6].capacity 1
 group[6].partitions ""
 group[6].nodes[0].index 3
 group[6].nodes[0].retired false
-disk_distribution MODULO_BID
 )");
     EXPECT_EQ(expected_global_config, default_to_global_config(default_config));
 }
@@ -253,7 +250,6 @@ group[2].capacity 1
 group[2].partitions ""
 group[2].nodes[0].index 2
 group[2].nodes[0].retired false
-disk_distribution MODULO_BID
 )");
     EXPECT_EQ(expected_global_config, default_to_global_config(default_config));
 }
diff --git a/storage/src/vespa/storage/common/global_bucket_space_distribution_converter.cpp b/storage/src/vespa/storage/common/global_bucket_space_distribution_converter.cpp
index ec606af0690..f34c1f2d92a 100644
--- a/storage/src/vespa/storage/common/global_bucket_space_distribution_converter.cpp
+++ b/storage/src/vespa/storage/common/global_bucket_space_distribution_converter.cpp
@@ -4,7 +4,6 @@
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/config/print/asciiconfigwriter.h>
 #include <vespa/config/print/asciiconfigreader.hpp>
-#include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vdslib/distribution/distribution_config_util.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <cassert>
@@ -22,8 +21,7 @@ struct Group {
     std::map<uint16_t, std::unique_ptr<Group>> sub_groups;
 };
 
-void set_distribution_invariant_config_fields(DistributionConfigBuilder& builder, const DistributionConfig& source) {
-    builder.diskDistribution = source.diskDistribution;
+void set_distribution_invariant_config_fields(DistributionConfigBuilder& builder) {
     builder.distributorAutoOwnershipTransferOnWholeGroupDown = true;
     builder.activePerLeafGroup = true;
     // TODO consider how to best support n-of-m replication for global docs
@@ -155,14 +153,14 @@ void build_global_groups(DistributionConfigBuilder& builder, const DistributionC
 std::shared_ptr<DistributionConfig>
 GlobalBucketSpaceDistributionConverter::convert_to_global(const DistributionConfig& source) {
     DistributionConfigBuilder builder;
-    set_distribution_invariant_config_fields(builder, source);
+    set_distribution_invariant_config_fields(builder);
     build_global_groups(builder, source);
     return std::make_shared<DistributionConfig>(builder);
 }
 
 std::shared_ptr<lib::Distribution>
 GlobalBucketSpaceDistributionConverter::convert_to_global(const lib::Distribution& distr) {
-    const auto src_config = distr.serialize();
+    const auto & src_config = distr.serialize();
     auto global_config = convert_to_global(*string_to_config(src_config));
     return std::make_shared<lib::Distribution>(*global_config);
 }