diff options
| -rw-r--r-- | config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java | 27 | ||||
| -rw-r--r-- | linguistics/src/main/java/com/yahoo/language/Linguistics.java | 3 |
2 files changed, 27 insertions, 3 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 02f8c7f420c..b2a422690e3 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 @@ -1493,6 +1493,33 @@ public class ModelProvisioningTest { assertEquals(1, model.getContentClusters().get("bar").getRootGroup().countNodes()); } + /** Deploying an application with "nodes count" stnax standalone should give a single-node deployment */ + @Test + public void testThatHostedSyntaxWorksOnStandalone() { + String xmlWithNodes = + "<?xml version='1.0' encoding='utf-8' ?>" + + "<services>" + + " <container version='1.0' id='container1'>" + + " <search/>" + + " <nodes count='1'/>" + + " </container>" + + " <content version='1.0'>" + + " <redundancy>2</redundancy>" + + " <documents>" + + " <document type='type1' mode='index'/>" + + " </documents>" + + " <nodes count='2'/>" + + " </content>" + + "</services>"; + VespaModelTester tester = new VespaModelTester(); + tester.setHosted(false); + tester.addHosts(3); + VespaModel model = tester.createModel(xmlWithNodes, true); + + assertEquals("Nodes in container cluster", 1, model.getContainerClusters().get("container1").getContainers().size()); + assertEquals("Nodes in content cluster (downscaled)", 1, model.getContentClusters().get("content").getRootGroup().getNodes().size()); + } + @Test public void testNoNodeTagMeansTwoNodes() { String services = diff --git a/linguistics/src/main/java/com/yahoo/language/Linguistics.java b/linguistics/src/main/java/com/yahoo/language/Linguistics.java index ec92c5e857e..3fdd06cff0a 100644 --- a/linguistics/src/main/java/com/yahoo/language/Linguistics.java +++ b/linguistics/src/main/java/com/yahoo/language/Linguistics.java @@ -1,8 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.language; -import com.yahoo.collections.Tuple2; -import com.yahoo.component.Version; import com.yahoo.language.detect.Detector; import com.yahoo.language.process.CharacterClasses; import com.yahoo.language.process.GramSplitter; @@ -11,7 +9,6 @@ import com.yahoo.language.process.Segmenter; import com.yahoo.language.process.Stemmer; import com.yahoo.language.process.Tokenizer; import com.yahoo.language.process.Transformer; -import com.yahoo.language.simple.SimpleLinguistics; /** * <p>Factory of linguistic processors. For technical reasons this provides more flexibility to provide separate |