From b3713cfabf097191635c4545d5d4d958997878e3 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 29 Sep 2022 08:19:53 +0200 Subject: Remove all traces from computeCoverageFromTargetActiveDocs --- .../yahoo/vespa/model/search/IndexedSearchCluster.java | 1 - .../yahoo/vespa/model/content/ContentClusterTest.java | 16 ---------------- .../yahoo/vespa/model/content/cluster/ClusterTest.java | 1 - 3 files changed, 18 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java index db41549d836..e002f3ec3eb 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java @@ -319,7 +319,6 @@ public class IndexedSearchCluster extends SearchCluster builder.searchableCopies(rootDispatch.getSearchableCopies()); builder.redundancy(rootDispatch.getRedundancy()); - builder.computeCoverageFromTargetActiveDocs(true); if (searchCoverage != null) { if (searchCoverage.getMinimum() != null) builder.minSearchCoverage(searchCoverage.getMinimum() * 100.0); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java index 717b70cc686..ac291fc578f 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java @@ -1036,22 +1036,6 @@ public class ContentClusterTest extends ContentBaseTest { } } - private boolean coverageIsComputedFromTargetActive() { - TestProperties properties = new TestProperties(); - VespaModel model = createEnd2EndOneNode(properties); - - ContentCluster cc = model.getContentClusters().get("storage"); - DispatchConfig.Builder builder = new DispatchConfig.Builder(); - cc.getSearch().getConfig(builder); - - return (new DispatchConfig(builder)).computeCoverageFromTargetActiveDocs(); - } - - @Test - public void coverage_from_target_active_dispatch_config_is_controlled_by_properties() { - assertTrue(coverageIsComputedFromTargetActive()); - } - private boolean resolveThreePhaseUpdateConfigWithFeatureFlag(boolean flagEnableThreePhase) { VespaModel model = createEnd2EndOneNode(new TestProperties().setUseThreePhaseUpdates(flagEnableThreePhase)); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java index 98999d02b67..1dbbe9bea9d 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java @@ -96,7 +96,6 @@ public class ClusterTest { DispatchConfig config = new DispatchConfig(builder); assertEquals(2, config.searchableCopies()); assertEquals(3, config.redundancy()); - assertTrue(config.computeCoverageFromTargetActiveDocs()); assertEquals(DispatchConfig.DistributionPolicy.ADAPTIVE, config.distributionPolicy()); assertEquals(1.0, config.maxWaitAfterCoverageFactor(), DELTA); assertEquals(0, config.minWaitAfterCoverageFactor(), DELTA); -- cgit v1.2.3