Handle merge

nik9000 · Aug 25, 2023 · 2cca00f · 2cca00f
1 parent 3856f15
commit 2cca00f
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 4 deletions.
diff --git a/docs/reference/esql/functions/types/acos.asciidoc b/docs/reference/esql/functions/types/acos.asciidoc
@@ -2,4 +2,7 @@
 |===
 arg1 | result
 double | double
+integer | double
+long | double
+unsigned_long | double
 |===
diff --git a/docs/reference/esql/functions/types/asin.asciidoc b/docs/reference/esql/functions/types/asin.asciidoc
@@ -2,4 +2,7 @@
 |===
 arg1 | result
 double | double
+integer | double
+long | double
+unsigned_long | double
 |===
diff --git a/docs/reference/esql/functions/types/atan.asciidoc b/docs/reference/esql/functions/types/atan.asciidoc
@@ -2,4 +2,7 @@
 |===
 arg1 | result
 double | double
+integer | double
+long | double
+unsigned_long | double
 |===
diff --git a/docs/reference/esql/functions/types/atan2.asciidoc b/docs/reference/esql/functions/types/atan2.asciidoc
@@ -2,4 +2,19 @@
 |===
 arg1 | arg2 | result
 double | double | double
+double | integer | double
+double | long | double
+double | unsigned_long | double
+integer | double | double
+integer | integer | double
+integer | long | double
+integer | unsigned_long | double
+long | double | double
+long | integer | double
+long | long | double
+long | unsigned_long | double
+unsigned_long | double | double
+unsigned_long | integer | double
+unsigned_long | long | double
+unsigned_long | unsigned_long | double
 |===
diff --git a/docs/reference/esql/functions/types/cos.asciidoc b/docs/reference/esql/functions/types/cos.asciidoc
@@ -2,4 +2,7 @@
 |===
 arg1 | result
 double | double
+integer | double
+long | double
+unsigned_long | double
 |===
diff --git a/docs/reference/esql/functions/types/cosh.asciidoc b/docs/reference/esql/functions/types/cosh.asciidoc
@@ -2,4 +2,7 @@
 |===
 arg1 | result
 double | double
+integer | double
+long | double
+unsigned_long | double
 |===
diff --git a/docs/reference/esql/functions/types/sin.asciidoc b/docs/reference/esql/functions/types/sin.asciidoc
@@ -2,4 +2,7 @@
 |===
 arg1 | result
 double | double
+integer | double
+long | double
+unsigned_long | double
 |===
diff --git a/docs/reference/esql/functions/types/sinh.asciidoc b/docs/reference/esql/functions/types/sinh.asciidoc
@@ -2,4 +2,7 @@
 |===
 arg1 | result
 double | double
+integer | double
+long | double
+unsigned_long | double
 |===
diff --git a/docs/reference/esql/functions/types/tan.asciidoc b/docs/reference/esql/functions/types/tan.asciidoc
@@ -2,4 +2,7 @@
 |===
 arg1 | result
 double | double
+integer | double
+long | double
+unsigned_long | double
 |===
diff --git a/docs/reference/esql/functions/types/tanh.asciidoc b/docs/reference/esql/functions/types/tanh.asciidoc
@@ -2,4 +2,7 @@
 |===
 arg1 | result
 double | double
+integer | double
+long | double
+unsigned_long | double
 |===
diff --git a/.../test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java b/.../test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java
@@ -18,17 +18,17 @@
 import org.elasticsearch.logging.LogManager;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xpack.esql.evaluator.EvalMapper;
-import org.elasticsearch.xpack.esql.plan.logical.show.ShowFunctions;
 import org.elasticsearch.xpack.esql.expression.function.scalar.conditional.Greatest;
 import org.elasticsearch.xpack.esql.expression.function.scalar.nulls.Coalesce;
 import org.elasticsearch.xpack.esql.optimizer.FoldNull;
+import org.elasticsearch.xpack.esql.plan.logical.show.ShowFunctions;
 import org.elasticsearch.xpack.esql.planner.Layout;
 import org.elasticsearch.xpack.esql.type.EsqlDataTypes;
 import org.elasticsearch.xpack.ql.expression.Expression;
 import org.elasticsearch.xpack.ql.expression.FieldAttribute;
 import org.elasticsearch.xpack.ql.expression.Literal;
-import org.elasticsearch.xpack.ql.expression.function.FunctionDefinition;
 import org.elasticsearch.xpack.ql.expression.TypeResolutions;
+import org.elasticsearch.xpack.ql.expression.function.FunctionDefinition;
 import org.elasticsearch.xpack.ql.tree.Source;
 import org.elasticsearch.xpack.ql.type.DataType;
 import org.elasticsearch.xpack.ql.type.DataTypes;
@@ -41,9 +41,9 @@
 import org.junit.BeforeClass;
 
 import java.io.IOException;
+import java.math.BigInteger;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.math.BigInteger;
 import java.time.Duration;
 import java.time.Period;
 import java.util.ArrayList;
@@ -635,7 +635,7 @@ protected static List<TestCaseSupplier> anyNullIsNull(boolean entirelyNullPreser
             }
         }
 
-    return suppliers;
+        return suppliers;
 
     }
 
@@ -805,6 +805,12 @@ public static void clearSignatures() {
 
     @After
     public void trackSignature() {
+        if (testCase.expectedTypeError != null) {
+            return;
+        }
+        if (testCase.getData().stream().anyMatch(t -> t.type == DataTypes.NULL)) {
+            return;
+        }
         signatures.putIfAbsent(testCase.getData().stream().map(TypedData::type).toList(), testCase.expectedType);
     }