Skip LOOKUP/INLINESTATS cases unless on snapshot (elastic#111755)

Fix elastic#111753
alex-spies · Aug 9, 2024 · f0d06ee · f0d06ee
1 parent 4694a44
commit f0d06ee
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 31 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -125,9 +125,6 @@ tests:
 - class: org.elasticsearch.tdigest.ComparisonTests
   method: testSparseGaussianDistribution
   issue: https://github.com/elastic/elasticsearch/issues/111721
-- class: org.elasticsearch.xpack.esql.analysis.VerifierTests
-  method: testUnsupportedAndMultiTypedFields
-  issue: https://github.com/elastic/elasticsearch/issues/111753
 
 # Examples:
 #

diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java
@@ -138,15 +138,17 @@ public void testUnsupportedAndMultiTypedFields() {
                 + " [ip] in [test1, test2], [keyword] in [test3]",
             error("from test* | stats count(1) by multi_typed", analyzer)
         );
-        assertEquals(
-            "1:38: Cannot use field [unsupported] with unsupported type [flattened]",
-            error("from test* | inlinestats count(1) by unsupported", analyzer)
-        );
-        assertEquals(
-            "1:38: Cannot use field [multi_typed] due to ambiguities being mapped as [2] incompatible types:"
-                + " [ip] in [test1, test2], [keyword] in [test3]",
-            error("from test* | inlinestats count(1) by multi_typed", analyzer)
-        );
+        if (EsqlCapabilities.Cap.INLINESTATS.isEnabled()) {
+            assertEquals(
+                "1:38: Cannot use field [unsupported] with unsupported type [flattened]",
+                error("from test* | inlinestats count(1) by unsupported", analyzer)
+            );
+            assertEquals(
+                "1:38: Cannot use field [multi_typed] due to ambiguities being mapped as [2] incompatible types:"
+                    + " [ip] in [test1, test2], [keyword] in [test3]",
+                error("from test* | inlinestats count(1) by multi_typed", analyzer)
+            );
+        }
 
         assertEquals(
             "1:27: Cannot use field [unsupported] with unsupported type [flattened]",
@@ -157,15 +159,17 @@ public void testUnsupportedAndMultiTypedFields() {
                 + " [ip] in [test1, test2], [keyword] in [test3]",
             error("from test* | stats values(multi_typed)", analyzer)
         );
-        assertEquals(
-            "1:33: Cannot use field [unsupported] with unsupported type [flattened]",
-            error("from test* | inlinestats values(unsupported)", analyzer)
-        );
-        assertEquals(
-            "1:33: Cannot use field [multi_typed] due to ambiguities being mapped as [2] incompatible types:"
-                + " [ip] in [test1, test2], [keyword] in [test3]",
-            error("from test* | inlinestats values(multi_typed)", analyzer)
-        );
+        if (EsqlCapabilities.Cap.INLINESTATS.isEnabled()) {
+            assertEquals(
+                "1:33: Cannot use field [unsupported] with unsupported type [flattened]",
+                error("from test* | inlinestats values(unsupported)", analyzer)
+            );
+            assertEquals(
+                "1:33: Cannot use field [multi_typed] due to ambiguities being mapped as [2] incompatible types:"
+                    + " [ip] in [test1, test2], [keyword] in [test3]",
+                error("from test* | inlinestats values(multi_typed)", analyzer)
+            );
+        }
 
         assertEquals(
             "1:27: Cannot use field [unsupported] with unsupported type [flattened]",
@@ -177,16 +181,18 @@ public void testUnsupportedAndMultiTypedFields() {
             error("from test* | stats values(multi_typed)", analyzer)
         );
 
-        // LOOKUP with unsupported type
-        assertEquals(
-            "1:41: column type mismatch, table column was [integer] and original column was [unsupported]",
-            error("from test* | lookup int_number_names on int", analyzer)
-        );
-        // LOOKUP with multi-typed field
-        assertEquals(
-            "1:44: column type mismatch, table column was [double] and original column was [unsupported]",
-            error("from test* | lookup double_number_names on double", analyzer)
-        );
+        if (EsqlCapabilities.Cap.LOOKUP_V4.isEnabled()) {
+            // LOOKUP with unsupported type
+            assertEquals(
+                "1:41: column type mismatch, table column was [integer] and original column was [unsupported]",
+                error("from test* | lookup int_number_names on int", analyzer)
+            );
+            // LOOKUP with multi-typed field
+            assertEquals(
+                "1:44: column type mismatch, table column was [double] and original column was [unsupported]",
+                error("from test* | lookup double_number_names on double", analyzer)
+            );
+        }
 
         assertEquals(
             "1:24: Cannot use field [unsupported] with unsupported type [flattened]",