Merge more

nik9000 · Aug 22, 2023 · e39033c · e39033c
1 parent 86481c3
commit e39033c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.../src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Greatest.java b/.../src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Greatest.java
@@ -10,12 +10,12 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.ann.Evaluator;
 import org.elasticsearch.compute.operator.EvalOperator;
+import org.elasticsearch.xpack.esql.evaluator.mapper.EvaluatorMapper;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMaxBooleanEvaluator;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMaxBytesRefEvaluator;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMaxDoubleEvaluator;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMaxIntEvaluator;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMaxLongEvaluator;
-import org.elasticsearch.xpack.esql.planner.Mappable;
 import org.elasticsearch.xpack.ql.QlIllegalArgumentException;
 import org.elasticsearch.xpack.ql.expression.Expression;
 import org.elasticsearch.xpack.ql.expression.Expressions;
@@ -38,7 +38,7 @@
 /**
  * Returns the maximum value of multiple columns.
  */
-public class Greatest extends ScalarFunction implements Mappable, OptionalArgument {
+public class Greatest extends ScalarFunction implements EvaluatorMapper, OptionalArgument {
     private DataType dataType;
 
     public Greatest(Source source, Expression first, List<Expression> rest) {
@@ -100,7 +100,7 @@ public boolean foldable() {
 
     @Override
     public Object fold() {
-        return Mappable.super.fold();
+        return EvaluatorMapper.super.fold();
     }
 
     @Override

diff --git a/...sql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Least.java b/...sql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Least.java
@@ -10,12 +10,12 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.ann.Evaluator;
 import org.elasticsearch.compute.operator.EvalOperator;
+import org.elasticsearch.xpack.esql.evaluator.mapper.EvaluatorMapper;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMinBooleanEvaluator;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMinBytesRefEvaluator;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMinDoubleEvaluator;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMinIntEvaluator;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMinLongEvaluator;
-import org.elasticsearch.xpack.esql.planner.Mappable;
 import org.elasticsearch.xpack.ql.QlIllegalArgumentException;
 import org.elasticsearch.xpack.ql.expression.Expression;
 import org.elasticsearch.xpack.ql.expression.Expressions;
@@ -38,7 +38,7 @@
 /**
  * Returns the minimum value of multiple columns.
  */
-public class Least extends ScalarFunction implements Mappable, OptionalArgument {
+public class Least extends ScalarFunction implements EvaluatorMapper, OptionalArgument {
     private DataType dataType;
 
     public Least(Source source, Expression first, List<Expression> rest) {
@@ -100,7 +100,7 @@ public boolean foldable() {
 
     @Override
     public Object fold() {
-        return Mappable.super.fold();
+        return EvaluatorMapper.super.fold();
     }
 
     @Override

diff --git a/...est/java/org/elasticsearch/xpack/esql/expression/function/scalar/nulls/CoalesceTests.java b/...est/java/org/elasticsearch/xpack/esql/expression/function/scalar/nulls/CoalesceTests.java
@@ -14,7 +14,6 @@
 import org.elasticsearch.xpack.esql.evaluator.EvalMapper;
 import org.elasticsearch.xpack.esql.expression.function.AbstractFunctionTestCase;
 import org.elasticsearch.xpack.esql.expression.function.scalar.VaragsTestCaseBuilder;
-import org.elasticsearch.xpack.esql.planner.EvalMapper;
 import org.elasticsearch.xpack.esql.planner.Layout;
 import org.elasticsearch.xpack.ql.expression.Expression;
 import org.elasticsearch.xpack.ql.expression.FieldAttribute;