summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-01-30 09:27:16 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2019-01-30 09:27:16 +0100
commit603087f80d53ec2bdd3711095e47b41f719dd695 (patch)
tree7826a9d92f47e2968d33bbf703c26e586f377cd7 /config-model
parentbaa82439e2e85ba09b8740dc54991e33b819f440 (diff)
amortizecount -> amortize-count
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java2
-rw-r--r--config-model/src/main/resources/schema/content.rnc2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
index 35e06daf3fe..1b8a5d14e6c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
@@ -165,7 +165,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
for (Element e : XML.getChildren(spec)) {
if (equals("initialdocumentcount", e)) {
sn.resizing.initialDocumentCount = asInt(e);
- } else if (equals("amortizecount", e)) {
+ } else if (equals("amortize-count", e)) {
sn.resizing.amortizeCount = asInt(e);
}
}
diff --git a/config-model/src/main/resources/schema/content.rnc b/config-model/src/main/resources/schema/content.rnc
index aced5aeac1a..c23f99518cb 100644
--- a/config-model/src/main/resources/schema/content.rnc
+++ b/config-model/src/main/resources/schema/content.rnc
@@ -312,7 +312,7 @@ Tuning = element tuning {
}? &
element resizing {
element initialdocumentcount { xsd:nonNegativeInteger }? &
- element amortizecount { xsd:nonNegativeInteger }?
+ element amortize-count { xsd:nonNegativeInteger }?
}? &
element index {
element io {
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 f8ddae575b5..c447baf763f 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
@@ -134,7 +134,7 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
public void requireThatWeCanParseResizingTag() {
Tuning t = createTuning(parseXml("<resizing>",
"<initialdocumentcount>128</initialdocumentcount>",
- "<amortizecount>13</amortizecount>",
+ "<amortize-count>13</amortize-count>",
"</resizing>"));
assertEquals(128, t.searchNode.resizing.initialDocumentCount.intValue());
assertEquals(13, t.searchNode.resizing.amortizeCount.intValue());