Renamed PreOptimizer into LogicalPlanPreOptimizer

Author: afoucret

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

@@ -21,7 +21,7 @@
 import org.elasticsearch.xpack.esql.expression.function.EsqlFunctionRegistry;
 import org.elasticsearch.xpack.esql.optimizer.LogicalOptimizerContext;
 import org.elasticsearch.xpack.esql.optimizer.LogicalPlanOptimizer;
-import org.elasticsearch.xpack.esql.optimizer.PreOptimizer;
+import org.elasticsearch.xpack.esql.optimizer.LogicalPlanPreOptimizer;
 import org.elasticsearch.xpack.esql.planner.mapper.Mapper;
 import org.elasticsearch.xpack.esql.plugin.TransportActionServices;
 import org.elasticsearch.xpack.esql.querylog.EsqlQueryLog;
@@ -86,7 +86,7 @@ public void esql(
             indexResolver,
             enrichPolicyResolver,
             preAnalyzer,
-            new PreOptimizer(services, foldContext),
+            new LogicalPlanPreOptimizer(services, foldContext),
             functionRegistry,
             new LogicalPlanOptimizer(new LogicalOptimizerContext(cfg, foldContext)),
             mapper,

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/PreOptimizer.java renamed to x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanPreOptimizer.java

@@ -29,15 +29,15 @@
  * This is useful, especially if you need to execute some async tasks before the plan is optimized.
  * </p>
  */
-public class PreOptimizer {
+public class LogicalPlanPreOptimizer {
 
     private final InferencePreOptimizer inferencePreOptimizer;
 
-    public PreOptimizer(TransportActionServices services, FoldContext foldContext) {
+    public LogicalPlanPreOptimizer(TransportActionServices services, FoldContext foldContext) {
         this(services.inferenceRunner(), foldContext);
     }
 
-    PreOptimizer(InferenceRunner inferenceRunner, FoldContext foldContext) {
+    LogicalPlanPreOptimizer(InferenceRunner inferenceRunner, FoldContext foldContext) {
         this.inferencePreOptimizer = new InferencePreOptimizer(inferenceRunner, foldContext);
     }
 
@@ -78,9 +78,12 @@ private void foldInferenceFunctions(LogicalPlan plan, ActionListener<LogicalPlan
 
             // Prepare a listener that will be called when all inference functions are done.
             // This listener will replace the inference functions in the plan with their results.
-            CountDownActionListener completionListener = new CountDownActionListener(inferenceFunctions.size(), listener.map(ignored ->
-                plan.transformExpressionsUp(InferenceFunction.class, f -> inferenceFunctionsToResults.getOrDefault(f, f))
-            ));
+            CountDownActionListener completionListener = new CountDownActionListener(
+                inferenceFunctions.size(),
+                listener.map(
+                    ignored -> plan.transformExpressionsUp(InferenceFunction.class, f -> inferenceFunctionsToResults.getOrDefault(f, f))
+                )
+            );
 
             // Try to compute the result for each inference function.
             for (InferenceFunction<?> inferenceFunction : inferenceFunctions) {

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

@@ -72,9 +72,9 @@
 import org.elasticsearch.xpack.esql.inference.InferenceResolution;
 import org.elasticsearch.xpack.esql.inference.InferenceResolver;
 import org.elasticsearch.xpack.esql.optimizer.LogicalPlanOptimizer;
+import org.elasticsearch.xpack.esql.optimizer.LogicalPlanPreOptimizer;
 import org.elasticsearch.xpack.esql.optimizer.PhysicalOptimizerContext;
 import org.elasticsearch.xpack.esql.optimizer.PhysicalPlanOptimizer;
-import org.elasticsearch.xpack.esql.optimizer.PreOptimizer;
 import org.elasticsearch.xpack.esql.parser.EsqlParser;
 import org.elasticsearch.xpack.esql.parser.QueryParams;
 import org.elasticsearch.xpack.esql.plan.IndexPattern;
@@ -146,9 +146,9 @@ public interface PlanRunner {
     private final EnrichPolicyResolver enrichPolicyResolver;
 
     private final PreAnalyzer preAnalyzer;
-    private final PreOptimizer preOptimizer;
     private final Verifier verifier;
     private final EsqlFunctionRegistry functionRegistry;
+    private final LogicalPlanPreOptimizer logicalPlanPreOptimizer;
     private final LogicalPlanOptimizer logicalPlanOptimizer;
     private final PreMapper preMapper;
 
@@ -170,7 +170,7 @@ public EsqlSession(
         IndexResolver indexResolver,
         EnrichPolicyResolver enrichPolicyResolver,
         PreAnalyzer preAnalyzer,
-        PreOptimizer preOptimizer,
+        LogicalPlanPreOptimizer logicalPlanPreOptimizer,
         EsqlFunctionRegistry functionRegistry,
         LogicalPlanOptimizer logicalPlanOptimizer,
         Mapper mapper,
@@ -194,7 +194,7 @@ public EsqlSession(
         this.indicesExpressionGrouper = indicesExpressionGrouper;
         this.inferenceResolver = inferenceResolver;
         this.preMapper = new PreMapper(services);
-        this.preOptimizer = preOptimizer;
+        this.logicalPlanPreOptimizer = logicalPlanPreOptimizer;
         this.remoteClusterService = services.transportService().getRemoteClusterService();
     }
 
@@ -217,7 +217,7 @@ public void execute(EsqlQueryRequest request, EsqlExecutionInfo executionInfo, P
         analyzedPlan(parsed, executionInfo, request.filter(), new EsqlCCSUtils.CssPartialErrorsActionListener(executionInfo, listener) {
             @Override
             public void onResponse(LogicalPlan analyzedPlan) {
-                SubscribableListener.<LogicalPlan>newForked(l -> preOptimizer.preOptimize(analyzedPlan, l))
+                SubscribableListener.<LogicalPlan>newForked(l -> logicalPlanPreOptimizer.preOptimize(analyzedPlan, l))
                     .<LogicalPlan>andThen((l, p) -> preMapper.preMapper(optimizedPlan(p), l))
                     .<Result>andThen((l, p) -> executeOptimizedPlan(request, executionInfo, planRunner, p, l))
                     .addListener(listener);

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PreOptimizerTests.java renamed to x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanPreOptimizerTests.java

@@ -40,7 +40,7 @@
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.notNullValue;
 
-public class PreOptimizerTests extends ESTestCase {
+public class LogicalPlanPreOptimizerTests extends ESTestCase {
 
     public void testEvalFunctionEmbeddingBytes() throws Exception {
         testEvalFunctionEmbedding(BYTES_EMBEDDING_MODEL);
@@ -71,7 +71,7 @@ private void testEvalFunctionEmbedding(TextEmbeddingModelMock textEmbeddingModel
         String query = String.join(" ", randomArray(1, String[]::new, () -> randomAlphaOfLength(randomIntBetween(1, 10))));
         String fieldName = randomIdentifier();
 
-        PreOptimizer preOptimizer = new PreOptimizer(mockInferenceRunner(textEmbeddingModel), FoldContext.small());
+        LogicalPlanPreOptimizer preOptimizer = new LogicalPlanPreOptimizer(mockInferenceRunner(textEmbeddingModel), FoldContext.small());
         EsRelation relation = relation();
         Eval eval = new Eval(
             Source.EMPTY,
@@ -99,7 +99,7 @@ private void testKnnFunctionEmbedding(TextEmbeddingModelMock textEmbeddingModel)
         String inferenceId = randomUUID();
         String query = String.join(" ", randomArray(1, String[]::new, () -> randomAlphaOfLength(randomIntBetween(1, 10))));
 
-        PreOptimizer preOptimizer = new PreOptimizer(mockInferenceRunner(textEmbeddingModel), FoldContext.small());
+        LogicalPlanPreOptimizer preOptimizer = new LogicalPlanPreOptimizer(mockInferenceRunner(textEmbeddingModel), FoldContext.small());
         EsRelation relation = relation();
         Filter filter = new Filter(
             Source.EMPTY,