Move

nik9000 · Aug 22, 2023 · a551ee8 · a551ee8
1 parent deb2e60
commit a551ee8
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 36 deletions.
diff --git a/...scalar/math/GreatestBooleanEvaluator.java → ...conditional/GreatestBooleanEvaluator.java b/...scalar/math/GreatestBooleanEvaluator.java → ...conditional/GreatestBooleanEvaluator.java
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License
 // 2.0; you may not use this file except in compliance with the Elastic License
 // 2.0.
-package org.elasticsearch.xpack.esql.expression.function.scalar.math;
+package org.elasticsearch.xpack.esql.expression.function.scalar.conditional;
 
 import java.lang.Override;
 import java.lang.String;
@@ -12,7 +12,6 @@
 import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.EvalOperator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
 
 /**
  * {@link EvalOperator.ExpressionEvaluator} implementation for {@link Greatest}.

diff --git a/...calar/math/GreatestBytesRefEvaluator.java → ...onditional/GreatestBytesRefEvaluator.java b/...calar/math/GreatestBytesRefEvaluator.java → ...onditional/GreatestBytesRefEvaluator.java
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License
 // 2.0; you may not use this file except in compliance with the Elastic License
 // 2.0.
-package org.elasticsearch.xpack.esql.expression.function.scalar.math;
+package org.elasticsearch.xpack.esql.expression.function.scalar.conditional;
 
 import java.lang.Override;
 import java.lang.String;
@@ -13,7 +13,6 @@
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.EvalOperator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
 
 /**
  * {@link EvalOperator.ExpressionEvaluator} implementation for {@link Greatest}.

diff --git a/.../scalar/math/GreatestDoubleEvaluator.java → .../conditional/GreatestDoubleEvaluator.java b/.../scalar/math/GreatestDoubleEvaluator.java → .../conditional/GreatestDoubleEvaluator.java
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License
 // 2.0; you may not use this file except in compliance with the Elastic License
 // 2.0.
-package org.elasticsearch.xpack.esql.expression.function.scalar.math;
+package org.elasticsearch.xpack.esql.expression.function.scalar.conditional;
 
 import java.lang.Override;
 import java.lang.String;
@@ -12,7 +12,6 @@
 import org.elasticsearch.compute.data.DoubleVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.EvalOperator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
 
 /**
  * {@link EvalOperator.ExpressionEvaluator} implementation for {@link Greatest}.

diff --git a/...ion/scalar/math/GreatestIntEvaluator.java → ...lar/conditional/GreatestIntEvaluator.java b/...ion/scalar/math/GreatestIntEvaluator.java → ...lar/conditional/GreatestIntEvaluator.java
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License
 // 2.0; you may not use this file except in compliance with the Elastic License
 // 2.0.
-package org.elasticsearch.xpack.esql.expression.function.scalar.math;
+package org.elasticsearch.xpack.esql.expression.function.scalar.conditional;
 
 import java.lang.Override;
 import java.lang.String;
@@ -12,7 +12,6 @@
 import org.elasticsearch.compute.data.IntVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.EvalOperator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
 
 /**
  * {@link EvalOperator.ExpressionEvaluator} implementation for {@link Greatest}.

diff --git a/...on/scalar/math/GreatestLongEvaluator.java → ...ar/conditional/GreatestLongEvaluator.java b/...on/scalar/math/GreatestLongEvaluator.java → ...ar/conditional/GreatestLongEvaluator.java
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License
 // 2.0; you may not use this file except in compliance with the Elastic License
 // 2.0.
-package org.elasticsearch.xpack.esql.expression.function.scalar.math;
+package org.elasticsearch.xpack.esql.expression.function.scalar.conditional;
 
 import java.lang.Override;
 import java.lang.String;
@@ -12,7 +12,6 @@
 import org.elasticsearch.compute.data.LongVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.EvalOperator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
 
 /**
  * {@link EvalOperator.ExpressionEvaluator} implementation for {@link Greatest}.

diff --git a/...on/scalar/math/LeastBooleanEvaluator.java → ...ar/conditional/LeastBooleanEvaluator.java b/...on/scalar/math/LeastBooleanEvaluator.java → ...ar/conditional/LeastBooleanEvaluator.java
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License
 // 2.0; you may not use this file except in compliance with the Elastic License
 // 2.0.
-package org.elasticsearch.xpack.esql.expression.function.scalar.math;
+package org.elasticsearch.xpack.esql.expression.function.scalar.conditional;
 
 import java.lang.Override;
 import java.lang.String;
@@ -12,7 +12,6 @@
 import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.EvalOperator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Least;
 
 /**
  * {@link EvalOperator.ExpressionEvaluator} implementation for {@link Least}.

diff --git a/...n/scalar/math/LeastBytesRefEvaluator.java → ...r/conditional/LeastBytesRefEvaluator.java b/...n/scalar/math/LeastBytesRefEvaluator.java → ...r/conditional/LeastBytesRefEvaluator.java
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License
 // 2.0; you may not use this file except in compliance with the Elastic License
 // 2.0.
-package org.elasticsearch.xpack.esql.expression.function.scalar.math;
+package org.elasticsearch.xpack.esql.expression.function.scalar.conditional;
 
 import java.lang.Override;
 import java.lang.String;
@@ -13,7 +13,6 @@
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.EvalOperator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Least;
 
 /**
  * {@link EvalOperator.ExpressionEvaluator} implementation for {@link Least}.

diff --git a/...ion/scalar/math/LeastDoubleEvaluator.java → ...lar/conditional/LeastDoubleEvaluator.java b/...ion/scalar/math/LeastDoubleEvaluator.java → ...lar/conditional/LeastDoubleEvaluator.java
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License
 // 2.0; you may not use this file except in compliance with the Elastic License
 // 2.0.
-package org.elasticsearch.xpack.esql.expression.function.scalar.math;
+package org.elasticsearch.xpack.esql.expression.function.scalar.conditional;
 
 import java.lang.Override;
 import java.lang.String;
@@ -12,7 +12,6 @@
 import org.elasticsearch.compute.data.DoubleVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.EvalOperator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Least;
 
 /**
  * {@link EvalOperator.ExpressionEvaluator} implementation for {@link Least}.

diff --git a/...nction/scalar/math/LeastIntEvaluator.java → ...scalar/conditional/LeastIntEvaluator.java b/...nction/scalar/math/LeastIntEvaluator.java → ...scalar/conditional/LeastIntEvaluator.java
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License
 // 2.0; you may not use this file except in compliance with the Elastic License
 // 2.0.
-package org.elasticsearch.xpack.esql.expression.function.scalar.math;
+package org.elasticsearch.xpack.esql.expression.function.scalar.conditional;
 
 import java.lang.Override;
 import java.lang.String;
@@ -12,7 +12,6 @@
 import org.elasticsearch.compute.data.IntVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.EvalOperator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Least;
 
 /**
  * {@link EvalOperator.ExpressionEvaluator} implementation for {@link Least}.

diff --git a/...ction/scalar/math/LeastLongEvaluator.java → ...calar/conditional/LeastLongEvaluator.java b/...ction/scalar/math/LeastLongEvaluator.java → ...calar/conditional/LeastLongEvaluator.java
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License
 // 2.0; you may not use this file except in compliance with the Elastic License
 // 2.0.
-package org.elasticsearch.xpack.esql.expression.function.scalar.math;
+package org.elasticsearch.xpack.esql.expression.function.scalar.conditional;
 
 import java.lang.Override;
 import java.lang.String;
@@ -12,7 +12,6 @@
 import org.elasticsearch.compute.data.LongVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.EvalOperator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Least;
 
 /**
  * {@link EvalOperator.ExpressionEvaluator} implementation for {@link Least}.

diff --git a/.../src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java b/.../src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java
@@ -17,6 +17,8 @@
 import org.elasticsearch.xpack.esql.expression.function.aggregate.Percentile;
 import org.elasticsearch.xpack.esql.expression.function.aggregate.Sum;
 import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Case;
+import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
+import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Least;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToBoolean;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDatetime;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDegrees;
@@ -44,11 +46,9 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Cosh;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.E;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Floor;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.IsFinite;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.IsInfinite;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.IsNaN;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Least;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Log10;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Pi;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Pow;

diff --git a/...in/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/Greatest.java b/...in/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/Greatest.java
@@ -12,11 +12,6 @@
 import org.elasticsearch.compute.operator.EvalOperator;
 import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
 import org.elasticsearch.xpack.esql.evaluator.mapper.EvaluatorMapper;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.GreatestBooleanEvaluator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.GreatestBytesRefEvaluator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.GreatestDoubleEvaluator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.GreatestIntEvaluator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.GreatestLongEvaluator;
 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;

diff --git a/.../main/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/Least.java b/.../main/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/Least.java
@@ -12,11 +12,6 @@
 import org.elasticsearch.compute.operator.EvalOperator;
 import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
 import org.elasticsearch.xpack.esql.evaluator.mapper.EvaluatorMapper;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.LeastBooleanEvaluator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.LeastBytesRefEvaluator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.LeastDoubleEvaluator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.LeastIntEvaluator;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.LeastLongEvaluator;
 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;

diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/PlanNamedTypes.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/PlanNamedTypes.java
@@ -27,6 +27,8 @@
 import org.elasticsearch.xpack.esql.expression.function.aggregate.Sum;
 import org.elasticsearch.xpack.esql.expression.function.scalar.UnaryScalarFunction;
 import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Case;
+import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
+import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Least;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToBoolean;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDatetime;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDegrees;
@@ -54,11 +56,9 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Cosh;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.E;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Floor;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.IsFinite;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.IsInfinite;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.IsNaN;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Least;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Log10;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Pi;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Pow;

diff --git a/...va/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestTests.java b/...va/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestTests.java
@@ -13,7 +13,6 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.xpack.esql.expression.function.AbstractFunctionTestCase;
 import org.elasticsearch.xpack.esql.expression.function.scalar.VaragsTestCaseBuilder;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
 import org.elasticsearch.xpack.ql.expression.Expression;
 import org.elasticsearch.xpack.ql.tree.Source;
 import org.elasticsearch.xpack.ql.type.DataTypes;

diff --git a/.../java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastTests.java b/.../java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastTests.java
@@ -13,7 +13,6 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.xpack.esql.expression.function.AbstractFunctionTestCase;
 import org.elasticsearch.xpack.esql.expression.function.scalar.VaragsTestCaseBuilder;
-import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Least;
 import org.elasticsearch.xpack.ql.expression.Expression;
 import org.elasticsearch.xpack.ql.tree.Source;
 import org.elasticsearch.xpack.ql.type.DataTypes;