diff options
author | Harald Musum <musum@oath.com> | 2018-04-23 21:35:10 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-04-23 21:35:10 +0200 |
commit | c1965c1d1f9943cc8c7cf3fc397225000b9e5131 (patch) | |
tree | 8004d6b037b16a30db6482d038558239f729c698 | |
parent | 0cbf66a3e9c024df5e53a1ca14056dfd43c68a74 (diff) |
Remove unused stuff
5 files changed, 5 insertions, 21 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java index 0457d4ab522..7bd70bba87a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java @@ -311,11 +311,10 @@ public class Content extends ConfigModel { List<Container> nodes = new ArrayList<>(); int index = 0; Set<HostResource> processedHosts = new LinkedHashSet<>(); - boolean isElastic = cluster.isElastic(); for (SearchNode searchNode : cluster.getSearchNodes()) { HostResource host = searchNode.getHostResource(); if (!processedHosts.contains(host)) { - String containerName = String.valueOf(isElastic ? searchNode.getDistributionKey() : index); + String containerName = String.valueOf(searchNode.getDistributionKey()); Container docprocService = new Container(indexingCluster, containerName, index); index++; docprocService.setBasePort(host.nextAvailableBaseport(docprocService.getPortCount())); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java index 8600d39001d..47a0492d2b4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.model.content; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.vespa.config.search.DispatchConfig; import com.yahoo.vespa.config.search.core.ProtonConfig; -import com.yahoo.documentmodel.DocumentTypeRepo; import com.yahoo.documentmodel.NewDocumentType; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.vespa.model.builder.UserConfigBuilder; @@ -40,14 +39,12 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot private final Set<NewDocumentType> globallyDistributedDocuments; /** The search nodes of this if it does not have an indexed cluster */ - List<SearchNode> nonIndexed = new ArrayList<>(); + private List<SearchNode> nonIndexed = new ArrayList<>(); - Map<StorageGroup, NodeSpec> groupToSpecMap = new LinkedHashMap<>(); - private DocumentTypeRepo repo = null; + private Map<StorageGroup, NodeSpec> groupToSpecMap = new LinkedHashMap<>(); private Optional<ResourceLimits> resourceLimits = Optional.empty(); public void prepare() { - repo = getRoot().getDeployState().getDocumentModel().getDocumentManager(); List<SearchNode> allBackends = getSearchNodes(); for (AbstractSearchCluster cluster : clusters.values()) { cluster.prepareToDistributeFiles(allBackends); @@ -195,7 +192,7 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot } } - public ContentSearchCluster addCluster(AbstractSearchCluster sc) { + private void addCluster(AbstractSearchCluster sc) { if (clusters.containsKey(sc.getClusterName())) { throw new IllegalArgumentException("I already have registered cluster '" + sc.getClusterName() + "'"); } @@ -206,7 +203,6 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot indexedCluster = (IndexedSearchCluster)sc; } clusters.put(sc.getClusterName(), sc); - return this; } public List<SearchNode> getSearchNodes() { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentSelectionConverter.java b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentSelectionConverter.java index fb296c65fcb..4bd27ad300c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentSelectionConverter.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentSelectionConverter.java @@ -10,6 +10,7 @@ import java.util.Map; /** * @author <a href="mailto:lulf@yahoo-inc.com">Ulf Lilleengen</a> */ +// TODO: Public methods only used in tests. What is this class for? public class DocumentSelectionConverter { private final DocumentSelector selector; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java index 8688cce0a03..535c78d7b19 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java @@ -13,11 +13,6 @@ public class IndexedElasticSearchCluster extends IndexedSearchCluster { } @Override - public boolean getAllowFeedingWhenNodesDown() { - return true; - } - - @Override public int getMinNodesPerColumn() { return 0; } @Override @@ -36,7 +31,4 @@ public class IndexedElasticSearchCluster extends IndexedSearchCluster { return false; } - @Override - public boolean isElastic() { return true; } - } 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 c3069f699d2..e925f68b7e4 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 @@ -335,16 +335,12 @@ public abstract class IndexedSearchCluster extends SearchCluster @Override protected void exportSdFiles(File toDir) throws IOException { } - public abstract boolean getAllowFeedingWhenNodesDown(); - public abstract int getMinNodesPerColumn(); boolean useFixedRowInDispatch() { return false; } - public abstract boolean isElastic(); - int getMaxNodesDownPerFixedRow() { return maxNodesDownPerFixedRow; } |