Remove IndexedElasticSearchCluster, all indexed clusters are elastic

3 files changed, 14 insertions, 37 deletions

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 47a0492d2b4..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
@@ -122,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");
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 535c78d7b19..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java
+++ /dev/null
@@ -1,34 +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 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;
-    }
-
-}
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 e925f68b7e4..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,9 +335,14 @@ public abstract class IndexedSearchCluster extends SearchCluster
     @Override
     protected void exportSdFiles(File toDir) throws IOException { }
 
-    public abstract int getMinNodesPerColumn();
+    public int getMinNodesPerColumn() { return 0; }
 
     boolean useFixedRowInDispatch() {
+        for (SearchNode node : getSearchNodes()) {
+            if (node.getNodeSpec().groupIndex() > 0) {
+                return true;
+            }
+        }
         return false;
     }
 
@@ -390,4 +395,10 @@ public abstract class IndexedSearchCluster extends SearchCluster
         }
     }
 
+    @Override
+    protected void assureSdConsistent() { }
+
+    @Override
+    public int getRowBits() { return 8; }
+
 }