Fix bwc + more tests

Author: luigidellaquila

x-pack/plugin/build.gradle

@@ -133,6 +133,7 @@ tasks.named("yamlRestCompatTestTransform").configure({ task ->
   task.replaceValueInMatch("Size", 49, "Test flamegraph from test-events")
   task.skipTest("esql/90_non_indexed/fetch", "Temporary until backported")
   task.skipTest("esql/63_enrich_int_range/Invalid age as double", "TODO: require disable allow_partial_results")
+  task.skipTest("esql/191_lookup_join_on_datastreams/data streams not supported in LOOKUP JOIN", "Added support for aliases in JOINs")
 })
 
 tasks.named('yamlRestCompatTest').configure {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

@@ -1128,7 +1128,12 @@ public enum Cap {
         /**
          * Dense vector field type support
          */
-        DENSE_VECTOR_FIELD_TYPE(EsqlCorePlugin.DENSE_VECTOR_FEATURE_FLAG);
+        DENSE_VECTOR_FIELD_TYPE(EsqlCorePlugin.DENSE_VECTOR_FEATURE_FLAG),
+
+        /**
+         * Enable support for index aliases in lookup joins
+         */
+        ENABLE_LOOKUP_JOIN_ON_ALIASES(JOIN_LOOKUP_V12.isEnabled());
 
         private final boolean enabled;
 

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/LookupFromIndexService.java

@@ -190,12 +190,12 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeString(sessionId);
             out.writeWriteable(shardId);
 
-            if (indexPattern.equals(shardId.getIndexName()) == false
-                && out.getTransportVersion().before(TransportVersions.JOIN_ON_ALIASES)) {
+            if (out.getTransportVersion().onOrAfter(TransportVersions.JOIN_ON_ALIASES)) {
+                out.writeString(indexPattern);
+            } else if (indexPattern.equals(shardId.getIndexName()) == false) {
                 // TODO can we throw exceptions here?
                 throw new VerificationException("Aliases and index patterns are not allowed for LOOKUP JOIN []", indexPattern);
             }
-            out.writeString(indexPattern);
 
             out.writeString(inputDataType.typeName());
             out.writeWriteable(inputPage);

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/190_lookup_join.yml

@@ -6,7 +6,7 @@ setup:
         - method: POST
           path: /_query
           parameters: []
-          capabilities: [join_lookup_v12, join_lookup_skip_mv_warnings]
+          capabilities: [join_lookup_v12, enable_lookup_join_on_aliases]
       reason: "uses LOOKUP JOIN"
   - do:
       indices.create:
@@ -187,8 +187,6 @@ non-lookup index:
 
 ---
 alias-repeated-alias:
-  - skip:
-      awaits_fix: "LOOKUP JOIN does not support index aliases for now"
   - do:
       esql.query:
         body:
@@ -203,8 +201,6 @@ alias-repeated-alias:
 
 ---
 alias-repeated-index:
-  - skip:
-      awaits_fix: "LOOKUP JOIN does not support index aliases for now"
   - do:
       esql.query:
         body:
@@ -219,21 +215,17 @@ alias-repeated-index:
 
 ---
 alias-pattern-multiple:
-  - skip:
-      awaits_fix: "LOOKUP JOIN does not support index aliases for now"
   - do:
       esql.query:
         body:
           query: 'FROM test-lookup-1 | LOOKUP JOIN test-lookup-alias-pattern-multiple ON key'
       catch: "bad_request"
 
   - match: { error.type: "verification_exception" }
-  - contains: { error.reason: "Found 1 problem\nline 1:34: invalid [test-lookup-alias-pattern-multiple] resolution in lookup mode to [2] indices" }
+  - contains: { error.reason: "Found 1 problem\nline 1:34: invalid [test-lookup-alias-pattern-multiple] resolution in lookup mode to [4] indices" }
 
 ---
 alias-pattern-single:
-  - skip:
-      awaits_fix: "LOOKUP JOIN does not support index aliases for now"
   - do:
       esql.query:
         body:

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/191_lookup_join_on_datastreams.yml

@@ -6,7 +6,7 @@ setup:
         - method: POST
           path: /_query
           parameters: []
-          capabilities: [lookup_join_no_aliases]
+          capabilities: [enable_lookup_join_on_aliases]
       reason: "uses LOOKUP JOIN"
 
   - do:
@@ -30,6 +30,8 @@ setup:
                    type: date
                 x:
                   type: keyword
+                y:
+                  type: keyword
 
   - do:
       indices.put_index_template:
@@ -40,29 +42,33 @@ setup:
           composed_of: [ "my_mappings", "my_settings" ]
           priority: 500
 
+  - do:
+      indices.create_data_stream:
+        name: my_data_stream
 
   - do:
-      bulk:
-        index: "my_data_stream"
-        refresh: true
+      index:
+        index:  my_data_stream
         body:
-          - { "index": { } }
-          - { "x": "foo", "y": "y1" }
-          - { "index": { } }
-          - { "x": "bar", "y": "y2" }
-
-
+          '@timestamp': '2020-12-12'
+          'x': 'foo'
+          'y': 'y1'
 
+  - do:
+      indices.refresh:
+        index: my_data_stream
 ---
-"data streams not supported in LOOKUP JOIN":
+"data streams supported in LOOKUP JOIN":
   - do:
       esql.query:
         body:
-          query: 'row x = "foo" | LOOKUP JOIN my_data_stream ON x'
-      catch: "bad_request"
+          query: 'ROW x = "foo" | LOOKUP JOIN my_data_stream ON x | KEEP x, y | LIMIT 1'
 
-  - match: { error.type: "verification_exception" }
-  - contains: { error.reason: "Found 1 problem\nline 1:17: Aliases and index patterns are not allowed for LOOKUP JOIN [my_data_stream]" }
+  - match: {columns.0.name: "x"}
+  - match: {columns.0.type: "keyword"}
+  - match: {columns.1.name: "y"}
+  - match: {columns.1.type: "keyword"}
+  - match: {values.0: ["foo", "y1"]}