Skip to content

Commit 8ff2f33

Browse files
committed
Add back CrossProjectDecider
1 parent 2747759 commit 8ff2f33

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
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;
5960
import org.elasticsearch.tasks.TaskCancelledException;
6061
import org.elasticsearch.test.ESTestCase;
6162
import org.elasticsearch.test.TransportVersionUtils;
@@ -541,7 +542,8 @@ public static LogicalOptimizerContext unboundLogicalOptimizerContext() {
541542
null,
542543
new InferenceService(mock(Client.class)),
543544
new BlockFactoryProvider(PlannerUtils.NON_BREAKING_BLOCK_FACTORY),
544-
TEST_PLANNER_SETTINGS
545+
TEST_PLANNER_SETTINGS,
546+
new CrossProjectModeDecider(Settings.EMPTY)
545547
);
546548

547549
private static ClusterService createMockClusterService() {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
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;
1617
import org.elasticsearch.transport.TransportService;
1718
import org.elasticsearch.usage.UsageService;
1819
import org.elasticsearch.xpack.esql.inference.InferenceService;
@@ -28,5 +29,6 @@ public record TransportActionServices(
2829
UsageService usageService,
2930
InferenceService inferenceService,
3031
BlockFactoryProvider blockFactoryProvider,
31-
PlannerSettings plannerSettings
32+
PlannerSettings plannerSettings,
33+
CrossProjectModeDecider crossProjectModeDecider
3234
) {}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
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;
2930
import org.elasticsearch.tasks.CancellableTask;
3031
import org.elasticsearch.tasks.Task;
3132
import org.elasticsearch.tasks.TaskId;
@@ -170,7 +171,8 @@ public TransportEsqlQueryAction(
170171
usageService,
171172
new InferenceService(client),
172173
blockFactoryProvider,
173-
new PlannerSettings(clusterService)
174+
new PlannerSettings(clusterService),
175+
new CrossProjectModeDecider(clusterService.getSettings())
174176
);
175177

176178
this.computeService = new ComputeService(

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
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;
3738
import org.elasticsearch.threadpool.ThreadPool;
3839
import org.elasticsearch.transport.RemoteClusterAware;
3940
import org.elasticsearch.transport.RemoteClusterService;
@@ -135,6 +136,7 @@ public interface PlanRunner {
135136
private final RemoteClusterService remoteClusterService;
136137
private final BlockFactory blockFactory;
137138
private final ByteSizeValue intermediateLocalRelationMaxSize;
139+
private final CrossProjectModeDecider crossProjectModeDecider;
138140
private final String clusterName;
139141

140142
private boolean explainMode;
@@ -169,6 +171,7 @@ public EsqlSession(
169171
this.remoteClusterService = services.transportService().getRemoteClusterService();
170172
this.blockFactory = services.blockFactoryProvider().blockFactory();
171173
this.intermediateLocalRelationMaxSize = services.plannerSettings().intermediateLocalRelationMaxSize();
174+
this.crossProjectModeDecider = services.crossProjectModeDecider();
172175
this.clusterName = services.clusterService().getClusterName().value();
173176
}
174177

0 commit comments

Comments
 (0)