diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-01-28 15:35:36 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-01-28 15:35:36 +0100 |
commit | 553a66ef4a0a3ac56e69b9d3d26c0ac64d93c05f (patch) | |
tree | 705f49c9d6772054f9d855a3158eb77e67a45bb0 /config-model | |
parent | 4d971ad6770b55493a98b4b28a3c5f21d78fca2e (diff) |
Remove traces of global grow.
Diffstat (limited to 'config-model')
4 files changed, 0 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java index a87a3d3e312..434d785e4bd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java @@ -133,7 +133,6 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P @Override public void getConfig(ProtonConfig.Builder builder) { if (initialDocumentCount!=null) { - builder.grow.initial(initialDocumentCount); for (ProtonConfig.Documentdb.Builder db : builder.documentdb) { db.allocation.initialnumdocs(initialDocumentCount); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java index aa52a2b586e..e7df410d509 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java @@ -135,8 +135,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest { "<initialdocumentcount>128</initialdocumentcount>", "</resizing>")); assertEquals(128, t.searchNode.resizing.initialDocumentCount.intValue()); - String cfg = getProtonCfg(t); - assertThat(cfg, containsString("grow.initial 128")); } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java index 56d53c2cc69..2422ea86873 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java @@ -45,7 +45,6 @@ public class NodeFlavorTuningTest { @Test public void require_that_initial_numdocs_is_dependent_of_mode() { ProtonConfig cfg = getProtonMemoryConfig(Arrays.asList(new Pair<>("a", "INDEX"), new Pair<>("b", "STREAMING"), new Pair<>("c", "STORE_ONLY")), 24); - assertEquals(1024, cfg.grow().initial()); assertEquals(3, cfg.documentdb().size()); assertEquals(1024, cfg.documentdb(0).allocation().initialnumdocs()); assertEquals("a", cfg.documentdb(0).inputdoctypename()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java index ec10ffa68a2..0512282af09 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java @@ -178,7 +178,6 @@ public class DocumentDatabaseTestCase { VespaModel model = createModel(nameAndModes, xmlTuning); ContentSearchCluster contentSearchCluster = model.getContentClusters().get("test").getSearch(); ProtonConfig proton = getProtonCfg(contentSearchCluster); - assertEquals(global, proton.grow().initial()); assertEquals(local.size(), proton.documentdb().size()); for (int i = 0; i < local.size(); i++) { assertEquals(local.get(i).longValue(), proton.documentdb(i).allocation().initialnumdocs()); |