diff options
Diffstat (limited to 'config-model/src/test')
5 files changed, 61 insertions, 62 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java index b1d90b07b9d..5ead9812b56 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java @@ -2480,7 +2480,7 @@ public class ModelProvisioningTest { private long protonMemorySize(ContentCluster cluster) { ProtonConfig.Builder b = new ProtonConfig.Builder(); - cluster.getSearch().getIndexed().getSearchNode(0).getConfig(b); + cluster.getSearch().getSearchCluster().getSearchNode(0).getConfig(b); return b.build().hwinfo().memory().size(); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java index e531087ebd6..91ba97817d6 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/ContentClusterFixture.java @@ -44,7 +44,7 @@ public abstract class ContentClusterFixture { } protected DocumentDatabase currentDb() { - return currentCluster.getSearch().getIndexed().getDocumentDbs().get(0); + return currentCluster.getSearch().getSearchCluster().getDocumentDbs().get(0); } protected NewDocumentType currentDocType() { @@ -52,7 +52,7 @@ public abstract class ContentClusterFixture { } protected DocumentDatabase nextDb() { - return nextCluster.getSearch().getIndexed().getDocumentDbs().get(0); + return nextCluster.getSearch().getSearchCluster().getDocumentDbs().get(0); } protected NewDocumentType nextDocType() { 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 a4a5f4cb4df..fac82f3e675 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 @@ -62,7 +62,7 @@ public class ContentBuilderTest extends DomBuilderTest { "</content>"); ContentSearchCluster s = a.getSearch(); - assertFalse(s.hasIndexedCluster()); + assertFalse(s.hasSearchCluster()); assertTrue(a.getPersistence() instanceof com.yahoo.vespa.model.content.engines.DummyPersistence.Factory); } @@ -81,7 +81,7 @@ public class ContentBuilderTest extends DomBuilderTest { "</content>"); ContentSearchCluster s = a.getSearch(); - assertFalse(s.hasIndexedCluster()); + assertFalse(s.hasSearchCluster()); assertTrue(a.getPersistence() instanceof ProtonEngine.Factory); @@ -105,7 +105,7 @@ public class ContentBuilderTest extends DomBuilderTest { "</content>"); ContentSearchCluster s = a.getSearch(); - assertFalse(s.hasIndexedCluster()); + assertFalse(s.hasSearchCluster()); assertTrue(a.getPersistence() instanceof ProtonEngine.Factory); @@ -126,8 +126,8 @@ public class ContentBuilderTest extends DomBuilderTest { "</content>"); ContentSearchCluster s = a.getSearch(); - assertFalse(s.hasIndexedCluster()); - assertNull(s.getIndexed()); + assertFalse(s.hasSearchCluster()); + assertNull(s.getSearchCluster()); assertNull(a.getRootGroup().getName()); assertNull(a.getRootGroup().getIndex()); @@ -146,10 +146,10 @@ public class ContentBuilderTest extends DomBuilderTest { ContentCluster c = CollectionUtil.first(m.getContentClusters().values()); ContentSearchCluster s = c.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); - assertEquals("clu", s.getIndexed().getClusterName()); - assertEquals(7.3, s.getIndexed().getQueryTimeout(), 0.0); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); + assertEquals("clu", s.getSearchCluster().getClusterName()); + assertEquals(7.3, s.getSearchCluster().getQueryTimeout(), 0.0); assertTrue(c.getPersistence() instanceof ProtonEngine.Factory); assertEquals(1, c.getStorageCluster().getChildren().size()); @@ -170,7 +170,7 @@ public class ContentBuilderTest extends DomBuilderTest { String services = getServices("<node hostalias='mockhost' distribution-key='0'/>" + "<node hostalias='mockhost' distribution-key='1'/>"); VespaModel m = new VespaModelCreatorWithMockPkg(createAppWithMusic(getHosts(), services)).create(); - IndexedSearchCluster sc = m.getContentClusters().get("clu").getSearch().getIndexed(); + IndexedSearchCluster sc = m.getContentClusters().get("clu").getSearch().getSearchCluster(); assertEquals(2, sc.getSearchNodeCount()); } @@ -191,8 +191,8 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = cluster.getSearch(); - assertTrue(s.hasIndexedCluster()); - SearchCluster sc = s.getIndexed(); + assertTrue(s.hasSearchCluster()); + SearchCluster sc = s.getSearchCluster(); assertEquals(musicClusterId, sc.getClusterName()); assertEquals(musicClusterId, sc.getStorageRouteSpec()); @@ -230,10 +230,10 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ContentSearchCluster s = cluster.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertEquals(2, s.getIndexed().getDocumentDbs().size()); - assertTrue(s.getIndexed().hasDocumentDB("book")); - assertTrue(s.getIndexed().hasDocumentDB("music")); + assertTrue(s.hasSearchCluster()); + assertEquals(2, s.getSearchCluster().getDocumentDbs().size()); + assertTrue(s.getSearchCluster().hasDocumentDB("book")); + assertTrue(s.getSearchCluster().hasDocumentDB("music")); assertTrue(cluster.getPersistence() instanceof ProtonEngine.Factory); assertEquals(1, cluster.getStorageCluster().getChildren().size()); @@ -256,9 +256,9 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); - assertEquals("b", s.getIndexed().getClusterName()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); + assertEquals("b", s.getSearchCluster().getClusterName()); assertTrue(b.getPersistence() instanceof ProtonEngine.Factory); assertEquals(1, b.getStorageCluster().getChildren().size()); @@ -287,8 +287,8 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertTrue(b.getRootGroup().getMmapNoCoreLimit().isPresent()); assertEquals(200000, b.getRootGroup().getMmapNoCoreLimit().get().longValue()); @@ -313,8 +313,8 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(1, b.getStorageCluster().getChildren().size()); assertEquals(1, s.getSearchNodes().size()); @@ -342,8 +342,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>", new TestProperties().setEnvironmentVariables(List.of("MY_1_ENV=xyz abc", "MY_2_ENV=2"))); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(1, b.getStorageCluster().getChildren().size()); assertEquals(1, s.getSearchNodes().size()); @@ -368,8 +368,8 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertTrue(b.getRootGroup().getCoreOnOOM().isPresent()); assertTrue(b.getRootGroup().getCoreOnOOM().get()); @@ -393,8 +393,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertFalse(b.getRootGroup().getCoreOnOOM().isPresent()); @@ -417,8 +417,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertFalse(b.getRootGroup().getMmapNoCoreLimit().isPresent()); @@ -441,8 +441,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertFalse(b.getRootGroup().getCoreOnOOM().isPresent()); @@ -467,8 +467,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(4, b.getStorageCluster().getChildren().size()); assertTrue(b.getRootGroup().getNoVespaMalloc().isPresent()); assertEquals("proton", b.getRootGroup().getNoVespaMalloc().get()); @@ -501,8 +501,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ContentSearchCluster s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(4, b.getStorageCluster().getChildren().size()); assertFalse(b.getRootGroup().getNoVespaMalloc().isPresent()); assertFalse(b.getRootGroup().getVespaMalloc().isPresent()); @@ -532,8 +532,8 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertTrue(b.getStorageCluster().getChildren().get("0").getAffinity().isPresent()); assertEquals(0, b.getStorageCluster().getChildren().get("0").getAffinity().get().cpuSocket()); @@ -567,8 +567,8 @@ public class ContentBuilderTest extends DomBuilderTest { ContentSearchCluster s; s = b.getSearch(); - assertTrue(s.hasIndexedCluster()); - assertNotNull(s.getIndexed()); + assertTrue(s.hasSearchCluster()); + assertNotNull(s.getSearchCluster()); assertEquals(6, b.getStorageCluster().getChildren().size()); assertTrue(b.getRootGroup().useCpuSocketAffinity()); @@ -606,18 +606,17 @@ public class ContentBuilderTest extends DomBuilderTest { void requireBug5357273() { try { createContent( - " <content version='1.0' id='storage'>\n" + - " <redundancy>3</redundancy>\n" + - " <documents>" + - " <document type='music' mode='index'/>" + - " </documents>" + - " <group>\n" + - " <node hostalias='mockhost' distribution-key='0' />\n" + - " </group>\n" + - " <engine>\n" + - " <dummy/>\n" + - " </engine>\n" + - " </content>\n"); + """ + <content version='1.0' id='storage'> + <redundancy>3</redundancy> + <documents> <document type='music' mode='index'/> </documents> <group> + <node hostalias='mockhost' distribution-key='0' /> + </group> + <engine> + <dummy/> + </engine> + </content> + """); fail(); } catch (Exception e) { @@ -695,8 +694,8 @@ public class ContentBuilderTest extends DomBuilderTest { " </group>" + "</content>"); ProtonConfig.Builder builder = new ProtonConfig.Builder(); - content.getSearch().getIndexed().getSearchNode(0).cascadeConfig(builder); - content.getSearch().getIndexed().getSearchNode(0).addUserConfig(builder); + content.getSearch().getSearchCluster().getSearchNode(0).cascadeConfig(builder); + content.getSearch().getSearchCluster().getSearchNode(0).addUserConfig(builder); ProtonConfig config = new ProtonConfig(builder); assertEquals(1, config.search().mmap().options().size()); assertEquals(ProtonConfig.Search.Mmap.Options.POPULATE, config.search().mmap().options(0)); @@ -826,8 +825,8 @@ public class ContentBuilderTest extends DomBuilderTest { private ProtonConfig getProtonConfig(ContentCluster content) { ProtonConfig.Builder configBuilder = new ProtonConfig.Builder(); - content.getSearch().getIndexed().getSearchNode(0).cascadeConfig(configBuilder); - content.getSearch().getIndexed().getSearchNode(0).addUserConfig(configBuilder); + content.getSearch().getSearchCluster().getSearchNode(0).cascadeConfig(configBuilder); + content.getSearch().getSearchCluster().getSearchNode(0).addUserConfig(configBuilder); return new ProtonConfig(configBuilder); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java index ae08f78c404..e9e96d8b0cf 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java @@ -113,7 +113,7 @@ public class IndexedTest extends ContentBaseTest { VespaModelCreatorWithMockPkg creator = getIndexedVespaModelCreator(); VespaModel model = creator.create(); DeployState deployState = creator.deployState; - IndexedSearchCluster cluster = model.getContentClusters().get("test").getSearch().getIndexed(); + IndexedSearchCluster cluster = model.getContentClusters().get("test").getSearch().getSearchCluster(); assertEquals(3, cluster.getDocumentDbs().size()); NewDocumentType type1 = deployState.getDocumentModel().getDocumentManager().getDocumentType("type1"); NewDocumentType type2 = deployState.getDocumentModel().getDocumentManager().getDocumentType("type2"); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java index 0cdcf0534c2..8b83c941631 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java @@ -30,7 +30,7 @@ public class ClusterTest { " <query-timeout>1.1</query-timeout>", " <visibility-delay>2.3</visibility-delay>", "</search>")); - SearchCluster searchCluster = cluster.getSearch().getIndexed(); + SearchCluster searchCluster = cluster.getSearch().getSearchCluster(); assertNotNull(searchCluster); assertEquals(1.1, searchCluster.getQueryTimeout(), DELTA); assertEquals(2.3, searchCluster.getVisibilityDelay(), DELTA); |