Avoid dependency of IndexedSearchCluster

4 files changed, 13 insertions, 21 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java
index 0d42219dade..39894d95c2c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java
@@ -30,13 +30,11 @@ public class StreamingSearchClusterChangeValidator implements ChangeValidator {
         context.previousModel().getContentClusters().forEach((clusterName, currentCluster) -> {
             ContentCluster nextCluster = context.model().getContentClusters().get(clusterName);
             if (nextCluster != null) {
-                var nextStreamingClusters = nextCluster.getSearch().getClusters();
-                currentCluster.getSearch().getClusters().values().forEach(currentStreamingCluster -> {
-                    SearchCluster nextStreamingCluster = nextStreamingClusters.get(currentStreamingCluster.getClusterName());
-                    if (nextStreamingCluster != null) {
-                        validateStreamingCluster(currentCluster, currentStreamingCluster, nextCluster, nextStreamingCluster).forEach(context::require);
-                    }
-                });
+                if (currentCluster.getSearch().getIndexed() != null && nextCluster.getSearch().getIndexed() != null) {
+                    validateStreamingCluster(currentCluster, currentCluster.getSearch().getIndexed(),
+                                             nextCluster, nextCluster.getSearch().getIndexed())
+                            .forEach(context::require);
+                }
             }
         });
     }
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 1254f8e110a..4ac7a8e442a 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
@@ -135,8 +135,11 @@ public class Content extends ConfigModel {
 
     public static List<SearchCluster> getSearchClusters(ConfigModelRepo pc) {
         List<SearchCluster> clusters = new ArrayList<>();
-        for (ContentCluster c : getContentClusters(pc))
-            clusters.addAll(c.getSearch().getClusters().values());
+        for (ContentCluster c : getContentClusters(pc)) {
+            if (c.getSearch().hasIndexedCluster()) {
+                clusters.add(c.getSearch().getIndexed());
+            }
+        }
         return clusters;
     }
 
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 e2fe660cbe9..469901bb542 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
@@ -229,9 +229,8 @@ public class ContentSearchCluster extends TreeConfigProducer<AnyConfigProducer>
      */
     public Boolean isStreaming() {
         if (indexedCluster == null) return false;
-        boolean hasStreaming = indexedCluster.schemas().values().stream().anyMatch(schema -> schema.getIndexMode() == SchemaInfo.IndexMode.STREAMING);
-        boolean hasIndexed = indexedCluster.schemas().values().stream().anyMatch(schema -> schema.getIndexMode() == SchemaInfo.IndexMode.INDEX);
-        if (hasIndexed == hasStreaming) return null;
+        boolean hasStreaming = indexedCluster.hasStreaming();
+        if (indexedCluster.hasIndexed() == hasStreaming) return null;
         return hasStreaming;
     }
 
@@ -404,7 +403,6 @@ public class ContentSearchCluster extends TreeConfigProducer<AnyConfigProducer>
             getIndexed().getConfig(builder);
         }
     }
-    public Map<String, SearchCluster> getClusters() { return clusters; }
     public IndexedSearchCluster getIndexed() { return indexedCluster; }
     public boolean hasIndexedCluster()       { return indexedCluster != null; }
     public IndexingDocproc getIndexingDocproc() { return indexingDocproc; }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
index 327b169a629..a4a5f4cb4df 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
@@ -63,7 +63,6 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         ContentSearchCluster s = a.getSearch();
         assertFalse(s.hasIndexedCluster());
-        assertTrue(s.getClusters().isEmpty());
 
         assertTrue(a.getPersistence() instanceof com.yahoo.vespa.model.content.engines.DummyPersistence.Factory);
     }
@@ -83,7 +82,6 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         ContentSearchCluster s = a.getSearch();
         assertFalse(s.hasIndexedCluster());
-        assertTrue(s.getClusters().isEmpty());
 
         assertTrue(a.getPersistence() instanceof ProtonEngine.Factory);
 
@@ -108,7 +106,6 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         ContentSearchCluster s = a.getSearch();
         assertFalse(s.hasIndexedCluster());
-        assertTrue(s.getClusters().isEmpty());
 
         assertTrue(a.getPersistence() instanceof ProtonEngine.Factory);
 
@@ -130,7 +127,6 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         ContentSearchCluster s = a.getSearch();
         assertFalse(s.hasIndexedCluster());
-        assertTrue(s.getClusters().isEmpty());
         assertNull(s.getIndexed());
 
         assertNull(a.getRootGroup().getName());
@@ -151,7 +147,6 @@ public class ContentBuilderTest extends DomBuilderTest {
         ContentCluster c = CollectionUtil.first(m.getContentClusters().values());
         ContentSearchCluster s = c.getSearch();
         assertTrue(s.hasIndexedCluster());
-        assertEquals(1, s.getClusters().size());
         assertNotNull(s.getIndexed());
         assertEquals("clu", s.getIndexed().getClusterName());
         assertEquals(7.3, s.getIndexed().getQueryTimeout(), 0.0);
@@ -197,8 +192,7 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         s = cluster.getSearch();
         assertTrue(s.hasIndexedCluster());
-        assertEquals(1, s.getClusters().size());
-        SearchCluster sc = s.getClusters().get(musicClusterId);
+        SearchCluster sc = s.getIndexed();
         assertEquals(musicClusterId, sc.getClusterName());
         assertEquals(musicClusterId, sc.getStorageRouteSpec());
 
@@ -263,7 +257,6 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         s = b.getSearch();
         assertTrue(s.hasIndexedCluster());
-        assertEquals(1, s.getClusters().size());
         assertNotNull(s.getIndexed());
         assertEquals("b", s.getIndexed().getClusterName());