Add a condition Type (MIN/MAX) and drop isRequired

joegallo · joegallo · commit 8a60331e4f0f · 2022-07-25T13:53:48.000-04:00
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java
@@ -20,11 +20,21 @@
  */
 public abstract class Condition<T> implements NamedWriteable, ToXContentFragment {
 
+    /**
+     * Describes the type of condition - a min_* condition (MIN) or max_* condition (MAX).
+     */
+    public enum Type {
+        MIN,
+        MAX
+    }
+
     protected T value;
     protected final String name;
+    protected final Type type;
 
-    protected Condition(String name) {
+    protected Condition(String name, Type type) {
         this.name = name;
+        this.type = type;
     }
 
     /**
@@ -67,8 +77,8 @@ public String name() {
         return name;
     }
 
-    public boolean isRequired() {
-        return false;
+    public Type type() {
+        return type;
     }
 
     /**
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java
@@ -24,12 +24,12 @@ public class MaxAgeCondition extends Condition<TimeValue> {
     public static final String NAME = "max_age";
 
     public MaxAgeCondition(TimeValue value) {
-        super(NAME);
+        super(NAME, Type.MAX);
         this.value = value;
     }
 
     public MaxAgeCondition(StreamInput in) throws IOException {
-        super(NAME);
+        super(NAME, Type.MAX);
         this.value = TimeValue.timeValueMillis(in.readLong());
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java
@@ -23,12 +23,12 @@ public class MaxDocsCondition extends Condition<Long> {
     public static final String NAME = "max_docs";
 
     public MaxDocsCondition(Long value) {
-        super(NAME);
+        super(NAME, Type.MAX);
         this.value = value;
     }
 
     public MaxDocsCondition(StreamInput in) throws IOException {
-        super(NAME);
+        super(NAME, Type.MAX);
         this.value = in.readLong();
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxPrimaryShardDocsCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxPrimaryShardDocsCondition.java
@@ -24,12 +24,12 @@ public class MaxPrimaryShardDocsCondition extends Condition<Long> {
     public static final String NAME = "max_primary_shard_docs";
 
     public MaxPrimaryShardDocsCondition(Long value) {
-        super(NAME);
+        super(NAME, Type.MAX);
         this.value = value;
     }
 
     public MaxPrimaryShardDocsCondition(StreamInput in) throws IOException {
-        super(NAME);
+        super(NAME, Type.MAX);
         this.value = in.readLong();
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxPrimaryShardSizeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxPrimaryShardSizeCondition.java
@@ -25,12 +25,12 @@ public class MaxPrimaryShardSizeCondition extends Condition<ByteSizeValue> {
     public static final String NAME = "max_primary_shard_size";
 
     public MaxPrimaryShardSizeCondition(ByteSizeValue value) {
-        super(NAME);
+        super(NAME, Type.MAX);
         this.value = value;
     }
 
     public MaxPrimaryShardSizeCondition(StreamInput in) throws IOException {
-        super(NAME);
+        super(NAME, Type.MAX);
         this.value = new ByteSizeValue(in.readVLong(), ByteSizeUnit.BYTES);
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java
@@ -25,12 +25,12 @@ public class MaxSizeCondition extends Condition<ByteSizeValue> {
     public static final String NAME = "max_size";
 
     public MaxSizeCondition(ByteSizeValue value) {
-        super(NAME);
+        super(NAME, Type.MAX);
         this.value = value;
     }
 
     public MaxSizeCondition(StreamInput in) throws IOException {
-        super(NAME);
+        super(NAME, Type.MAX);
         this.value = new ByteSizeValue(in.readVLong(), ByteSizeUnit.BYTES);
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinAgeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinAgeCondition.java
@@ -25,12 +25,12 @@ public class MinAgeCondition extends Condition<TimeValue> {
     public static final String NAME = "min_age";
 
     public MinAgeCondition(TimeValue value) {
-        super(NAME);
+        super(NAME, Type.MIN);
         this.value = value;
     }
 
     public MinAgeCondition(StreamInput in) throws IOException {
-        super(NAME);
+        super(NAME, Type.MIN);
         this.value = TimeValue.timeValueMillis(in.readLong());
     }
 
@@ -40,11 +40,6 @@ public Result evaluate(final Stats stats) {
         return new Result(this, this.value.getMillis() <= indexAge);
     }
 
-    @Override
-    public boolean isRequired() {
-        return true;
-    }
-
     @Override
     public String getWriteableName() {
         return NAME;
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinDocsCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinDocsCondition.java
@@ -24,12 +24,12 @@ public class MinDocsCondition extends Condition<Long> {
     public static final String NAME = "min_docs";
 
     public MinDocsCondition(Long value) {
-        super(NAME);
+        super(NAME, Type.MIN);
         this.value = value;
     }
 
     public MinDocsCondition(StreamInput in) throws IOException {
-        super(NAME);
+        super(NAME, Type.MIN);
         this.value = in.readLong();
     }
 
@@ -38,11 +38,6 @@ public Result evaluate(final Stats stats) {
         return new Result(this, this.value <= stats.numDocs());
     }
 
-    @Override
-    public boolean isRequired() {
-        return true;
-    }
-
     @Override
     public String getWriteableName() {
         return NAME;
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardDocsCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardDocsCondition.java
@@ -24,12 +24,12 @@ public class MinPrimaryShardDocsCondition extends Condition<Long> {
     public static final String NAME = "min_primary_shard_docs";
 
     public MinPrimaryShardDocsCondition(Long value) {
-        super(NAME);
+        super(NAME, Type.MIN);
         this.value = value;
     }
 
     public MinPrimaryShardDocsCondition(StreamInput in) throws IOException {
-        super(NAME);
+        super(NAME, Type.MIN);
         this.value = in.readLong();
     }
 
@@ -38,11 +38,6 @@ public Result evaluate(Stats stats) {
         return new Result(this, this.value <= stats.maxPrimaryShardDocs());
     }
 
-    @Override
-    public boolean isRequired() {
-        return true;
-    }
-
     @Override
     public String getWriteableName() {
         return NAME;
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardSizeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinPrimaryShardSizeCondition.java
@@ -25,12 +25,12 @@ public class MinPrimaryShardSizeCondition extends Condition<ByteSizeValue> {
     public static final String NAME = "min_primary_shard_size";
 
     public MinPrimaryShardSizeCondition(ByteSizeValue value) {
-        super(NAME);
+        super(NAME, Type.MIN);
         this.value = value;
     }
 
     public MinPrimaryShardSizeCondition(StreamInput in) throws IOException {
-        super(NAME);
+        super(NAME, Type.MIN);
         this.value = new ByteSizeValue(in);
     }
 
@@ -39,11 +39,6 @@ public Result evaluate(Stats stats) {
         return new Result(this, stats.maxPrimaryShardSize().getBytes() >= value.getBytes());
     }
 
-    @Override
-    public boolean isRequired() {
-        return true;
-    }
-
     @Override
     public String getWriteableName() {
         return NAME;
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinSizeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MinSizeCondition.java
@@ -26,12 +26,12 @@ public class MinSizeCondition extends Condition<ByteSizeValue> {
     public static final String NAME = "min_size";
 
     public MinSizeCondition(ByteSizeValue value) {
-        super(NAME);
+        super(NAME, Type.MIN);
         this.value = value;
     }
 
     public MinSizeCondition(StreamInput in) throws IOException {
-        super(NAME);
+        super(NAME, Type.MIN);
         this.value = new ByteSizeValue(in.readVLong(), ByteSizeUnit.BYTES);
     }
 
@@ -40,11 +40,6 @@ public Result evaluate(Stats stats) {
         return new Result(this, stats.indexSize().getBytes() >= value.getBytes());
     }
 
-    @Override
-    public boolean isRequired() {
-        return true;
-    }
-
     @Override
     public String getWriteableName() {
         return NAME;
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java
@@ -30,7 +30,6 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
-import java.util.function.Predicate;
 
 import static org.elasticsearch.action.ValidateActions.addValidationError;
 
@@ -194,8 +193,8 @@ public ActionRequestValidationException validate() {
             validationException = addValidationError("rollover target is missing", validationException);
         }
 
-        // max_* conditions are the isRequired = false ones -- the request must have at least one max_* condition
-        boolean noMaxConditions = conditions.values().stream().noneMatch(Predicate.not(Condition::isRequired));
+        // if the request has any conditions, then at least one condition must be a max_* condition
+        boolean noMaxConditions = conditions.values().stream().noneMatch(c -> Condition.Type.MAX == c.type());
         if (conditions.size() > 0 && noMaxConditions) {
             validationException = addValidationError(
                 "at least one max_* rollover condition must be set when using min_* conditions",
@@ -389,17 +388,17 @@ public String getNewIndexName() {
     }
 
     public boolean areConditionsMet(Map<String, Boolean> conditionResults) {
-        boolean allRequiredMet = conditions.values()
+        boolean allMinConditionsMet = conditions.values()
             .stream()
-            .filter(Condition::isRequired)
+            .filter(c -> Condition.Type.MIN == c.type())
             .allMatch(c -> conditionResults.getOrDefault(c.toString(), false));
 
-        boolean anyNonRequiredMet = conditions.values()
+        boolean anyMaxConditionsMet = conditions.values()
             .stream()
-            .filter(Predicate.not(Condition::isRequired))
+            .filter(c -> Condition.Type.MAX == c.type())
             .anyMatch(c -> conditionResults.getOrDefault(c.toString(), false));
 
-        return conditionResults.size() == 0 || (allRequiredMet && anyNonRequiredMet);
+        return conditionResults.size() == 0 || (allMinConditionsMet && anyMaxConditionsMet);
     }
 
     /**
diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/ElasticsearchNodeCommand.java b/server/src/main/java/org/elasticsearch/cluster/coordination/ElasticsearchNodeCommand.java
@@ -237,7 +237,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     public static class UnknownCondition extends Condition<Object> {
 
         public UnknownCondition(String name, Object value) {
-            super(name);
+            super(name, null);
             this.value = value;
         }
 
@@ -262,5 +262,11 @@ public Result evaluate(Stats stats) {
             assert false;
             throw new UnsupportedOperationException();
         }
+
+        @Override
+        public Type type() {
+            assert false;
+            throw new UnsupportedOperationException();
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ public class MaxAgeCondition extends Condition<TimeValue> {`
`24`	`24`	`public static final String NAME = "max_age";`
`25`	`25`
`26`	`26`	`public MaxAgeCondition(TimeValue value) {`
`27`		`- super(NAME);`
	`27`	`+ super(NAME, Type.MAX);`
`28`	`28`	`this.value = value;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public MaxAgeCondition(StreamInput in) throws IOException {`
`32`		`- super(NAME);`
	`32`	`+ super(NAME, Type.MAX);`
`33`	`33`	`this.value = TimeValue.timeValueMillis(in.readLong());`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ public class MaxDocsCondition extends Condition<Long> {`
`23`	`23`	`public static final String NAME = "max_docs";`
`24`	`24`
`25`	`25`	`public MaxDocsCondition(Long value) {`
`26`		`- super(NAME);`
	`26`	`+ super(NAME, Type.MAX);`
`27`	`27`	`this.value = value;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public MaxDocsCondition(StreamInput in) throws IOException {`
`31`		`- super(NAME);`
	`31`	`+ super(NAME, Type.MAX);`
`32`	`32`	`this.value = in.readLong();`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ public class MaxPrimaryShardDocsCondition extends Condition<Long> {`
`24`	`24`	`public static final String NAME = "max_primary_shard_docs";`
`25`	`25`
`26`	`26`	`public MaxPrimaryShardDocsCondition(Long value) {`
`27`		`- super(NAME);`
	`27`	`+ super(NAME, Type.MAX);`
`28`	`28`	`this.value = value;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public MaxPrimaryShardDocsCondition(StreamInput in) throws IOException {`
`32`		`- super(NAME);`
	`32`	`+ super(NAME, Type.MAX);`
`33`	`33`	`this.value = in.readLong();`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ public class MaxPrimaryShardSizeCondition extends Condition<ByteSizeValue> {`
`25`	`25`	`public static final String NAME = "max_primary_shard_size";`
`26`	`26`
`27`	`27`	`public MaxPrimaryShardSizeCondition(ByteSizeValue value) {`
`28`		`- super(NAME);`
	`28`	`+ super(NAME, Type.MAX);`
`29`	`29`	`this.value = value;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public MaxPrimaryShardSizeCondition(StreamInput in) throws IOException {`
`33`		`- super(NAME);`
	`33`	`+ super(NAME, Type.MAX);`
`34`	`34`	`this.value = new ByteSizeValue(in.readVLong(), ByteSizeUnit.BYTES);`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ public class MaxSizeCondition extends Condition<ByteSizeValue> {`
`25`	`25`	`public static final String NAME = "max_size";`
`26`	`26`
`27`	`27`	`public MaxSizeCondition(ByteSizeValue value) {`
`28`		`- super(NAME);`
	`28`	`+ super(NAME, Type.MAX);`
`29`	`29`	`this.value = value;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public MaxSizeCondition(StreamInput in) throws IOException {`
`33`		`- super(NAME);`
	`33`	`+ super(NAME, Type.MAX);`
`34`	`34`	`this.value = new ByteSizeValue(in.readVLong(), ByteSizeUnit.BYTES);`
`35`	`35`	`}`
`36`	`36`