diff options
Diffstat (limited to 'vdslib/src/tests/distribution/distributiontest.cpp')
| -rw-r--r-- | vdslib/src/tests/distribution/distributiontest.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/vdslib/src/tests/distribution/distributiontest.cpp b/vdslib/src/tests/distribution/distributiontest.cpp index e90f2c25de3..d037c3f14b1 100644 --- a/vdslib/src/tests/distribution/distributiontest.cpp +++ b/vdslib/src/tests/distribution/distributiontest.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vdslib/distribution/idealnodecalculator.h> #include <vespa/config/helper/configfetcher.h> @@ -17,6 +16,7 @@ #include <vespa/vespalib/stllike/lexical_cast.h> #include <vespa/vdslib/state/clusterstate.h> #include <vespa/vdstestlib/cppunit/macros.h> +#include <vespa/config-stor-distribution.h> namespace storage { namespace lib { @@ -580,8 +580,7 @@ DistributionTest::testDiskCapacityWeights() void DistributionTest::testDiskSkewLocal() { - Distribution distr(Distribution::getDefaultDistributionConfig( - 2, 3, vespa::config::content::StorDistributionConfig::MODULO_INDEX)); + Distribution distr(Distribution::getDefaultDistributionConfig(2, 3, Distribution::MODULO_INDEX)); std::vector<float> diskDist(100); NodeState nodeState; nodeState.setDiskCount(100); @@ -597,17 +596,13 @@ DistributionTest::testDiskSkewLocal() } - - void DistributionTest::testDiskSkewGlobal() { uint16_t num_disks = 10; uint16_t num_nodes = 10; - Distribution distr(Distribution::getDefaultDistributionConfig( - 2, num_nodes, vespa::config::content::StorDistributionConfig::MODULO_INDEX)); - std::vector<std::vector<float> > diskDist( - num_nodes, std::vector<float>(num_disks)); + Distribution distr(Distribution::getDefaultDistributionConfig(2, num_nodes, Distribution::MODULO_INDEX)); + std::vector<std::vector<float> > diskDist(num_nodes, std::vector<float>(num_disks)); NodeState nodeState; nodeState.setDiskCount(num_disks); for(uint16_t idx=0; idx < num_nodes; idx++) { @@ -640,8 +635,7 @@ DistributionTest::testDiskIntersection() uint16_t num_disks = 8; uint16_t num_nodes = 20; float max = 0; - Distribution distr(Distribution::getDefaultDistributionConfig( - 2, num_nodes, vespa::config::content::StorDistributionConfig::MODULO_INDEX)); + Distribution distr(Distribution::getDefaultDistributionConfig(2, num_nodes, Distribution::MODULO_INDEX)); NodeState nodeState; nodeState.setDiskCount(num_disks); |