Merge branch 'main' into enhancement/esql-match-disjunction-restrictions

carlosdelest · Dec 17, 2024 · 1cd80aa · 1cd80aa
2 parents 317f7d8 + e0763c2
commit 1cd80aa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -302,8 +302,6 @@ tests:
 - class: org.elasticsearch.xpack.security.QueryableReservedRolesIT
   method: testDeletingAndCreatingSecurityIndexTriggersSynchronization
   issue: https://github.com/elastic/elasticsearch/issues/118806
-- class: org.elasticsearch.xpack.esql.session.IndexResolverFieldNamesTests
-  issue: https://github.com/elastic/elasticsearch/issues/118814
 - class: org.elasticsearch.index.engine.RecoverySourcePruneMergePolicyTests
   method: testPruneSome
   issue: https://github.com/elastic/elasticsearch/issues/118728

diff --git a/...esql/src/test/java/org/elasticsearch/xpack/esql/session/IndexResolverFieldNamesTests.java b/...esql/src/test/java/org/elasticsearch/xpack/esql/session/IndexResolverFieldNamesTests.java
@@ -9,6 +9,7 @@
 
 import org.elasticsearch.Build;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
 import org.elasticsearch.xpack.esql.parser.EsqlParser;
 import org.elasticsearch.xpack.esql.parser.ParsingException;
 
@@ -1364,6 +1365,7 @@ public void testMetrics() {
     }
 
     public void testLookupJoin() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             "FROM employees | KEEP languages | RENAME languages AS language_code | LOOKUP JOIN languages_lookup ON language_code",
             Set.of("languages", "languages.*", "language_code", "language_code.*"),
@@ -1372,6 +1374,7 @@ public void testLookupJoin() {
     }
 
     public void testLookupJoinKeep() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             """
                 FROM employees
@@ -1385,6 +1388,7 @@ public void testLookupJoinKeep() {
     }
 
     public void testLookupJoinKeepWildcard() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             """
                 FROM employees
@@ -1398,6 +1402,7 @@ public void testLookupJoinKeepWildcard() {
     }
 
     public void testMultiLookupJoin() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             """
                 FROM sample_data
@@ -1410,6 +1415,7 @@ public void testMultiLookupJoin() {
     }
 
     public void testMultiLookupJoinKeepBefore() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             """
                 FROM sample_data
@@ -1423,6 +1429,7 @@ public void testMultiLookupJoinKeepBefore() {
     }
 
     public void testMultiLookupJoinKeepBetween() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             """
                 FROM sample_data
@@ -1447,6 +1454,7 @@ public void testMultiLookupJoinKeepBetween() {
     }
 
     public void testMultiLookupJoinKeepAfter() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             """
                 FROM sample_data
@@ -1473,6 +1481,7 @@ public void testMultiLookupJoinKeepAfter() {
     }
 
     public void testMultiLookupJoinKeepAfterWildcard() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             """
                 FROM sample_data
@@ -1486,6 +1495,7 @@ public void testMultiLookupJoinKeepAfterWildcard() {
     }
 
     public void testMultiLookupJoinSameIndex() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             """
                 FROM sample_data
@@ -1499,6 +1509,7 @@ public void testMultiLookupJoinSameIndex() {
     }
 
     public void testMultiLookupJoinSameIndexKeepBefore() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             """
                 FROM sample_data
@@ -1513,6 +1524,7 @@ public void testMultiLookupJoinSameIndexKeepBefore() {
     }
 
     public void testMultiLookupJoinSameIndexKeepBetween() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             """
                 FROM sample_data
@@ -1538,6 +1550,7 @@ public void testMultiLookupJoinSameIndexKeepBetween() {
     }
 
     public void testMultiLookupJoinSameIndexKeepAfter() {
+        assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
         assertFieldNames(
             """
                 FROM sample_data

diff --git a/x-pack/plugin/sql/qa/server/src/main/resources/docs/docs.csv-spec b/x-pack/plugin/sql/qa/server/src/main/resources/docs/docs.csv-spec
@@ -3353,7 +3353,7 @@ Alejandro
 Amabile
 Anoosh
 Basil
-Bojan
+Brendon
 // end::filterToday
 ;
-Original file line number
+Diff line change
@@ Expand Up / @@ -3353,7 +3353,7 @@ Alejandro @@
     Amabile
     Anoosh
     Basil
-    Bojan
+    Brendon
     // end::filterToday
     ;
@@ Expand Down @@