diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-07 13:03:01 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-07 13:03:01 +0100 |
commit | 86c9c6916ca63c44534be8a9ae7f11bd14566712 (patch) | |
tree | 946e848adada9cb7f75823f09e73ee58346c7ea5 /config-model | |
parent | ac9ae3c5cff5012350e389ce8024c0b137ca0ec5 (diff) |
YQL parsing/serialization improvements
- Serialize annotated range and weightedset with bracing
- Parse Infinity in ranges
- Better error messages in range parsing
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index 270b425fda9..4925a13c4d2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -266,7 +266,8 @@ public class ContentCluster extends AbstractConfigProducer implements String name = g.getName(); if (siblings.contains(name)) { throw new IllegalArgumentException("Cluster '" + cluster + "' has multiple groups " + - "with name '" + name + "' in the same subgroup. Group sibling names must be unique."); + "with name '" + name + + "' in the same subgroup. Group sibling names must be unique."); } siblings.add(name); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java index bf579744efb..2e97cdabd73 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/RedundancyBuilder.java @@ -9,9 +9,10 @@ import com.yahoo.vespa.model.content.Redundancy; * Builds redundancy config for a content cluster. */ public class RedundancyBuilder { - Integer initialRedundancy = 2; - Integer finalRedundancy = 3; - Integer readyCopies = 2; + + private Integer initialRedundancy = 2; + private Integer finalRedundancy = 3; + private Integer readyCopies = 2; RedundancyBuilder(ModelElement clusterXml) { ModelElement redundancyElement = clusterXml.child("redundancy"); |