diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-01-30 13:28:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 13:28:24 +0100 |
| commit | c0bc995ddfc20c335754b097f30822dbadf82940 (patch) | |
| tree | f39c0484cdb30b1c8dfa4095e24ea3f328aa1318 /config-model/src | |
| parent | 6afd8863195eccba7ee41a68e2f403f1ad0edff7 (diff) | |
| parent | 603087f80d53ec2bdd3711095e47b41f719dd695 (diff) | |
Merge pull request #8288 from vespa-engine/balder/amortizecount2amortize-count
amortizecount -> amortize-count.
Diffstat (limited to 'config-model/src')
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()); |