summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-10-29 10:32:04 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2023-10-29 10:32:04 +0100
commitc6c9a282b21f7a9d88cdb64a9e60d2cfc03aafe4 (patch)
tree3be0256e12468f76aaee421c1e73648d4c8f6e79
parentd25bddd85b06a52b226f85f055e03b4717775f5e (diff)
Fully GC resizing code
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java17
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSchemaTuningBuilderTest.java9
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java10
3 files changed, 0 insertions, 36 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 9621ddd1374..90a2bd7c734 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
@@ -119,21 +119,6 @@ public class Tuning extends AnyConfigProducer implements ProtonConfig.Producer {
}
}
- public static class Resizing implements ProtonConfig.Producer {
- // TODO GC as soon as resource computation is moved to backend.
- public Integer initialDocumentCount = null;
-
- @Override
- public void getConfig(ProtonConfig.Builder builder) {
- if (initialDocumentCount!=null) {
- for (ProtonConfig.Documentdb.Builder db : builder.documentdb) {
- db.allocation.initialnumdocs(initialDocumentCount);
- }
- }
- }
-
- }
-
public static class Index implements ProtonConfig.Producer {
public static class Io implements ProtonConfig.Producer {
public IoType search = null;
@@ -347,7 +332,6 @@ public class Tuning extends AnyConfigProducer implements ProtonConfig.Producer {
public RequestThreads threads = null;
public LidSpace lidSpace = null;
public FlushStrategy strategy = null;
- public Resizing resizing = null;
public Index index = null;
public Summary summary = null;
public Initialize initialize = null;
@@ -359,7 +343,6 @@ public class Tuning extends AnyConfigProducer implements ProtonConfig.Producer {
if (threads != null) threads.getConfig(builder);
if (lidSpace != null) lidSpace.getConfig(builder);
if (strategy != null) strategy.getConfig(builder);
- if (resizing != null) resizing.getConfig(builder);
if (index != null) index.getConfig(builder);
if (summary != null) summary.getConfig(builder);
if (initialize != null) initialize.getConfig(builder);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSchemaTuningBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSchemaTuningBuilderTest.java
index 963fce0c666..764e31fe13a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSchemaTuningBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSchemaTuningBuilderTest.java
@@ -103,15 +103,6 @@ public class DomSchemaTuningBuilderTest extends DomBuilderTest {
}
@Test
- void requireThatWeCanParseResizingTag() {
- Tuning t = createTuning(parseXml("<resizing>",
- "<initialdocumentcount>128</initialdocumentcount>",
- "<amortize-count>13</amortize-count>",
- "</resizing>"));
- assertEquals(128, t.searchNode.resizing.initialDocumentCount.intValue());
- }
-
- @Test
void requireThatWeCanParseIndexTag() {
Tuning t = createTuning(parseXml("<index>", "<io>",
"<search>mmap</search>",
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 685610544fe..5b501bad876 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
@@ -173,16 +173,6 @@ public class DocumentDatabaseTestCase {
"", List.of(DEFAULT, DEFAULT));
}
- @Test
- void requireThatMixedModeInitialDocumentCountIsReflected() {
- final long INITIAL = 1000000000L;
- String feedTuning = "<resizing>" +
- " <initialdocumentcount>1000000000</initialdocumentcount>" +
- "</resizing>\n";
- verifyInitialDocumentCount(List.of(DocType.create("a", "index"), DocType.create("b", "streaming")),
- feedTuning, List.of(INITIAL, INITIAL));
- }
-
private void assertDocTypeConfig(VespaModel model, String configId, String indexField, String attributeField) {
IndexschemaConfig icfg = model.getConfig(IndexschemaConfig.class, configId);
assertEquals(1, icfg.indexfield().size());