Merge branch 'main' into fix/fetch-phase-breaker-lifecycle

Author: drempapis

docs/changelog/138139.yaml

@@ -3,3 +3,21 @@ summary: Support window function in time-series aggregations
 area: ES|QL
 type: enhancement
 issues: []
+highlight:
+  title: Evaluate time series aggregation functions over sliding windows
+  body: |-
+    Time series aggregations in ES|QL can be optionally calculated over a sliding time window. Using a window
+    larger than the time bucket interval reduces jitter in dashboards, by taking a larger number of data points into
+    account.
+
+    Windows can be specified in all supported time series aggregations, as a second argument. For instance, the
+    following ES|QL query calculates the average rate of requests per host every minute, using a 10-minute window:
+
+    TS metrics
+    | WHERE TRANGE(1h)
+    | STATS avg(rate(requests, 10m)) BY TBUCKET(1m), host
+
+    Acceptable window values are currently limited to multiples of the time bucket value (e.g. `BUCKET` or `TBUCKET`),
+    as specified in the BY-clause. If no window is provided, it's implicitly set to the time bucket value,
+    matching existing behavior.
+  notable: true

docs/changelog/138583.yaml

@@ -0,0 +1,5 @@
+pr: 138583
+summary: "Fix: Correctly pickup MRT value for `msearch`'s search requests"
+area: CCS
+type: bug
+issues: []

docs/changelog/139460.yaml

@@ -0,0 +1,5 @@
+pr: 139460
+summary: "Fix: IPv6 address parsing with non-zero offset in `InetAddresses`"
+area: Mapping
+type: bug
+issues: []

docs/release-notes/breaking-changes.md

@@ -12,6 +12,12 @@ If you are migrating from a version prior to version 9.0, you must first upgrade
 
 % ## Next version [elasticsearch-nextversion-breaking-changes]
 
+## 9.1.9 [elasticsearch-9.1.9-breaking-changes]
+```{applies_to}
+stack: ga 9.1.9
+```
+
+There are no breaking changes associated with this release.
 
 ## 9.2.2 [elasticsearch-9.2.2-breaking-changes]
 

docs/release-notes/changelog-bundles/9.1.9.yml

@@ -0,0 +1,51 @@
+version: 9.1.9
+released: false
+generated: 2025-12-13T00:13:16.356358962Z
+changelogs:
+  - pr: 137558
+    summary: Improve security migration resilience by handling version conflicts
+    area: Security
+    type: enhancement
+    issues: []
+  - pr: 138115
+    summary: GET /_migration/deprecations doesn't check disk watermarks against correct settings values
+    area: Infra/Core
+    type: bug
+    issues:
+      - 137005
+  - pr: 138624
+    summary: Handle individual doc parsing failure in bulk request with pipeline
+    area: Ingest Node
+    type: bug
+    issues:
+      - 138445
+  - pr: 138632
+    summary: Correctly handle empty inputs in `chunkedInfer()`
+    area: Machine Learning
+    type: bug
+    issues: []
+  - pr: 138806
+    summary: Bump lz4 dependency
+    area: Infra/Core
+    type: upgrade
+    issues: []
+  - pr: 138854
+    summary: Upgrade ECS logging layout
+    area: Infra/Logging
+    type: upgrade
+    issues: []
+  - pr: 138869
+    summary: Fix multi fields in downsampling
+    area: Downsampling
+    type: bug
+    issues: []
+  - pr: 139028
+    summary: More reliable trigger for security index migration
+    area: Security
+    type: bug
+    issues: []
+  - pr: 139080
+    summary: "[ES|QL] Compare query builders using identity"
+    area: ES|QL
+    type: bug
+    issues: []

docs/release-notes/deprecations.md

@@ -16,6 +16,12 @@ To give you insight into what deprecated features you’re using, {{es}}:
 
 % ## Next version [elasticsearch-nextversion-deprecations]
 
+## 9.1.9 [elasticsearch-9.1.9-deprecations]
+```{applies_to}
+stack: ga 9.1.9
+```
+
+There are no deprecations associated with this release.
 
 ## 9.2.2 [elasticsearch-9.2.2-deprecations]
 

docs/release-notes/index.md

@@ -20,6 +20,45 @@ To check for security updates, go to [Security announcements for the Elastic sta
 % ### Fixes [elasticsearch-next-fixes]
 % *
 
+## 9.1.9 [elasticsearch-9.1.9-release-notes]
+```{applies_to}
+stack: ga 9.1.9
+```
+
+### Features and enhancements [elasticsearch-9.1.9-features-enhancements]
+
+Infra/Core:
+* Bump lz4 dependency [#138806](https://github.com/elastic/elasticsearch/pull/138806)
+
+Infra/Logging:
+* Upgrade ECS logging layout [#138854](https://github.com/elastic/elasticsearch/pull/138854)
+
+Security:
+* Improve security migration resilience by handling version conflicts [#137558](https://github.com/elastic/elasticsearch/pull/137558)
+
+
+### Fixes [elasticsearch-9.1.9-fixes]
+
+Downsampling:
+* Fix multi fields in downsampling [#138869](https://github.com/elastic/elasticsearch/pull/138869)
+
+ES|QL:
+* [ES|QL] Compare query builders using identity [#139080](https://github.com/elastic/elasticsearch/pull/139080)
+
+Infra/Core:
+* GET /_migration/deprecations doesn't check disk watermarks against correct settings values [#138115](https://github.com/elastic/elasticsearch/pull/138115) (issue: [#137005](https://github.com/elastic/elasticsearch/issues/137005))
+
+Ingest Node:
+* Handle individual doc parsing failure in bulk request with pipeline [#138624](https://github.com/elastic/elasticsearch/pull/138624) (issue: [#138445](https://github.com/elastic/elasticsearch/issues/138445))
+
+Machine Learning:
+* Correctly handle empty inputs in `chunkedInfer()` [#138632](https://github.com/elastic/elasticsearch/pull/138632)
+
+Security:
+* More reliable trigger for security index migration [#139028](https://github.com/elastic/elasticsearch/pull/139028)
+
+
+
 ## 9.2.2 [elasticsearch-9.2.2-release-notes]
 
 ### Features and enhancements [elasticsearch-9.2.2-features-enhancements]
@@ -114,6 +153,8 @@ Vector Search:
 * Update to Lucene 10.3.2 [#138230](https://github.com/elastic/elasticsearch/pull/138230) (issue: [#135718](https://github.com/elastic/elasticsearch/issues/135718))
 * [Vector Search] Fix  wrong vector docvalue_fields [#137862](https://github.com/elastic/elasticsearch/pull/137862)
 
+
+
 ## 9.1.8 [elasticsearch-9.1.8-release-notes]
 
 ### Features and enhancements [elasticsearch-9.1.8-features-enhancements]

server/src/internalClusterTest/java/org/elasticsearch/search/msearch/MultiSearchIT.java

@@ -12,13 +12,24 @@
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.action.search.MultiSearchRequest;
 import org.elasticsearch.action.search.MultiSearchResponse.Item;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.action.search.RestMultiSearchAction;
 import org.elasticsearch.search.DummyQueryBuilder;
 import org.elasticsearch.search.SearchService;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.TransportVersionUtils;
+import org.elasticsearch.test.rest.FakeRestRequest;
+import org.elasticsearch.usage.UsageService;
 import org.elasticsearch.xcontent.XContentType;
+import org.hamcrest.Matchers;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFirstHit;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
@@ -119,4 +130,90 @@ public TransportVersion getMinimalSupportedVersion() {
             }
         );
     }
+
+    public void testMrtValuesArePickedCorrectly() throws IOException {
+
+        {
+            // If no MRT is specified, all searches should default to true.
+            String body = """
+                {"index": "index-1" }
+                {"query" : {"match" : { "message": "this is a test"}}}
+                {"index": "index-2" }
+                {"query" : {"match_all" : {}}}
+                """;
+
+            MultiSearchRequest mreq = parseRequest(body, Map.of());
+            for (SearchRequest req : mreq.requests()) {
+                assertTrue(req.isCcsMinimizeRoundtrips());
+            }
+        }
+
+        {
+            // MRT query param is false, so all searches should use this value.
+            String body = """
+                {"index": "index-1" }
+                {"query" : {"match" : { "message": "this is a test"}}}
+                {"index": "index-2" }
+                {"query" : {"match_all" : {}}}
+                """;
+
+            MultiSearchRequest mreq = parseRequest(body, Map.of("ccs_minimize_roundtrips", "false"));
+            for (SearchRequest req : mreq.requests()) {
+                assertFalse(req.isCcsMinimizeRoundtrips());
+            }
+        }
+
+        {
+            // Query param is absent but MRT is specified for each request.
+            String body = """
+                {"index": "index-1", "ccs_minimize_roundtrips": false }
+                {"query" : {"match" : { "message": "this is a test"}}}
+                {"index": "index-2", "ccs_minimize_roundtrips": false }
+                {"query" : {"match_all" : {}}}
+                """;
+
+            MultiSearchRequest mreq = parseRequest(body, Map.of());
+            for (SearchRequest req : mreq.requests()) {
+                assertFalse(req.isCcsMinimizeRoundtrips());
+            }
+        }
+
+        {
+            /*
+             * The first request overrides the query param and should use MRT=true.
+             * The second request should use the query param value.
+             */
+            String body = """
+                {"index": "index-1", "ccs_minimize_roundtrips": true }
+                {"query" : {"match" : { "message": "this is a test"}}}
+                {"index": "index-2" }
+                {"query" : {"match_all" : {}}}
+                """;
+
+            MultiSearchRequest mreq = parseRequest(body, Map.of("ccs_minimize_roundtrips", "false"));
+
+            assertThat(mreq.requests().size(), Matchers.is(2));
+            assertTrue(mreq.requests().getFirst().isCcsMinimizeRoundtrips());
+            assertFalse(mreq.requests().getLast().isCcsMinimizeRoundtrips());
+        }
+    }
+
+    private RestRequest mkRequest(String body, Map<String, String> params) {
+        return new FakeRestRequest.Builder(xContentRegistry()).withMethod(RestRequest.Method.POST)
+            .withPath("/index*/_msearch")
+            .withParams(params)
+            .withContent(new BytesArray(body), XContentType.JSON)
+            .build();
+    }
+
+    private MultiSearchRequest parseRequest(String body, Map<String, String> params) throws IOException {
+        return RestMultiSearchAction.parseRequest(
+            mkRequest(body, params),
+            true,
+            new UsageService().getSearchUsageHolder(),
+            (ignored) -> true,
+            // Disable CPS for these tests.
+            Optional.of(false)
+        );
+    }
 }

server/src/main/java/org/elasticsearch/common/network/InetAddresses.java

@@ -206,14 +206,14 @@ private static byte[] textToNumericFormatV6(byte[] ipUtf8, int offset, int lengt
         // Find position of :: abbreviation if present
         int compressedHextetIndex = -1;
         int hextetIndex = 0;
-        int currentHextetStart = 0;
+        int currentHextetStart = offset;
         int currentHextet = 0;
         for (int i = offset; i < offset + length; i++) {
             byte c = ipUtf8[i];
             if (c == ':') {
                 if (currentHextetStart == i) {
                     // Two colons in a row, indicating a compressed section
-                    if (compressedHextetIndex >= 0 && i != 1) {
+                    if (compressedHextetIndex >= 0 && i != offset + 1) {
                         // We've already seen a ::, can't have another
                         return null;
                     }

server/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java

@@ -197,7 +197,7 @@ public SortField sortField(
             return rewrittenSortField;
         }
 
-        SortField rewrittenSortField = new SortField(sortField.getField(), SortField.Type.LONG, reverse);
+        SortField rewrittenSortField = new SortedNumericSortField(sortField.getField(), SortField.Type.LONG, reverse);
         rewrittenSortField.setMissingValue(longSource.missingObject(missingValue, reverse));
         // we don't optimize sorting on int field for old indices
         rewrittenSortField.setOptimizeSortWithPoints(false);