Refinements

astefan · Sep 13, 2024 · 80f86fa · 80f86fa
1 parent f253412
commit 80f86fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/...t/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java b/...t/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java
@@ -28,7 +28,10 @@
 import java.util.Locale;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.randomLiteral;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.sameInstance;
@@ -38,7 +41,7 @@ public class CaseTests extends AbstractScalarFunctionTestCase {
 
     private static final List<DataType> TYPES;
     static {
-        List<DataType> t = List.of(
+        List<DataType> t = Stream.of(
             DataType.KEYWORD,
             DataType.TEXT,
             DataType.BOOLEAN,
@@ -54,11 +57,11 @@ public class CaseTests extends AbstractScalarFunctionTestCase {
             DataType.CARTESIAN_SHAPE,
             DataType.GEO_SHAPE,
             DataType.NULL
-        );
+        ).collect(Collectors.toList());
         if (Build.current().isSnapshot()) {
-            t.add(DataType.DATE_NANOS);
+            t.addAll(DataType.UNDER_CONSTRUCTION.keySet());
         }
-        TYPES = new ArrayList<>(t);
+        TYPES = unmodifiableList(t);
     }
 
     public CaseTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {

diff --git a/...ck/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/tree/EsqlNodeSubclassTests.java b/...ck/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/tree/EsqlNodeSubclassTests.java
@@ -9,6 +9,7 @@
 
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
+import org.elasticsearch.Build;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.core.PathUtils;
@@ -665,7 +666,10 @@ public static String randomGrokPattern() {
         );
     }
 
-    static List<DataType> DATA_TYPES = DataType.types().stream().toList();
+    static List<DataType> DATA_TYPES = DataType.types()
+        .stream()
+        .filter(d -> DataType.UNDER_CONSTRUCTION.containsKey(d) == false || Build.current().isSnapshot())
+        .toList();
 
     static EsQueryExec.FieldSort randomFieldSort() {
         return new EsQueryExec.FieldSort(