diff options
5 files changed, 0 insertions, 21 deletions
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 ee221962660..c2218730d08 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 if (tuning.dispatch.getMaxHitsPerPartition() != null) builder.maxHitsPerNode(tuning.dispatch.getMaxHitsPerPartition()); - builder.searchableCopies(rootDispatch.getSearchableCopies()); builder.redundancy(rootDispatch.getRedundancy()); if (searchCoverage != null) { if (searchCoverage.getMinimum() != null) 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 1dbbe9bea9d..6b6a61823ab 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 @@ -61,7 +61,6 @@ public class ClusterTest { assertEquals(11.0, config.minSearchCoverage(), DELTA); assertEquals(0.23, config.minWaitAfterCoverageFactor(), DELTA); assertEquals(0.58, config.maxWaitAfterCoverageFactor(), DELTA); - assertEquals(2, config.searchableCopies()); assertEquals(3, config.redundancy()); assertEquals(DispatchConfig.DistributionPolicy.ADAPTIVE, config.distributionPolicy()); } @@ -79,7 +78,6 @@ public class ClusterTest { DispatchConfig.Builder builder = new DispatchConfig.Builder(); cluster.getSearch().getConfig(builder); DispatchConfig config = new DispatchConfig(builder); - assertEquals(2, config.searchableCopies()); assertEquals(3, config.redundancy()); assertEquals(93.0, config.minActivedocsPercentage(), DELTA); assertEquals(DispatchConfig.DistributionPolicy.ROUNDROBIN, config.distributionPolicy()); @@ -94,7 +92,6 @@ public class ClusterTest { DispatchConfig.Builder builder = new DispatchConfig.Builder(); cluster.getSearch().getConfig(builder); DispatchConfig config = new DispatchConfig(builder); - assertEquals(2, config.searchableCopies()); assertEquals(3, config.redundancy()); assertEquals(DispatchConfig.DistributionPolicy.ADAPTIVE, config.distributionPolicy()); assertEquals(1.0, config.maxWaitAfterCoverageFactor(), DELTA); diff --git a/configdefinitions/src/vespa/dispatch.def b/configdefinitions/src/vespa/dispatch.def index 9addfca1559..e219ea25612 100644 --- a/configdefinitions/src/vespa/dispatch.def +++ b/configdefinitions/src/vespa/dispatch.def @@ -26,16 +26,6 @@ maxHitsPerNode int default=2147483647 ## a setting of 1.0. This is a significant optimisation with with very little loss in presicion. topKProbability double default=0.9999 -# Is multi-level dispatch configured for this cluster -# Deprecated, will go away soon, NOOP -useMultilevelDispatch bool default=false - -# Dispatch only to local nodes. DEPRECATED: The container will automatically do this when it is appropriate. -useLocalNode bool default=false - -# Number of document replicas _per group_ that will be indexed in a stable cluster. -searchableCopies long default=1 - # Number of document replicas _per group_ that will be present in a stable cluster. # Should always be >= searchableCopies. redundancy long default=1 @@ -69,7 +59,3 @@ node[].host string # The rpc port of this search node node[].port int - -# TODO(bjorncs) Remove after May 2022 -# Temporary feature flag -mergeGroupingResultInSearchInvokerEnabled bool default=false diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java index 11eab6179dc..2a95908ba05 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java @@ -99,8 +99,6 @@ public class Dispatcher extends AbstractComponent { SearchCluster searchCluster, DispatchConfig dispatchConfig, InvokerFactory invokerFactory) { - if (dispatchConfig.useMultilevelDispatch()) - throw new IllegalArgumentException(searchCluster + " is configured with multilevel dispatch, but this is not supported"); this.searchCluster = searchCluster; this.clusterMonitor = clusterMonitor; diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java index 938256b6055..7a6a64fac58 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java @@ -428,7 +428,6 @@ public class InterleavedSearchInvokerTest { @Test void requireCorrectCoverageCalculationWhenDegradedCoverageIsExpectedUsingTargetActiveDocs() throws IOException { verifyCorrectCoverageCalculationWhenDegradedCoverageIsExpected(MockSearchCluster.createDispatchConfig(100.0, List.of()) - .searchableCopies(1) .redundancy(1) .build(), 42); |