Skip to content

Commit 92e8cda

Browse files
authored
Merge branch 'main' into full-stack-trace
2 parents 50f76f8 + eee890a commit 92e8cda

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

libs/entitlement/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ private static PolicyManager createPolicyManager() {
213213
new FilesEntitlement(serverModuleFileDatas)
214214
)
215215
),
216+
new Scope("java.desktop", List.of(new LoadNativeLibrariesEntitlement())),
216217
new Scope("org.apache.httpcomponents.httpclient", List.of(new OutboundNetworkEntitlement())),
217218
new Scope("io.netty.transport", List.of(new InboundNetworkEntitlement(), new OutboundNetworkEntitlement())),
218219
new Scope(

muted-tests.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,6 @@ tests:
342342
- class: org.elasticsearch.xpack.ilm.DataStreamAndIndexLifecycleMixingTests
343343
method: testUpdateIndexTemplateToDataStreamLifecyclePreference
344344
issue: https://github.com/elastic/elasticsearch/issues/124837
345-
- class: org.elasticsearch.xpack.esql.optimizer.rules.logical.PropagateInlineEvalsTests
346-
method: testGroupingAliasingMoved_To_LeftSideOfJoin
347-
issue: https://github.com/elastic/elasticsearch/issues/124839
348-
- class: org.elasticsearch.xpack.esql.optimizer.rules.logical.PropagateInlineEvalsTests
349-
method: testGroupingAliasingMoved_To_LeftSideOfJoin_WithExpression
350-
issue: https://github.com/elastic/elasticsearch/issues/124838
351345
- class: org.elasticsearch.datastreams.lifecycle.DataStreamLifecycleServiceIT
352346
method: testAutomaticForceMerge
353347
issue: https://github.com/elastic/elasticsearch/issues/124846

qa/ccs-unavailable-clusters/src/javaRestTest/java/org/elasticsearch/search/CrossClusterSearchUnavailableClusterIT.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,12 @@ private static MockTransportService startTransport(
9191
EsExecutors.DIRECT_EXECUTOR_SERVICE,
9292
SearchShardsRequest::new,
9393
(request, channel, task) -> {
94-
channel.sendResponse(new SearchShardsResponse(List.of(), List.of(), Collections.emptyMap()));
94+
var searchShardsResponse = new SearchShardsResponse(List.of(), List.of(), Collections.emptyMap());
95+
try {
96+
channel.sendResponse(searchShardsResponse);
97+
} finally {
98+
searchShardsResponse.decRef();
99+
}
95100
}
96101
);
97102
newService.registerRequestHandler(
@@ -119,7 +124,12 @@ private static MockTransportService startTransport(
119124
builder.add(node);
120125
}
121126
ClusterState build = ClusterState.builder(clusterName).nodes(builder.build()).build();
122-
channel.sendResponse(new ClusterStateResponse(clusterName, build, false));
127+
var clusterStateResponse = new ClusterStateResponse(clusterName, build, false);
128+
try {
129+
channel.sendResponse(clusterStateResponse);
130+
} finally {
131+
clusterStateResponse.decRef();
132+
}
123133
}
124134
);
125135
newService.start();

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PropagateInlineEvalsTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.elasticsearch.index.IndexMode;
1111
import org.elasticsearch.test.ESTestCase;
1212
import org.elasticsearch.xpack.esql.EsqlTestUtils;
13+
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
1314
import org.elasticsearch.xpack.esql.analysis.Analyzer;
1415
import org.elasticsearch.xpack.esql.analysis.AnalyzerContext;
1516
import org.elasticsearch.xpack.esql.analysis.EnrichResolution;
@@ -80,6 +81,7 @@ public static void init() {
8081
* \_StubRelation[[emp_no{f}#11, languages{f}#14, gender{f}#13, y{r}#10]]
8182
*/
8283
public void testGroupingAliasingMoved_To_LeftSideOfJoin() {
84+
assumeTrue("Requires INLINESTATS", EsqlCapabilities.Cap.INLINESTATS_V5.isEnabled());
8385
var plan = plan("""
8486
from test
8587
| keep emp_no, languages, gender
@@ -122,6 +124,7 @@ public void testGroupingAliasingMoved_To_LeftSideOfJoin() {
122124
* {r}#21]]
123125
*/
124126
public void testGroupingAliasingMoved_To_LeftSideOfJoin_WithExpression() {
127+
assumeTrue("Requires INLINESTATS", EsqlCapabilities.Cap.INLINESTATS_V5.isEnabled());
125128
var plan = plan("""
126129
from test
127130
| keep emp_no, languages, gender, last_name, first_name

0 commit comments

Comments
 (0)