You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2019/06/02 08:28:05 UTC
[lucene-solr] branch jira/SOLR-13504 updated: SOLR-13504: more tests
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch jira/SOLR-13504
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/SOLR-13504 by this push:
new 11e19d3 SOLR-13504: more tests
11e19d3 is described below
commit 11e19d3ab23e4acb297b1d7224384c2f51908bed
Author: noble <no...@apache.org>
AuthorDate: Sun Jun 2 18:27:45 2019 +1000
SOLR-13504: more tests
---
.../org/apache/solr/client/solrj/cloud/autoscaling/Clause.java | 10 +++++-----
.../solr/client/solrj/cloud/autoscaling/VariableBase.java | 10 ++++++++++
.../apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java | 9 ++++++++-
.../solr/client/solrj/cloud/autoscaling/TestPolicy2.java | 2 +-
4 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java
index d4ae968..2f6b28e 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java
@@ -57,13 +57,13 @@ import static org.apache.solr.common.util.Utils.toJSONString;
*/
public class Clause implements MapWriter, Comparable<Clause> {
public static final String NODESET = "nodeset";
- private static final Set<String> IGNORE_TAGS = new HashSet<>(Arrays.asList(REPLICA, COLLECTION, SHARD, "strict", "type", "put", NODESET));
+ static final Set<String> IGNORE_TAGS = new HashSet<>(Arrays.asList(REPLICA, COLLECTION, SHARD, "strict", "type", "put", NODESET));
private final int hashCode;
final boolean hasComputedValue;
final Map<String, Object> original;
final Clause derivedFrom;
- private boolean nodeSetPresent = false;
+ boolean nodeSetPresent = false;
Condition collection, shard, replica, tag, globalTag;
final Replica.Type type;
boolean strict;
@@ -84,7 +84,7 @@ public class Clause implements MapWriter, Comparable<Clause> {
}
// internal use only
- Clause(Map<String, Object> original, Condition tag, Condition globalTag, boolean isStrict, boolean nodeSetPresent) {
+ Clause(Map<String, Object> original, Condition tag, Condition globalTag, boolean isStrict, boolean nodeSetPresent) {
this.hashCode = original.hashCode();
this.original = original;
this.tag = tag;
@@ -233,7 +233,7 @@ public class Clause implements MapWriter, Comparable<Clause> {
if (tag != null) {
throwExp(m, "Only one tag other than collection, shard, replica is possible");
}
- tag = parse(s, o instanceof Map? (Map<String, Object>) o : singletonMap(s, o));
+ tag = parse(s, o instanceof Map ? (Map<String, Object>) o : singletonMap(s, o));
}
private int compareTypes(Replica.Type t1, Replica.Type t2) {
@@ -568,7 +568,7 @@ public class Clause implements MapWriter, Comparable<Clause> {
public List<Violation> test(Policy.Session session, double[] deviations) {
if (isPerCollectiontag()) {
- if(nodeSetPresent) {
+ if (nodeSetPresent) {
}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java
index aaa874d..5809eff 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java
@@ -45,6 +45,16 @@ public class VariableBase implements Variable {
}
}
+
+ @Override
+ public String postValidate(Condition condition) {
+ if(Clause.IGNORE_TAGS.contains(condition.getName())) return null;
+ if(condition.getOperand() == Operand.WILDCARD && condition.clause.nodeSetPresent){
+ return "#EACH not supported in tags in nodeset";
+ }
+ return null;
+ }
+
static Object getOperandAdjustedValue(Object val, Object original) {
if (original instanceof Condition) {
Condition condition = (Condition) original;
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
index 9abbc54..199489c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
@@ -656,6 +656,13 @@ public class TestPolicy extends SolrTestCaseJ4 {
expectThrows(IllegalArgumentException.class,
() -> Clause.create("{replica: '#EQUAL' , shard: '#EACH' , sysprop.zone:[east]}"));
+
+ expectThrows(IllegalArgumentException.class,
+ () -> Clause.create("{replica:1, nodeset : {sysprop.zone : '#EACH'}}"));
+
+ expectThrows(IllegalArgumentException.class,
+ () -> Clause.create("{replica:1, nodeset : {host : '#EACH'}}"));
+
clause = Clause.create("{cores: '#EQUAL' , node:'#ANY'}");
assertEquals(ComputedType.EQUAL, clause.globalTag.computedType);
expectThrows(IllegalArgumentException.class,
@@ -1912,7 +1919,7 @@ public class TestPolicy extends SolrTestCaseJ4 {
"{replica:0, nodeset:{'nodeRole':'overseer'},'strict':false}," +
"{'replica':'<1','node':'node3'}," +
"{'replica':'<2','node':'#ANY','shard':'#EACH'}," +
- "{'replica':'<3','shard':'#EACH', nodeset : { 'sysprop.rack':'#EACH'}}" +
+ "{'replica':'<3','shard':'#EACH', nodeset : { 'sysprop.rack':[rack1 , rack2 , rack3 , rack4]}}" +
"]" +
"}" +
"}";
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2.java b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2.java
index 6ec31cd..6c06335 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2.java
@@ -87,7 +87,7 @@ public class TestPolicy2 extends SolrTestCaseJ4 {
" 'cluster-preferences':[{ minimize : cores},{maximize : freedisk, precision : 50}]}";
if(useNodeset){
autoScalingjson = "{cluster-policy:[" +
- " { replica : '<3' , shard : '#EACH', nodeset:{sysprop.zone: '#EACH'} } ]," +
+ " { replica : '<3' , shard : '#EACH', nodeset:{sysprop.zone: [east, west]} } ]," +
" 'cluster-preferences':[{ minimize : cores},{maximize : freedisk, precision : 50}]}";
}
policy = new Policy((Map<String, Object>) Utils.fromJSONString(autoScalingjson));