Merge pull request #5683 from vespa-engine/musum/remove-unused-stuff

Musum/remove unused stuff

5 files changed, 19 insertions, 58 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..823c428d5ff 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);
@@ -125,7 +122,7 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot
                                                ContentSearchCluster search) {
             List<ModelElement> indexedDefs = getIndexedSearchDefinitions(clusterElem);
             if (!indexedDefs.isEmpty()) {
-                IndexedSearchCluster isc = new IndexedElasticSearchCluster(search, clusterName, 0);
+                IndexedSearchCluster isc = new IndexedSearchCluster(search, clusterName, 0);
                 isc.setRoutingSelector(clusterElem.childAsString("documents.selection"));
 
                 Double visibilityDelay = clusterElem.childAsDouble("engine.proton.visibility-delay");
@@ -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
deleted file mode 100644
index 8688cce0a03..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.search;
-
-import com.yahoo.config.model.producer.AbstractConfigProducer;
-
-/**
- * @author baldersheim
- */
-public class IndexedElasticSearchCluster extends IndexedSearchCluster {
-
-    public IndexedElasticSearchCluster(AbstractConfigProducer parent, String clusterName, int index) {
-        super(parent, clusterName, index);
-    }
-
-    @Override
-    public boolean getAllowFeedingWhenNodesDown() {
-        return true;
-    }
-
-    @Override
-    public int getMinNodesPerColumn() { return 0; }
-
-    @Override
-    protected void assureSdConsistent() { }
-
-    @Override
-    public int getRowBits() { return 8; }
-
-    @Override
-    boolean useFixedRowInDispatch() {
-        for (SearchNode node : getSearchNodes()) {
-            if (node.getNodeSpec().groupIndex() > 0) {
-                return true;
-            }
-        }
-        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..6c478794bfb 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
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 /**
  * @author baldersheim
  */
-public abstract class IndexedSearchCluster extends SearchCluster
+public class IndexedSearchCluster extends SearchCluster
     implements
         DocumentdbInfoConfig.Producer,
         // TODO consider removing, these only produced by UnionConfiguration and DocumentDatabase?
@@ -335,16 +335,17 @@ public abstract class IndexedSearchCluster extends SearchCluster
     @Override
     protected void exportSdFiles(File toDir) throws IOException { }
 
-    public abstract boolean getAllowFeedingWhenNodesDown();
-
-    public abstract int getMinNodesPerColumn();
+    public int getMinNodesPerColumn() { return 0; }
 
     boolean useFixedRowInDispatch() {
+        for (SearchNode node : getSearchNodes()) {
+            if (node.getNodeSpec().groupIndex() > 0) {
+                return true;
+            }
+        }
         return false;
     }
 
-    public abstract boolean isElastic();
-
     int getMaxNodesDownPerFixedRow() {
         return maxNodesDownPerFixedRow;
     }
@@ -394,4 +395,10 @@ public abstract class IndexedSearchCluster extends SearchCluster
         }
     }
 
+    @Override
+    protected void assureSdConsistent() { }
+
+    @Override
+    public int getRowBits() { return 8; }
+
 }