diff options
-rw-r--r-- | documentapi/src/tests/policies/policies_test.cpp | 4 | ||||
-rw-r--r-- | vdslib/src/vespa/vdslib/distribution/distribution.cpp | 6 | ||||
-rw-r--r-- | vdslib/src/vespa/vdslib/distribution/distribution.h | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index 81f2057bfde..ac48f66d1e6 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -906,8 +906,8 @@ Test::testDocumentRouteSelectorIgnore() namespace { string getDefaultDistributionConfig( uint16_t redundancy = 2, uint16_t nodeCount = 10, - vespa::config::content::StorDistributionConfig::DiskDistribution distr - = vespa::config::content::StorDistributionConfig::MODULO_BID) + storage::lib::Distribution::DiskDistribution distr + = storage::lib::Distribution::MODULO_BID) { std::ostringstream ost; ost << "raw:redundancy " << redundancy << "\n" diff --git a/vdslib/src/vespa/vdslib/distribution/distribution.cpp b/vdslib/src/vespa/vdslib/distribution/distribution.cpp index 4bc0a3d09c6..d3798667c4d 100644 --- a/vdslib/src/vespa/vdslib/distribution/distribution.cpp +++ b/vdslib/src/vespa/vdslib/distribution/distribution.cpp @@ -273,7 +273,11 @@ Distribution::getDiskSeed( } } throw vespalib::IllegalStateException("Unknown disk distribution: " - + Config::getDiskDistributionName(toConfig(_diskDistribution)), VESPA_STRLOC); + + getDiskDistributionName(_diskDistribution), VESPA_STRLOC); +} + +vespalib::string Distribution::getDiskDistributionName(DiskDistribution dist) { + return Config::getDiskDistributionName(toConfig(dist)); } void diff --git a/vdslib/src/vespa/vdslib/distribution/distribution.h b/vdslib/src/vespa/vdslib/distribution/distribution.h index 59bc1610d7a..3ec75b18d65 100644 --- a/vdslib/src/vespa/vdslib/distribution/distribution.h +++ b/vdslib/src/vespa/vdslib/distribution/distribution.h @@ -181,6 +181,7 @@ public: static DistributionConfig getDefaultDistributionConfig( uint16_t redundancy = 2, uint16_t nodeCount = 10, DiskDistribution distr = MODULO_BID); + static vespalib::string getDiskDistributionName(DiskDistribution dist); /** * Utility function used by distributor to split copies into groups to |