Skip to content

Commit bf4d992

Browse files
committed
Merge remote-tracking branch 'origin/8.x' into backport/8.x/pr-113194
2 parents 93ae064 + e51dc09 commit bf4d992

File tree

79 files changed

+1201
-308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1201
-308
lines changed

benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/MapperServiceFactory.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.benchmark.index.mapper;
1111

1212
import org.apache.lucene.analysis.standard.StandardAnalyzer;
13-
import org.apache.lucene.util.Accountable;
1413
import org.elasticsearch.TransportVersion;
1514
import org.elasticsearch.cluster.ClusterModule;
1615
import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -28,7 +27,6 @@
2827
import org.elasticsearch.index.mapper.MapperRegistry;
2928
import org.elasticsearch.index.mapper.MapperService;
3029
import org.elasticsearch.index.mapper.ProvidedIdFieldMapper;
31-
import org.elasticsearch.index.shard.ShardId;
3230
import org.elasticsearch.index.similarity.SimilarityService;
3331
import org.elasticsearch.indices.IndicesModule;
3432
import org.elasticsearch.script.Script;
@@ -56,13 +54,7 @@ public static MapperService create(String mappings) {
5654
MapperRegistry mapperRegistry = new IndicesModule(Collections.emptyList()).getMapperRegistry();
5755

5856
SimilarityService similarityService = new SimilarityService(indexSettings, null, Map.of());
59-
BitsetFilterCache bitsetFilterCache = new BitsetFilterCache(indexSettings, new BitsetFilterCache.Listener() {
60-
@Override
61-
public void onCache(ShardId shardId, Accountable accountable) {}
62-
63-
@Override
64-
public void onRemoval(ShardId shardId, Accountable accountable) {}
65-
});
57+
BitsetFilterCache bitsetFilterCache = new BitsetFilterCache(indexSettings, BitsetFilterCache.Listener.NOOP);
6658
MapperService mapperService = new MapperService(
6759
() -> TransportVersion.current(),
6860
indexSettings,

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ log4j = 2.19.0
1414
slf4j = 2.0.6
1515
ecsLogging = 1.2.0
1616
jna = 5.12.1
17-
netty = 4.1.109.Final
17+
netty = 4.1.115.Final
1818
commons_lang3 = 3.9
1919
google_oauth_client = 1.34.1
2020

docs/changelog/115687.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 115687
2+
summary: Add default ILM policies and switch to ILM for apm-data plugin
3+
area: Data streams
4+
type: feature
5+
issues: []

docs/changelog/115814.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 115814
2+
summary: "[ES|QL] Implicit casting string literal to intervals"
3+
area: ES|QL
4+
type: enhancement
5+
issues:
6+
- 115352

docs/reference/esql/implicit-casting.asciidoc

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<titleabbrev>Implicit casting</titleabbrev>
66
++++
77

8-
Often users will input `datetime`, `ip`, `version`, or geospatial objects as simple strings in their queries for use in predicates, functions, or expressions. {esql} provides <<esql-type-conversion-functions, type conversion functions>> to explicitly convert these strings into the desired data types.
8+
Often users will input `date`, `ip`, `version`, `date_period` or `time_duration` as simple strings in their queries for use in predicates, functions, or expressions. {esql} provides <<esql-type-conversion-functions, type conversion functions>> to explicitly convert these strings into the desired data types.
99

1010
Without implicit casting users must explicitly code these `to_X` functions in their queries, when string literals don't match the target data types they are assigned or compared to. Here is an example of using `to_datetime` to explicitly perform a data type conversion.
1111

@@ -18,7 +18,7 @@ FROM employees
1818
| LIMIT 1
1919
----
2020

21-
Implicit casting improves usability, by automatically converting string literals to the target data type. This is most useful when the target data type is `datetime`, `ip`, `version` or a geo spatial. It is natural to specify these as a string in queries.
21+
Implicit casting improves usability, by automatically converting string literals to the target data type. This is most useful when the target data type is `date`, `ip`, `version`, `date_period` or `time_duration`. It is natural to specify these as a string in queries.
2222

2323
The first query can be coded without calling the `to_datetime` function, as follows:
2424

@@ -38,16 +38,28 @@ The following table details which {esql} operations support implicit casting for
3838

3939
[%header.monospaced.styled,format=dsv,separator=|]
4040
|===
41-
||ScalarFunction|BinaryComparison|ArithmeticOperation|InListPredicate|AggregateFunction
42-
|DATETIME|Y|Y|Y|Y|N
43-
|DOUBLE|Y|N|N|N|N
44-
|LONG|Y|N|N|N|N
45-
|INTEGER|Y|N|N|N|N
46-
|IP|Y|Y|Y|Y|N
47-
|VERSION|Y|Y|Y|Y|N
48-
|GEO_POINT|Y|N|N|N|N
49-
|GEO_SHAPE|Y|N|N|N|N
50-
|CARTESIAN_POINT|Y|N|N|N|N
51-
|CARTESIAN_SHAPE|Y|N|N|N|N
52-
|BOOLEAN|Y|Y|Y|Y|N
41+
||ScalarFunction*|Operator*|<<esql-group-functions, GroupingFunction>>|<<esql-agg-functions, AggregateFunction>>
42+
|DATE|Y|Y|Y|N
43+
|IP|Y|Y|Y|N
44+
|VERSION|Y|Y|Y|N
45+
|BOOLEAN|Y|Y|Y|N
46+
|DATE_PERIOD/TIME_DURATION|Y|N|Y|N
5347
|===
48+
49+
ScalarFunction* includes:
50+
51+
<<esql-conditional-functions-and-expressions, Conditional Functions and Expressions>>
52+
53+
<<esql-date-time-functions, Date and Time Functions>>
54+
55+
<<esql-ip-functions, IP Functions>>
56+
57+
58+
Operator* includes:
59+
60+
<<esql-binary-operators, Binary Operators>>
61+
62+
<<esql-unary-operators, Unary Operator>>
63+
64+
<<esql-in-operator, IN>>
65+

docs/reference/troubleshooting/common-issues/disk-usage-exceeded.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ As a long-term solution, we recommend you do one of the following best suited
106106
to your use case:
107107

108108
* add nodes to the affected <<data-tiers,data tiers>>
109+
+
110+
TIP: You should enable <<xpack-autoscaling,autoscaling>> for clusters deployed using our {ess}, {ece}, and {eck} platforms.
109111

110112
* upgrade existing nodes to increase disk space
111113
+

gradle/verification-metadata.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,109 +1361,109 @@
13611361
<sha256 value="a3ebec96768ee4a2d3db44597e84cea2d0bdd68ca04822397980ea9f67075a86" origin="Generated by Gradle"/>
13621362
</artifact>
13631363
</component>
1364-
<component group="io.netty" name="netty-buffer" version="4.1.109.Final">
1365-
<artifact name="netty-buffer-4.1.109.Final.jar">
1366-
<sha256 value="ed49956c1e5d99534af2e9e9ecb80f4d3390c631c6cedd2a94d23aedcc911bb9" origin="Generated by Gradle"/>
1364+
<component group="io.netty" name="netty-buffer" version="4.1.115.Final">
1365+
<artifact name="netty-buffer-4.1.115.Final.jar">
1366+
<sha256 value="4a7b331d3770c566ab70eb02a0d1feed63b95cf6e4d68c8fe778c4c9de2d116d" origin="Generated by Gradle"/>
13671367
</artifact>
13681368
</component>
13691369
<component group="io.netty" name="netty-buffer" version="4.1.42.Final">
13701370
<artifact name="netty-buffer-4.1.42.Final.jar">
13711371
<sha256 value="7b0171a4e8bcd573e08d9f2bba053c67b557ab5012106a5982ccbae5743814c0" origin="Generated by Gradle"/>
13721372
</artifact>
13731373
</component>
1374-
<component group="io.netty" name="netty-codec" version="4.1.109.Final">
1375-
<artifact name="netty-codec-4.1.109.Final.jar">
1376-
<sha256 value="2df943cd3ed24f86d61d442314e8a9a4c06b85a9a7aa99cec8c6520e77ff3f1c" origin="Generated by Gradle"/>
1374+
<component group="io.netty" name="netty-codec" version="4.1.115.Final">
1375+
<artifact name="netty-codec-4.1.115.Final.jar">
1376+
<sha256 value="cd189afb70ec6eacfcdfdd3a5f472b4e705a5c91d5bd3ef0386421f2ae15ec77" origin="Generated by Gradle"/>
13771377
</artifact>
13781378
</component>
13791379
<component group="io.netty" name="netty-codec" version="4.1.42.Final">
13801380
<artifact name="netty-codec-4.1.42.Final.jar">
13811381
<sha256 value="e96ced697fb7df589da7c20c995e01f75a9cb246be242bbc4cd3b4af424ff189" origin="Generated by Gradle"/>
13821382
</artifact>
13831383
</component>
1384-
<component group="io.netty" name="netty-codec-dns" version="4.1.109.Final">
1385-
<artifact name="netty-codec-dns-4.1.109.Final.jar">
1386-
<sha256 value="a67a84c0a46094815e2044ac1314d8d81089d219ec8e8c732f9a12ba4cd451bd" origin="Generated by Gradle"/>
1384+
<component group="io.netty" name="netty-codec-dns" version="4.1.115.Final">
1385+
<artifact name="netty-codec-dns-4.1.115.Final.jar">
1386+
<sha256 value="23dd6806bcc326855f13e69838c6411d0490e6b1aeb12e217a19a3dd6ad3f10d" origin="Generated by Gradle"/>
13871387
</artifact>
13881388
</component>
1389-
<component group="io.netty" name="netty-codec-http" version="4.1.109.Final">
1390-
<artifact name="netty-codec-http-4.1.109.Final.jar">
1391-
<sha256 value="fdf056b08e156797d8f6caa727af0370dea8265b1eff8fc6f9e739c5c1f093d1" origin="Generated by Gradle"/>
1389+
<component group="io.netty" name="netty-codec-http" version="4.1.115.Final">
1390+
<artifact name="netty-codec-http-4.1.115.Final.jar">
1391+
<sha256 value="e6dbe971c59373bbae9802021c63b9bc1d8800fead382863d67e79e79b023166" origin="Generated by Gradle"/>
13921392
</artifact>
13931393
</component>
1394-
<component group="io.netty" name="netty-codec-http2" version="4.1.109.Final">
1395-
<artifact name="netty-codec-http2-4.1.109.Final.jar">
1396-
<sha256 value="a75498995087968b4582aefe42cfa8ca257759f32279edbec3c874e54acf633c" origin="Generated by Gradle"/>
1394+
<component group="io.netty" name="netty-codec-http2" version="4.1.115.Final">
1395+
<artifact name="netty-codec-http2-4.1.115.Final.jar">
1396+
<sha256 value="cbed9829a5d582e91e314e209edce9a0c2eb369f23bb4fb74a5bc8b7990222c2" origin="Generated by Gradle"/>
13971397
</artifact>
13981398
</component>
1399-
<component group="io.netty" name="netty-codec-socks" version="4.1.109.Final">
1400-
<artifact name="netty-codec-socks-4.1.109.Final.jar">
1401-
<sha256 value="a8b2c52807e4071f8fdd6239b8fd0c4d2cd282ebf08406f8d431d3229b69418e" origin="Generated by Gradle"/>
1399+
<component group="io.netty" name="netty-codec-socks" version="4.1.115.Final">
1400+
<artifact name="netty-codec-socks-4.1.115.Final.jar">
1401+
<sha256 value="e9b1cc744dc6195894450b1fd4d271a821ab167fe21ae3c459b27cdadc70e81f" origin="Generated by Gradle"/>
14021402
</artifact>
14031403
</component>
1404-
<component group="io.netty" name="netty-common" version="4.1.109.Final">
1405-
<artifact name="netty-common-4.1.109.Final.jar">
1406-
<sha256 value="33bf51077021de2b9d80b9ec64a4fae68f22e6ec56f52431441eaf6dd79cce71" origin="Generated by Gradle"/>
1404+
<component group="io.netty" name="netty-common" version="4.1.115.Final">
1405+
<artifact name="netty-common-4.1.115.Final.jar">
1406+
<sha256 value="39f1b5a2aaa4eab5d036dfd0486e35a4276df412e092d36b2d88b494705a134d" origin="Generated by Gradle"/>
14071407
</artifact>
14081408
</component>
14091409
<component group="io.netty" name="netty-common" version="4.1.42.Final">
14101410
<artifact name="netty-common-4.1.42.Final.jar">
14111411
<sha256 value="3d0a918d78292eeca02a7bb2188daa4e5053b6e29b71e6308309033e121242b5" origin="Generated by Gradle"/>
14121412
</artifact>
14131413
</component>
1414-
<component group="io.netty" name="netty-handler" version="4.1.109.Final">
1415-
<artifact name="netty-handler-4.1.109.Final.jar">
1416-
<sha256 value="1161e2ed8e1f037124a8ddfe3d4184ebaa7be17aea27e7fca87f510f17898ea5" origin="Generated by Gradle"/>
1414+
<component group="io.netty" name="netty-handler" version="4.1.115.Final">
1415+
<artifact name="netty-handler-4.1.115.Final.jar">
1416+
<sha256 value="5972028cc863b74927ce0d11fb8d58f65da2560bef5602fe8ce8903bd306ca07" origin="Generated by Gradle"/>
14171417
</artifact>
14181418
</component>
14191419
<component group="io.netty" name="netty-handler" version="4.1.42.Final">
14201420
<artifact name="netty-handler-4.1.42.Final.jar">
14211421
<sha256 value="11eda86500c33b9d386719b5419f513fd9c097d13894f25dd0c75b610d636e03" origin="Generated by Gradle"/>
14221422
</artifact>
14231423
</component>
1424-
<component group="io.netty" name="netty-handler-proxy" version="4.1.109.Final">
1425-
<artifact name="netty-handler-proxy-4.1.109.Final.jar">
1426-
<sha256 value="42e34c84423f074a4db4576e6d1ddabf56eb26705213e5f9b6ef537ce36bcd0b" origin="Generated by Gradle"/>
1424+
<component group="io.netty" name="netty-handler-proxy" version="4.1.115.Final">
1425+
<artifact name="netty-handler-proxy-4.1.115.Final.jar">
1426+
<sha256 value="807e67cfb17136927d11db42df62031169d1fa0883e13f254906994c84ffbe87" origin="Generated by Gradle"/>
14271427
</artifact>
14281428
</component>
1429-
<component group="io.netty" name="netty-resolver" version="4.1.109.Final">
1430-
<artifact name="netty-resolver-4.1.109.Final.jar">
1431-
<sha256 value="e168920249ea8d65076b0847e64464b5132843f1f1b2ff514e45fa255b64300b" origin="Generated by Gradle"/>
1429+
<component group="io.netty" name="netty-resolver" version="4.1.115.Final">
1430+
<artifact name="netty-resolver-4.1.115.Final.jar">
1431+
<sha256 value="7b3455d14f59828765a00573bc3967dc59379e874bd62a67eb1926d6512109d1" origin="Generated by Gradle"/>
14321432
</artifact>
14331433
</component>
14341434
<component group="io.netty" name="netty-resolver" version="4.1.42.Final">
14351435
<artifact name="netty-resolver-4.1.42.Final.jar">
14361436
<sha256 value="89768242b6b7cce9bd9f5945ad21d1b4bae515c6b1bf03a8af5d1899779cebc9" origin="Generated by Gradle"/>
14371437
</artifact>
14381438
</component>
1439-
<component group="io.netty" name="netty-resolver-dns" version="4.1.109.Final">
1440-
<artifact name="netty-resolver-dns-4.1.109.Final.jar">
1441-
<sha256 value="7e354a85f8147744aeb9d3e1e64ace18f6432a25c09f8bde57383959a842c967" origin="Generated by Gradle"/>
1439+
<component group="io.netty" name="netty-resolver-dns" version="4.1.115.Final">
1440+
<artifact name="netty-resolver-dns-4.1.115.Final.jar">
1441+
<sha256 value="4aca31593e5896c64ab7e041bbc6c0d851bd9634ec3a4354208141a35576619f" origin="Generated by Gradle"/>
14421442
</artifact>
14431443
</component>
1444-
<component group="io.netty" name="netty-transport" version="4.1.109.Final">
1445-
<artifact name="netty-transport-4.1.109.Final.jar">
1446-
<sha256 value="c1ac17ce337d945290be680d7be942b7b4ff4c989be8ec24c684b3e94438da52" origin="Generated by Gradle"/>
1444+
<component group="io.netty" name="netty-transport" version="4.1.115.Final">
1445+
<artifact name="netty-transport-4.1.115.Final.jar">
1446+
<sha256 value="c3d71faaa736ffd2c9260ab0b498024b814c39c7d764bea8113fa98de6e2bdd2" origin="Generated by Gradle"/>
14471447
</artifact>
14481448
</component>
14491449
<component group="io.netty" name="netty-transport" version="4.1.42.Final">
14501450
<artifact name="netty-transport-4.1.42.Final.jar">
14511451
<sha256 value="dfa817a156ea263aa9ad8364a2e226527665c9722aca40a7945f228c2c14f1da" origin="Generated by Gradle"/>
14521452
</artifact>
14531453
</component>
1454-
<component group="io.netty" name="netty-transport-classes-epoll" version="4.1.109.Final">
1455-
<artifact name="netty-transport-classes-epoll-4.1.109.Final.jar">
1456-
<sha256 value="02ce34ba9ab6ecc62de667ed35a8680202a902ec6e90bed587bea2e574fae38d" origin="Generated by Gradle"/>
1454+
<component group="io.netty" name="netty-transport-classes-epoll" version="4.1.115.Final">
1455+
<artifact name="netty-transport-classes-epoll-4.1.115.Final.jar">
1456+
<sha256 value="40aa67b4463cca0ab346e393c87f6c37e8954d18ec8b78567d95b55aa1f2b3aa" origin="Generated by Gradle"/>
14571457
</artifact>
14581458
</component>
14591459
<component group="io.netty" name="netty-transport-native-epoll" version="4.1.42.Final">
14601460
<artifact name="netty-transport-native-epoll-4.1.42.Final.jar">
14611461
<sha256 value="3c7d659b3bd773e0ea9b7517d2d6baffa275a3d2ae8eb4c10cb8f0a7724b11d5" origin="Generated by Gradle"/>
14621462
</artifact>
14631463
</component>
1464-
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.109.Final">
1465-
<artifact name="netty-transport-native-unix-common-4.1.109.Final.jar">
1466-
<sha256 value="61e66832820f257bbee68722ec088b39da383c213eafbd1767097a7fff5d029f" origin="Generated by Gradle"/>
1464+
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.115.Final">
1465+
<artifact name="netty-transport-native-unix-common-4.1.115.Final.jar">
1466+
<sha256 value="4b03e716272657c296b0204b57c140b2b2ca96b1a746c92da41f595892ec6d88" origin="Generated by Gradle"/>
14671467
</artifact>
14681468
</component>
14691469
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.42.Final">

modules/transport-netty4/build.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,8 @@ tasks.named("thirdPartyAudit").configure {
177177
'com.google.protobuf.nano.CodedOutputByteBufferNano',
178178
'com.google.protobuf.nano.MessageNano',
179179
'com.github.luben.zstd.Zstd',
180-
'com.github.luben.zstd.BaseZstdBufferDecompressingStreamNoFinalizer',
181-
'com.github.luben.zstd.ZstdBufferDecompressingStreamNoFinalizer',
182-
'com.github.luben.zstd.ZstdDirectBufferDecompressingStreamNoFinalizer',
180+
'com.github.luben.zstd.ZstdInputStreamNoFinalizer',
181+
'com.github.luben.zstd.util.Native',
183182
'com.jcraft.jzlib.Deflater',
184183
'com.jcraft.jzlib.Inflater',
185184
'com.jcraft.jzlib.JZlib$WrapperType',
@@ -231,8 +230,14 @@ tasks.named("thirdPartyAudit").configure {
231230
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
232231
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
233232
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
233+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerIndexField',
234+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerIndexField',
235+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField',
236+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField',
237+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField',
234238
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
235239
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
240+
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess',
236241
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
237242
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$1',
238243
'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator$2',

muted-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,9 @@ tests:
330330
- class: org.elasticsearch.xpack.spatial.search.GeoGridAggAndQueryConsistencyIT
331331
method: testGeoShapeGeoTile
332332
issue: https://github.com/elastic/elasticsearch/issues/115717
333+
- class: org.elasticsearch.search.StressSearchServiceReaperIT
334+
method: testStressReaper
335+
issue: https://github.com/elastic/elasticsearch/issues/115816
333336

334337
# Examples:
335338
#

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ static TransportVersion def(int id) {
176176
public static final TransportVersion CONVERT_FAILURE_STORE_OPTIONS_TO_SELECTOR_OPTIONS_INTERNALLY = def(8_772_00_0);
177177
public static final TransportVersion INFERENCE_DONT_PERSIST_ON_READ_BACKPORT_8_16 = def(8_772_00_1);
178178
public static final TransportVersion ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO_BACKPORT_8_16 = def(8_772_00_2);
179+
public static final TransportVersion SKIP_INNER_HITS_SEARCH_SOURCE_BACKPORT_8_16 = def(8_772_00_3);
179180
public static final TransportVersion REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_773_00_0);
180181
public static final TransportVersion REVERT_REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_774_00_0);
181182
public static final TransportVersion ESQL_FIELD_ATTRIBUTE_PARENT_SIMPLIFIED = def(8_775_00_0);

0 commit comments

Comments
 (0)