diff options
5 files changed, 0 insertions, 26 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()); diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def index e9fb3d65561..624a8c3397b 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/proton.def @@ -185,27 +185,6 @@ distribution.redundancy long default=1 ## Searchable copies of the documents. distribution.searchablecopies long default=1 -## Minimum initial size for any per document tables. -## Deprecated -> Use documentdb.allocation.xxx -grow.initial long default=1024 restart - -## Grow factor in percent for any per document tables. -## Deprecated -> Use documentdb.allocation.xxx -grow.factor int default=20 restart - -## Constant added when growing any per document tables. -## Deprecated -> Use documentdb.allocation.xxx -grow.add int default=1 restart - -## The number of documents to amortize memory spike cost over -## Deprecated -> Use documentdb.allocation.xxx -grow.numdocs int default=10000 restart - -## The grow factor used when allocating buffers in the array store -## used in multi-value attribute vectors to store underlying values. -## Deprecated -> Use documentdb.allocation.xxx -grow.multivalueallocfactor double default=0.2 restart - ## Control cache size in bytes. ## Postive numbers are absolute in bytes. ## Negative numbers are a percentage of memory. |