File tree Expand file tree Collapse file tree 4 files changed +12
-3
lines changed
qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql
src/main/java/org/elasticsearch/xpack/esql Expand file tree Collapse file tree 4 files changed +12
-3
lines changed Original file line number Diff line number Diff line change 5656import org .elasticsearch .license .XPackLicenseState ;
5757import org .elasticsearch .search .SearchService ;
5858import org .elasticsearch .search .aggregations .bucket .geogrid .GeoTileUtils ;
59+ import org .elasticsearch .search .crossproject .CrossProjectModeDecider ;
5960import org .elasticsearch .tasks .TaskCancelledException ;
6061import org .elasticsearch .test .ESTestCase ;
6162import 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 () {
Original file line number Diff line number Diff line change 1313import org .elasticsearch .compute .data .BlockFactoryProvider ;
1414import org .elasticsearch .compute .operator .exchange .ExchangeService ;
1515import org .elasticsearch .search .SearchService ;
16+ import org .elasticsearch .search .crossproject .CrossProjectModeDecider ;
1617import org .elasticsearch .transport .TransportService ;
1718import org .elasticsearch .usage .UsageService ;
1819import 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) {}
Original file line number Diff line number Diff line change 2626import org .elasticsearch .core .Nullable ;
2727import org .elasticsearch .injection .guice .Inject ;
2828import org .elasticsearch .search .SearchService ;
29+ import org .elasticsearch .search .crossproject .CrossProjectModeDecider ;
2930import org .elasticsearch .tasks .CancellableTask ;
3031import org .elasticsearch .tasks .Task ;
3132import 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 (
Original file line number Diff line number Diff line change 3333import org .elasticsearch .logging .LogManager ;
3434import org .elasticsearch .logging .Logger ;
3535import org .elasticsearch .search .SearchShardTarget ;
36+ import org .elasticsearch .search .crossproject .CrossProjectModeDecider ;
3637import org .elasticsearch .threadpool .ThreadPool ;
3738import org .elasticsearch .transport .RemoteClusterAware ;
3839import org .elasticsearch .transport .RemoteClusterService ;
@@ -134,6 +135,7 @@ public interface PlanRunner {
134135 private final RemoteClusterService remoteClusterService ;
135136 private final BlockFactory blockFactory ;
136137 private final ByteSizeValue intermediateLocalRelationMaxSize ;
138+ private final CrossProjectModeDecider crossProjectModeDecider ;
137139 private final String clusterName ;
138140
139141 private boolean explainMode ;
@@ -168,6 +170,7 @@ public EsqlSession(
168170 this .remoteClusterService = services .transportService ().getRemoteClusterService ();
169171 this .blockFactory = services .blockFactoryProvider ().blockFactory ();
170172 this .intermediateLocalRelationMaxSize = services .plannerSettings ().intermediateLocalRelationMaxSize ();
173+ this .crossProjectModeDecider = services .crossProjectModeDecider ();
171174 this .clusterName = services .clusterService ().getClusterName ().value ();
172175 }
173176
You can’t perform that action at this time.
0 commit comments