Skip to content

Commit b2bcc22

Browse files
idegtiarenkoidegtiarenko
committed
Merge branch 'main' into add_node_name_to_driver
# Conflicts: # x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/exchange/ExchangeServiceTests.java # x-pack/plugin/esql/compute/test/src/main/java/org/elasticsearch/compute/test/TestDriverFactory.java
2 parents 459f230 + b369cbc commit b2bcc22

File tree

14 files changed

+127
-139
lines changed

14 files changed

+127
-139
lines changed

‎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.115.Final
17+
netty = 4.1.118.Final
1818
commons_lang3 = 3.9
1919
google_oauth_client = 1.34.1
2020
awsv1sdk = 1.12.746

‎gradle/verification-metadata.xml‎

Lines changed: 42 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,114 +1404,74 @@
14041404
<sha256 value="a3ebec96768ee4a2d3db44597e84cea2d0bdd68ca04822397980ea9f67075a86" origin="Generated by Gradle"/>
14051405
</artifact>
14061406
</component>
1407-
<component group="io.netty" name="netty-buffer" version="4.1.115.Final">
1408-
<artifact name="netty-buffer-4.1.115.Final.jar">
1409-
<sha256 value="4a7b331d3770c566ab70eb02a0d1feed63b95cf6e4d68c8fe778c4c9de2d116d" origin="Generated by Gradle"/>
1407+
<component group="io.netty" name="netty-buffer" version="4.1.118.Final">
1408+
<artifact name="netty-buffer-4.1.118.Final.jar">
1409+
<sha256 value="0eea4e8666a9636a28722661d8ba5fa8564477e75fec6dd2ff3e324e361f8b3c" origin="Generated by Gradle"/>
14101410
</artifact>
14111411
</component>
1412-
<component group="io.netty" name="netty-buffer" version="4.1.42.Final">
1413-
<artifact name="netty-buffer-4.1.42.Final.jar">
1414-
<sha256 value="7b0171a4e8bcd573e08d9f2bba053c67b557ab5012106a5982ccbae5743814c0" origin="Generated by Gradle"/>
1412+
<component group="io.netty" name="netty-codec" version="4.1.118.Final">
1413+
<artifact name="netty-codec-4.1.118.Final.jar">
1414+
<sha256 value="4abd215fd1ed7ce86509d169cc9cbede5042176c265a79b3b70602b017226c3f" origin="Generated by Gradle"/>
14151415
</artifact>
14161416
</component>
1417-
<component group="io.netty" name="netty-codec" version="4.1.115.Final">
1418-
<artifact name="netty-codec-4.1.115.Final.jar">
1419-
<sha256 value="cd189afb70ec6eacfcdfdd3a5f472b4e705a5c91d5bd3ef0386421f2ae15ec77" origin="Generated by Gradle"/>
1417+
<component group="io.netty" name="netty-codec-dns" version="4.1.118.Final">
1418+
<artifact name="netty-codec-dns-4.1.118.Final.jar">
1419+
<sha256 value="e115e42ca1e3cc8d85e3a632d8faa102d18c0ebc1fa4511af30bec79f8c147d4" origin="Generated by Gradle"/>
14201420
</artifact>
14211421
</component>
1422-
<component group="io.netty" name="netty-codec" version="4.1.42.Final">
1423-
<artifact name="netty-codec-4.1.42.Final.jar">
1424-
<sha256 value="e96ced697fb7df589da7c20c995e01f75a9cb246be242bbc4cd3b4af424ff189" origin="Generated by Gradle"/>
1422+
<component group="io.netty" name="netty-codec-http" version="4.1.118.Final">
1423+
<artifact name="netty-codec-http-4.1.118.Final.jar">
1424+
<sha256 value="09822d785e9a794838031ddd5346cf419b30c036a981c2e277a062bea884174b" origin="Generated by Gradle"/>
14251425
</artifact>
14261426
</component>
1427-
<component group="io.netty" name="netty-codec-dns" version="4.1.115.Final">
1428-
<artifact name="netty-codec-dns-4.1.115.Final.jar">
1429-
<sha256 value="23dd6806bcc326855f13e69838c6411d0490e6b1aeb12e217a19a3dd6ad3f10d" origin="Generated by Gradle"/>
1427+
<component group="io.netty" name="netty-codec-http2" version="4.1.118.Final">
1428+
<artifact name="netty-codec-http2-4.1.118.Final.jar">
1429+
<sha256 value="68da0b1a34dceb00a6f9f6f788fb2f6b7b9e4adba8c70658ac2bd7eb898b97ae" origin="Generated by Gradle"/>
14301430
</artifact>
14311431
</component>
1432-
<component group="io.netty" name="netty-codec-http" version="4.1.115.Final">
1433-
<artifact name="netty-codec-http-4.1.115.Final.jar">
1434-
<sha256 value="e6dbe971c59373bbae9802021c63b9bc1d8800fead382863d67e79e79b023166" origin="Generated by Gradle"/>
1432+
<component group="io.netty" name="netty-codec-socks" version="4.1.118.Final">
1433+
<artifact name="netty-codec-socks-4.1.118.Final.jar">
1434+
<sha256 value="094465e3cfb3aef0fca38ed82b801f53a6c8be7ae1f83ab0c1b2e8ece2586840" origin="Generated by Gradle"/>
14351435
</artifact>
14361436
</component>
1437-
<component group="io.netty" name="netty-codec-http2" version="4.1.115.Final">
1438-
<artifact name="netty-codec-http2-4.1.115.Final.jar">
1439-
<sha256 value="cbed9829a5d582e91e314e209edce9a0c2eb369f23bb4fb74a5bc8b7990222c2" origin="Generated by Gradle"/>
1437+
<component group="io.netty" name="netty-common" version="4.1.118.Final">
1438+
<artifact name="netty-common-4.1.118.Final.jar">
1439+
<sha256 value="65cce901ecf0f9d6591cc7750772614ab401a84415dc9aec9da4d046f0f9a77c" origin="Generated by Gradle"/>
14401440
</artifact>
14411441
</component>
1442-
<component group="io.netty" name="netty-codec-socks" version="4.1.115.Final">
1443-
<artifact name="netty-codec-socks-4.1.115.Final.jar">
1444-
<sha256 value="e9b1cc744dc6195894450b1fd4d271a821ab167fe21ae3c459b27cdadc70e81f" origin="Generated by Gradle"/>
1442+
<component group="io.netty" name="netty-handler" version="4.1.118.Final">
1443+
<artifact name="netty-handler-4.1.118.Final.jar">
1444+
<sha256 value="26e3f8a5e859fd62cf3c13dc6d75e4e18879f000a5d0ad7f58f8679675d23dae" origin="Generated by Gradle"/>
14451445
</artifact>
14461446
</component>
1447-
<component group="io.netty" name="netty-common" version="4.1.115.Final">
1448-
<artifact name="netty-common-4.1.115.Final.jar">
1449-
<sha256 value="39f1b5a2aaa4eab5d036dfd0486e35a4276df412e092d36b2d88b494705a134d" origin="Generated by Gradle"/>
1447+
<component group="io.netty" name="netty-handler-proxy" version="4.1.118.Final">
1448+
<artifact name="netty-handler-proxy-4.1.118.Final.jar">
1449+
<sha256 value="fef926126f44c668968dd3e2389c2552981d452e6dfc23b1f9bd03db92c21f96" origin="Generated by Gradle"/>
14501450
</artifact>
14511451
</component>
1452-
<component group="io.netty" name="netty-common" version="4.1.42.Final">
1453-
<artifact name="netty-common-4.1.42.Final.jar">
1454-
<sha256 value="3d0a918d78292eeca02a7bb2188daa4e5053b6e29b71e6308309033e121242b5" origin="Generated by Gradle"/>
1452+
<component group="io.netty" name="netty-resolver" version="4.1.118.Final">
1453+
<artifact name="netty-resolver-4.1.118.Final.jar">
1454+
<sha256 value="3170c225972c18b6850d28add60db15bb28d83c4e3d5b686ca220e0bd7273c8a" origin="Generated by Gradle"/>
14551455
</artifact>
14561456
</component>
1457-
<component group="io.netty" name="netty-handler" version="4.1.115.Final">
1458-
<artifact name="netty-handler-4.1.115.Final.jar">
1459-
<sha256 value="5972028cc863b74927ce0d11fb8d58f65da2560bef5602fe8ce8903bd306ca07" origin="Generated by Gradle"/>
1457+
<component group="io.netty" name="netty-resolver-dns" version="4.1.118.Final">
1458+
<artifact name="netty-resolver-dns-4.1.118.Final.jar">
1459+
<sha256 value="c0e0fdaffaba849e3145b2b96288fc8fc6f3b2a623cf72aaba708288348e4938" origin="Generated by Gradle"/>
14601460
</artifact>
14611461
</component>
1462-
<component group="io.netty" name="netty-handler" version="4.1.42.Final">
1463-
<artifact name="netty-handler-4.1.42.Final.jar">
1464-
<sha256 value="11eda86500c33b9d386719b5419f513fd9c097d13894f25dd0c75b610d636e03" origin="Generated by Gradle"/>
1462+
<component group="io.netty" name="netty-transport" version="4.1.118.Final">
1463+
<artifact name="netty-transport-4.1.118.Final.jar">
1464+
<sha256 value="ab3751e717daef9c8d91e4d74728a48730bd8530b72e2466b222b2ea3fb07db9" origin="Generated by Gradle"/>
14651465
</artifact>
14661466
</component>
1467-
<component group="io.netty" name="netty-handler-proxy" version="4.1.115.Final">
1468-
<artifact name="netty-handler-proxy-4.1.115.Final.jar">
1469-
<sha256 value="807e67cfb17136927d11db42df62031169d1fa0883e13f254906994c84ffbe87" origin="Generated by Gradle"/>
1467+
<component group="io.netty" name="netty-transport-classes-epoll" version="4.1.118.Final">
1468+
<artifact name="netty-transport-classes-epoll-4.1.118.Final.jar">
1469+
<sha256 value="bd86e6d41e1f6053f9577931655236259778ab045646e1e6ab04150f070864f3" origin="Generated by Gradle"/>
14701470
</artifact>
14711471
</component>
1472-
<component group="io.netty" name="netty-resolver" version="4.1.115.Final">
1473-
<artifact name="netty-resolver-4.1.115.Final.jar">
1474-
<sha256 value="7b3455d14f59828765a00573bc3967dc59379e874bd62a67eb1926d6512109d1" origin="Generated by Gradle"/>
1475-
</artifact>
1476-
</component>
1477-
<component group="io.netty" name="netty-resolver" version="4.1.42.Final">
1478-
<artifact name="netty-resolver-4.1.42.Final.jar">
1479-
<sha256 value="89768242b6b7cce9bd9f5945ad21d1b4bae515c6b1bf03a8af5d1899779cebc9" origin="Generated by Gradle"/>
1480-
</artifact>
1481-
</component>
1482-
<component group="io.netty" name="netty-resolver-dns" version="4.1.115.Final">
1483-
<artifact name="netty-resolver-dns-4.1.115.Final.jar">
1484-
<sha256 value="4aca31593e5896c64ab7e041bbc6c0d851bd9634ec3a4354208141a35576619f" origin="Generated by Gradle"/>
1485-
</artifact>
1486-
</component>
1487-
<component group="io.netty" name="netty-transport" version="4.1.115.Final">
1488-
<artifact name="netty-transport-4.1.115.Final.jar">
1489-
<sha256 value="c3d71faaa736ffd2c9260ab0b498024b814c39c7d764bea8113fa98de6e2bdd2" origin="Generated by Gradle"/>
1490-
</artifact>
1491-
</component>
1492-
<component group="io.netty" name="netty-transport" version="4.1.42.Final">
1493-
<artifact name="netty-transport-4.1.42.Final.jar">
1494-
<sha256 value="dfa817a156ea263aa9ad8364a2e226527665c9722aca40a7945f228c2c14f1da" origin="Generated by Gradle"/>
1495-
</artifact>
1496-
</component>
1497-
<component group="io.netty" name="netty-transport-classes-epoll" version="4.1.115.Final">
1498-
<artifact name="netty-transport-classes-epoll-4.1.115.Final.jar">
1499-
<sha256 value="40aa67b4463cca0ab346e393c87f6c37e8954d18ec8b78567d95b55aa1f2b3aa" origin="Generated by Gradle"/>
1500-
</artifact>
1501-
</component>
1502-
<component group="io.netty" name="netty-transport-native-epoll" version="4.1.42.Final">
1503-
<artifact name="netty-transport-native-epoll-4.1.42.Final.jar">
1504-
<sha256 value="3c7d659b3bd773e0ea9b7517d2d6baffa275a3d2ae8eb4c10cb8f0a7724b11d5" origin="Generated by Gradle"/>
1505-
</artifact>
1506-
</component>
1507-
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.115.Final">
1508-
<artifact name="netty-transport-native-unix-common-4.1.115.Final.jar">
1509-
<sha256 value="4b03e716272657c296b0204b57c140b2b2ca96b1a746c92da41f595892ec6d88" origin="Generated by Gradle"/>
1510-
</artifact>
1511-
</component>
1512-
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.42.Final">
1513-
<artifact name="netty-transport-native-unix-common-4.1.42.Final.jar">
1514-
<sha256 value="508fba9128da78bd775ba854d71917ceb2b00b95a7600254f54a277a06761a86" origin="Generated by Gradle"/>
1472+
<component group="io.netty" name="netty-transport-native-unix-common" version="4.1.118.Final">
1473+
<artifact name="netty-transport-native-unix-common-4.1.118.Final.jar">
1474+
<sha256 value="69b16793d7b41ea76a762bd2bd144fc4f7c39c156a7a59ebf69baeb560fb10b7" origin="Generated by Gradle"/>
15151475
</artifact>
15161476
</component>
15171477
<component group="io.opencensus" name="opencensus-api" version="0.30.0">

‎modules/repository-azure/src/main/plugin-metadata/plugin-security.policy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ grant {
1212
permission java.net.SocketPermission "*", "connect";
1313
// io.netty.util.concurrent.GlobalEventExecutor.startThread
1414
permission java.lang.RuntimePermission "setContextClassLoader";
15+
// io.netty.util.concurrent.GlobalEventExecutor.startThread
16+
permission java.lang.RuntimePermission "getClassLoader";
1517
// Used by jackson bean deserialization
1618
permission java.lang.RuntimePermission "accessDeclaredMembers";
1719
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";

‎modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ grant codeBase "${codebase.netty-common}" {
1414
// netty makes and accepts socket connections
1515
permission java.net.SocketPermission "*", "accept,connect";
1616

17-
// Netty sets custom classloader for some of its internal threads
17+
// Netty gets and sets classloaders for some of its internal threads
1818
permission java.lang.RuntimePermission "setContextClassLoader";
19+
permission java.lang.RuntimePermission "getClassLoader";
1920
};
2021

2122
grant codeBase "${codebase.netty-transport}" {

‎muted-tests.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -337,15 +337,6 @@ tests:
337337
- class: org.elasticsearch.action.admin.indices.diskusage.IndexDiskUsageAnalyzerTests
338338
method: testCompletionField
339339
issue: https://github.com/elastic/elasticsearch/issues/123269
340-
- class: org.elasticsearch.index.mapper.IPSyntheticSourceNativeArrayIntegrationTests
341-
method: testSynthesizeArray
342-
issue: https://github.com/elastic/elasticsearch/issues/123417
343-
- class: org.elasticsearch.index.mapper.IPSyntheticSourceNativeArrayIntegrationTests
344-
method: testSynthesizeArrayRandom
345-
issue: https://github.com/elastic/elasticsearch/issues/123418
346-
- class: org.elasticsearch.index.mapper.IPSyntheticSourceNativeArrayIntegrationTests
347-
method: testSynthesizeArrayIgnoreMalformed
348-
issue: https://github.com/elastic/elasticsearch/issues/123419
349340
- class: org.elasticsearch.packaging.test.DockerTests
350341
method: test151MachineDependentHeapWithSizeOverride
351342
issue: https://github.com/elastic/elasticsearch/issues/123437

‎server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ grant codeBase "${codebase.httpasyncclient}" {
120120
grant codeBase "${codebase.netty-common}" {
121121
// for reading the system-wide configuration for the backlog of established sockets
122122
permission java.io.FilePermission "/proc/sys/net/core/somaxconn", "read";
123-
// Netty sets custom classloader for some of its internal threads
123+
// Netty gets and sets classloaders for some of its internal threads
124124
permission java.lang.RuntimePermission "setContextClassLoader";
125+
permission java.lang.RuntimePermission "getClassLoader";
125126
permission java.net.SocketPermission "*", "accept,connect";
126127
};
127128

‎server/src/test/java/org/elasticsearch/index/mapper/NativeArrayIntegrationTestCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ protected void verifySyntheticArray(Object[][] arrays, XContentBuilder mapping,
141141
} else {
142142
var copyExpectedStoredFields = new String[expectedStoredFields.length + 1];
143143
System.arraycopy(expectedStoredFields, 0, copyExpectedStoredFields, 0, expectedStoredFields.length);
144-
copyExpectedStoredFields[copyExpectedStoredFields.length - 1] = "_ignored_source";
144+
copyExpectedStoredFields[copyExpectedStoredFields.length - 1] = "_recovery_source";
145145
assertThat(storedFieldNames, containsInAnyOrder(copyExpectedStoredFields));
146146
}
147147
}

‎x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public static class Status implements Operator.Status {
254254
private final int processedSlices;
255255
private final Set<String> processedQueries;
256256
private final Set<String> processedShards;
257-
private final long processingNanos;
257+
private final long processNanos;
258258
private final int totalSlices;
259259
private final int pagesEmitted;
260260
private final int sliceIndex;
@@ -266,7 +266,7 @@ public static class Status implements Operator.Status {
266266
private Status(LuceneOperator operator) {
267267
processedSlices = operator.processedSlices;
268268
processedQueries = operator.processedQueries.stream().map(Query::toString).collect(Collectors.toCollection(TreeSet::new));
269-
processingNanos = operator.processingNanos;
269+
processNanos = operator.processingNanos;
270270
processedShards = new TreeSet<>(operator.processedShards);
271271
sliceIndex = operator.sliceIndex;
272272
totalSlices = operator.sliceQueue.totalSlices();
@@ -293,7 +293,7 @@ private Status(LuceneOperator operator) {
293293
int processedSlices,
294294
Set<String> processedQueries,
295295
Set<String> processedShards,
296-
long processingNanos,
296+
long processNanos,
297297
int sliceIndex,
298298
int totalSlices,
299299
int pagesEmitted,
@@ -305,7 +305,7 @@ private Status(LuceneOperator operator) {
305305
this.processedSlices = processedSlices;
306306
this.processedQueries = processedQueries;
307307
this.processedShards = processedShards;
308-
this.processingNanos = processingNanos;
308+
this.processNanos = processNanos;
309309
this.sliceIndex = sliceIndex;
310310
this.totalSlices = totalSlices;
311311
this.pagesEmitted = pagesEmitted;
@@ -324,7 +324,7 @@ private Status(LuceneOperator operator) {
324324
processedQueries = Collections.emptySet();
325325
processedShards = Collections.emptySet();
326326
}
327-
processingNanos = in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0) ? in.readVLong() : 0;
327+
processNanos = in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0) ? in.readVLong() : 0;
328328
sliceIndex = in.readVInt();
329329
totalSlices = in.readVInt();
330330
pagesEmitted = in.readVInt();
@@ -346,7 +346,7 @@ public void writeTo(StreamOutput out) throws IOException {
346346
out.writeCollection(processedShards, StreamOutput::writeString);
347347
}
348348
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) {
349-
out.writeVLong(processingNanos);
349+
out.writeVLong(processNanos);
350350
}
351351
out.writeVInt(sliceIndex);
352352
out.writeVInt(totalSlices);
@@ -377,7 +377,7 @@ public Set<String> processedShards() {
377377
}
378378

379379
public long processNanos() {
380-
return processingNanos;
380+
return processNanos;
381381
}
382382

383383
public int sliceIndex() {
@@ -414,9 +414,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
414414
builder.field("processed_slices", processedSlices);
415415
builder.field("processed_queries", processedQueries);
416416
builder.field("processed_shards", processedShards);
417-
builder.field("processing_nanos", processingNanos);
417+
builder.field("process_nanos", processNanos);
418418
if (builder.humanReadable()) {
419-
builder.field("processing_time", TimeValue.timeValueNanos(processingNanos));
419+
builder.field("process_time", TimeValue.timeValueNanos(processNanos));
420420
}
421421
builder.field("slice_index", sliceIndex);
422422
builder.field("total_slices", totalSlices);
@@ -436,7 +436,7 @@ public boolean equals(Object o) {
436436
return processedSlices == status.processedSlices
437437
&& processedQueries.equals(status.processedQueries)
438438
&& processedShards.equals(status.processedShards)
439-
&& processingNanos == status.processingNanos
439+
&& processNanos == status.processNanos
440440
&& sliceIndex == status.sliceIndex
441441
&& totalSlices == status.totalSlices
442442
&& pagesEmitted == status.pagesEmitted

‎x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/LuceneSourceOperatorStatusTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public static String simpleToJson() {
4646
"a:0",
4747
"a:1"
4848
],
49-
"processing_nanos" : 1002,
50-
"processing_time" : "1micros",
49+
"process_nanos" : 1002,
50+
"process_time" : "1micros",
5151
"slice_index" : 0,
5252
"total_slices" : 1,
5353
"pages_emitted" : 5,

0 commit comments

Comments
 (0)