Merge remote-tracking branch 'es/main' into source_mode_attr_noop

martijnvg · Jan 24, 2025 · a52cf3f · a52cf3f
2 parents 0d0ec31 + 8fc5a50
commit a52cf3f
Show file tree

Hide file tree

Showing 69 changed files with 2,988 additions and 483 deletions.
diff --git a/docs/changelog/120256.yaml b/docs/changelog/120256.yaml
@@ -0,0 +1,7 @@
+pr: 120256
+summary: Improve memory aspects of enrich cache
+area: Ingest Node
+type: enhancement
+issues:
+ - 96050
+ - 120021
diff --git a/docs/changelog/120645.yaml b/docs/changelog/120645.yaml
@@ -0,0 +1,6 @@
+pr: 120645
+summary: Esql Support date nanos on date diff function
+area: ES|QL
+type: enhancement
+issues:
+ - 109999
diff --git a/docs/changelog/120722.yaml b/docs/changelog/120722.yaml
@@ -0,0 +1,5 @@
+pr: 120722
+summary: Migrate stream to core error parsing
+area: Machine Learning
+type: enhancement
+issues: []
diff --git a/docs/reference/esql/functions/kibana/definition/date_diff.json b/docs/reference/esql/functions/kibana/definition/date_diff.json
diff --git a/docs/reference/esql/functions/types/date_diff.asciidoc b/docs/reference/esql/functions/types/date_diff.asciidoc
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -235,6 +235,12 @@ tests:
   issue: https://github.com/elastic/elasticsearch/issues/120668
 - class: org.elasticsearch.xpack.security.authc.ldap.ADLdapUserSearchSessionFactoryTests
   issue: https://github.com/elastic/elasticsearch/issues/119882
+- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncEnrichStopIT
+  method: testEnrichAfterStop
+  issue: https://github.com/elastic/elasticsearch/issues/120757
+- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryIT
+  method: testStopQuery
+  issue: https://github.com/elastic/elasticsearch/issues/120767
 
 # Examples:
 #

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
@@ -17,10 +17,8 @@ setup:
 
   - do:
       cluster.health:
-        index: .synonyms-2
-        timeout: 2s
+        index: .synonyms
         wait_for_status: green
-        ignore: 408
 
   - do:
       synonyms.get_synonym:
@@ -67,10 +65,8 @@ setup:
 
   - do:
       cluster.health:
-        index: .synonyms-2
-        timeout: 2s
+        index: .synonyms
         wait_for_status: green
-        ignore: 408
 
   - do:
       synonyms.get_synonym:

diff --git a/...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -14,10 +14,8 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        timeout: 2s
+        index: .synonyms
         wait_for_status: green
-        ignore: 408
 
   - do:
       indices.create:

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
@@ -17,10 +17,8 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        timeout: 2s
+        index: .synonyms
         wait_for_status: green
-        ignore: 408
 
 ---
 "Get synonyms set":

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
@@ -15,10 +15,8 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        timeout: 2s
+        index: .synonyms
         wait_for_status: green
-        ignore: 408
 
 ---
 "Delete synonyms set":

diff --git a/...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
@@ -13,10 +13,8 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        timeout: 2s
+        index: .synonyms
         wait_for_status: green
-        ignore: 408
 
   - do:
       synonyms.put_synonym:

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
@@ -17,10 +17,8 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        timeout: 2s
+        index: .synonyms
         wait_for_status: green
-        ignore: 408
 
 ---
 "Update a synonyms rule":

diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
@@ -17,10 +17,8 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        timeout: 2s
+        index: .synonyms
         wait_for_status: green
-        ignore: 408
 
 ---
 "Get a synonym rule":

diff --git a/...pi-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/...pi-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
@@ -17,10 +17,8 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        timeout: 2s
+        index: .synonyms
         wait_for_status: green
-        ignore: 408
 
 ---
 "Delete synonym rule":

diff --git a/...pi-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/...pi-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
@@ -16,10 +16,8 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        timeout: 2s
+        index: .synonyms
         wait_for_status: green
-        ignore: 408
 
   # Create an index with synonym_filter that uses that synonyms set
   - do:

diff --git a/...c/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml b/...c/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml
@@ -28,10 +28,8 @@ setup:
   # This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
   - do:
       cluster.health:
-        index: .synonyms-2
-        timeout: 2s
+        index: .synonyms
         wait_for_status: green
-        ignore: 408
 
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do:

diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -164,6 +164,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = def(8_830_00_0);
     public static final TransportVersion ADD_INCLUDE_FAILURE_INDICES_OPTION = def(8_831_00_0);
     public static final TransportVersion ESQL_RESPONSE_PARTIAL = def(8_832_00_0);
+    public static final TransportVersion RANK_DOC_OPTIONAL_METADATA_FOR_EXPLAIN = def(8_833_00_0);
 
     /*
      * STOP! READ THIS FIRST! No, really,

diff --git a/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
@@ -507,6 +507,7 @@ void executeRequest(
         });
 
         final SearchSourceBuilder source = original.source();
+        final boolean isExplain = source != null && source.explain() != null && source.explain();
         if (shouldOpenPIT(source)) {
             // disabling shard reordering for request
             original.setPreFilterShardSize(Integer.MAX_VALUE);
@@ -536,7 +537,12 @@ public void onFailure(Exception e) {
         } else {
             Rewriteable.rewriteAndFetch(
                 original,
-                searchService.getRewriteContext(timeProvider::absoluteStartMillis, resolvedIndices, original.pointInTimeBuilder()),
+                searchService.getRewriteContext(
+                    timeProvider::absoluteStartMillis,
+                    resolvedIndices,
+                    original.pointInTimeBuilder(),
+                    isExplain
+                ),
                 rewriteListener
             );
         }

diff --git a/server/src/main/java/org/elasticsearch/index/IndexService.java b/server/src/main/java/org/elasticsearch/index/IndexService.java
@@ -807,7 +807,8 @@ public QueryRewriteContext newQueryRewriteContext(
             scriptService,
             null,
             null,
-            null
+            null,
+            false
         );
     }
 

diff --git a/server/src/main/java/org/elasticsearch/index/query/CoordinatorRewriteContext.java b/server/src/main/java/org/elasticsearch/index/query/CoordinatorRewriteContext.java
@@ -105,7 +105,8 @@ public CoordinatorRewriteContext(
             null,
             null,
             null,
-            null
+            null,
+            false
         );
         this.dateFieldRangeInfo = dateFieldRangeInfo;
         this.tier = tier;
-Original file line number
+Diff line change
@@ Expand Up / @@ -807,7 +807,8 @@ public QueryRewriteContext newQueryRewriteContext( @@
                 scriptService,
                 null,
                 null,
-                null
+                null,
+                false
             );
         }
@@ Expand Down @@