Skip to content

Commit 2747759

Browse files
committed
Remove unused CrossProjectDecider and use lookup-join resolution method
1 parent b7c9f90 commit 2747759

File tree

4 files changed

+4
-20
lines changed

4 files changed

+4
-20
lines changed

x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
import org.elasticsearch.license.XPackLicenseState;
5757
import org.elasticsearch.search.SearchService;
5858
import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileUtils;
59-
import org.elasticsearch.search.crossproject.CrossProjectModeDecider;
6059
import org.elasticsearch.tasks.TaskCancelledException;
6160
import org.elasticsearch.test.ESTestCase;
6261
import org.elasticsearch.test.TransportVersionUtils;
@@ -542,8 +541,7 @@ public static LogicalOptimizerContext unboundLogicalOptimizerContext() {
542541
null,
543542
new InferenceService(mock(Client.class)),
544543
new BlockFactoryProvider(PlannerUtils.NON_BREAKING_BLOCK_FACTORY),
545-
TEST_PLANNER_SETTINGS,
546-
new CrossProjectModeDecider(Settings.EMPTY)
544+
TEST_PLANNER_SETTINGS
547545
);
548546

549547
private static ClusterService createMockClusterService() {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/TransportActionServices.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.compute.data.BlockFactoryProvider;
1414
import org.elasticsearch.compute.operator.exchange.ExchangeService;
1515
import org.elasticsearch.search.SearchService;
16-
import org.elasticsearch.search.crossproject.CrossProjectModeDecider;
1716
import org.elasticsearch.transport.TransportService;
1817
import org.elasticsearch.usage.UsageService;
1918
import org.elasticsearch.xpack.esql.inference.InferenceService;
@@ -29,6 +28,5 @@ public record TransportActionServices(
2928
UsageService usageService,
3029
InferenceService inferenceService,
3130
BlockFactoryProvider blockFactoryProvider,
32-
PlannerSettings plannerSettings,
33-
CrossProjectModeDecider crossProjectModeDecider
31+
PlannerSettings plannerSettings
3432
) {}

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/TransportEsqlQueryAction.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.elasticsearch.core.Nullable;
2727
import org.elasticsearch.injection.guice.Inject;
2828
import org.elasticsearch.search.SearchService;
29-
import org.elasticsearch.search.crossproject.CrossProjectModeDecider;
3029
import org.elasticsearch.tasks.CancellableTask;
3130
import org.elasticsearch.tasks.Task;
3231
import org.elasticsearch.tasks.TaskId;
@@ -171,8 +170,7 @@ public TransportEsqlQueryAction(
171170
usageService,
172171
new InferenceService(client),
173172
blockFactoryProvider,
174-
new PlannerSettings(clusterService),
175-
new CrossProjectModeDecider(clusterService.getSettings())
173+
new PlannerSettings(clusterService)
176174
);
177175

178176
this.computeService = new ComputeService(

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlSession.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.elasticsearch.logging.LogManager;
3535
import org.elasticsearch.logging.Logger;
3636
import org.elasticsearch.search.SearchShardTarget;
37-
import org.elasticsearch.search.crossproject.CrossProjectModeDecider;
3837
import org.elasticsearch.threadpool.ThreadPool;
3938
import org.elasticsearch.transport.RemoteClusterAware;
4039
import org.elasticsearch.transport.RemoteClusterService;
@@ -136,7 +135,6 @@ public interface PlanRunner {
136135
private final RemoteClusterService remoteClusterService;
137136
private final BlockFactory blockFactory;
138137
private final ByteSizeValue intermediateLocalRelationMaxSize;
139-
private final CrossProjectModeDecider crossProjectModeDecider;
140138
private final String clusterName;
141139

142140
private boolean explainMode;
@@ -171,7 +169,6 @@ public EsqlSession(
171169
this.remoteClusterService = services.transportService().getRemoteClusterService();
172170
this.blockFactory = services.blockFactoryProvider().blockFactory();
173171
this.intermediateLocalRelationMaxSize = services.plannerSettings().intermediateLocalRelationMaxSize();
174-
this.crossProjectModeDecider = services.crossProjectModeDecider();
175172
this.clusterName = services.clusterService().getClusterName().value();
176173
}
177174

@@ -558,14 +555,7 @@ private void resolveIndicesAndAnalyze(
558555
}
559556
return r;
560557
})
561-
.<PreAnalysisResult>andThen(
562-
(l, r) -> forAll(
563-
preAnalysis.lookupIndices().iterator(),
564-
r,
565-
(lookupIndex, innerR, innerL) -> preAnalyzeLookupIndex(lookupIndex, innerR, executionInfo, innerL),
566-
l
567-
)
568-
)
558+
.<PreAnalysisResult>andThen((l, r) -> preAnalyzeLookupIndices(preAnalysis.lookupIndices().iterator(), r, executionInfo, l))
569559
.<PreAnalysisResult>andThen((l, r) -> {
570560
enrichPolicyResolver.resolvePolicies(preAnalysis.enriches(), executionInfo, l.map(r::withEnrichResolution));
571561
})

0 commit comments

Comments
 (0)