diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-14 12:15:08 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-14 12:41:51 +0100 |
commit | c1491e3e316c432336683488a98f04a2025d5f93 (patch) | |
tree | 0eaef633839b1580bd65afb0a021d55d1dddd79d /config-model | |
parent | 0ba89e711fe84fd38b571d0c23453237164d51e5 (diff) |
Move getStorageRouteSpec interface to SearchCluster
Diffstat (limited to 'config-model')
3 files changed, 6 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java index 035ae4a06f5..91622e9fe31 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java @@ -22,14 +22,12 @@ import com.yahoo.vespa.model.container.component.ContainerSubsystem; import com.yahoo.vespa.model.container.search.searchchain.SearchChains; import com.yahoo.vespa.model.search.IndexedSearchCluster; import com.yahoo.vespa.model.search.SearchCluster; -import com.yahoo.vespa.model.search.StreamingSearchCluster; import java.util.Collection; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import static com.yahoo.vespa.model.container.PlatformBundles.SEARCH_AND_DOCPROC_BUNDLE; @@ -179,10 +177,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> } scB.rankprofiles_configid(sys.getConfigId()); scB.indexingmode(QrSearchersConfig.Searchcluster.Indexingmode.Enum.valueOf(sys.getIndexingModeName())); - if ( ! (sys instanceof IndexedSearchCluster)) { - scB.storagecluster(new QrSearchersConfig.Searchcluster.Storagecluster.Builder(). - routespec(((StreamingSearchCluster)sys).getStorageRouteSpec())); - } + scB.storagecluster(new QrSearchersConfig.Searchcluster.Storagecluster.Builder().routespec(sys.getStorageRouteSpec())); builder.searchcluster(scB); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java index f19af8b62ca..db02b7724d7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java @@ -43,6 +43,8 @@ public abstract class SearchCluster extends TreeConfigProducer<AnyConfigProducer this.index = index; } + public String getStorageRouteSpec() { return getClusterName(); } + public void add(SchemaInfo schema) { schemas.put(schema.name(), schema); } 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 f8adb18a2c3..d3e69e64fe6 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 @@ -22,7 +22,6 @@ import com.yahoo.vespa.model.content.engines.ProtonEngine; import com.yahoo.vespa.model.search.IndexedSearchCluster; import com.yahoo.vespa.model.search.SearchCluster; import com.yahoo.vespa.model.search.SearchNode; -import com.yahoo.vespa.model.search.StreamingSearchCluster; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -202,7 +201,7 @@ public class ContentBuilderTest extends DomBuilderTest { assertNull(s.getIndexed()); SearchCluster sc = s.getClusters().get(musicClusterId + ".music"); assertEquals(musicClusterId + ".music", sc.getClusterName()); - assertEquals(musicClusterId, ((StreamingSearchCluster) sc).getStorageRouteSpec()); + assertEquals(musicClusterId, sc.getStorageRouteSpec()); assertTrue(cluster.getPersistence() instanceof ProtonEngine.Factory); assertEquals(1, cluster.getStorageCluster().getChildren().size()); @@ -247,13 +246,13 @@ public class ContentBuilderTest extends DomBuilderTest { String id = musicClusterId + ".book"; SearchCluster sc = s.getClusters().get(id); assertEquals(id, sc.getClusterName()); - assertEquals(musicClusterId, ((StreamingSearchCluster) sc).getStorageRouteSpec()); + assertEquals(musicClusterId, sc.getStorageRouteSpec()); } { String id = musicClusterId + ".music"; SearchCluster sc = s.getClusters().get(id); assertEquals(id, sc.getClusterName()); - assertEquals(musicClusterId, ((StreamingSearchCluster) sc).getStorageRouteSpec()); + assertEquals(musicClusterId, sc.getStorageRouteSpec()); } assertTrue(cluster.getPersistence() instanceof ProtonEngine.Factory); |