Revert "attempt to narrow down issue"

This reverts commit bca0067.

Author: idegtiarenko

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

@@ -112,9 +112,9 @@ public interface PlanRunner {
     private final PreAnalyzer preAnalyzer;
     private final Verifier verifier;
     private final EsqlFunctionRegistry functionRegistry;
-    protected final LogicalPlanPreOptimizer logicalPlanPreOptimizer;
+    private final LogicalPlanPreOptimizer logicalPlanPreOptimizer;
     private final LogicalPlanOptimizer logicalPlanOptimizer;
-    protected final PreMapper preMapper;
+    private final PreMapper preMapper;
 
     private final Mapper mapper;
     private final PhysicalPlanOptimizer physicalPlanOptimizer;
@@ -204,7 +204,7 @@ public void optimizeAndExecute(
      * Execute an analyzed plan. Most code should prefer calling {@link #execute} but
      * this is public for testing.
      */
-    protected void executeOptimizedPlan(
+    private void executeOptimizedPlan(
         EsqlQueryRequest request,
         EsqlExecutionInfo executionInfo,
         PlanRunner planRunner,
@@ -804,7 +804,7 @@ private PhysicalPlan logicalPlanToPhysicalPlan(LogicalPlan optimizedPlan, EsqlQu
         return EstimatesRowSize.estimateRowSize(0, physicalPlan);
     }
 
-    protected LogicalPlan optimizedPlan(LogicalPlan logicalPlan) {
+    private LogicalPlan optimizedPlan(LogicalPlan logicalPlan) {
         if (logicalPlan.preOptimized() == false) {
             throw new IllegalStateException("Expected pre-optimized plan");
         }

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java

@@ -13,7 +13,6 @@
 import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.PlainActionFuture;
-import org.elasticsearch.action.support.SubscribableListener;
 import org.elasticsearch.common.Randomness;
 import org.elasticsearch.common.breaker.CircuitBreaker;
 import org.elasticsearch.common.collect.Iterators;
@@ -593,22 +592,7 @@ private ActualResults executePlan(BigArrays bigArrays) throws Exception {
             new PlanTelemetry(functionRegistry),
             null,
             EsqlTestUtils.MOCK_TRANSPORT_ACTION_SERVICES
-        ) {
-            @Override
-            public void optimizeAndExecute(
-                EsqlQueryRequest request,
-                EsqlExecutionInfo executionInfo,
-                PlanRunner planRunner,
-                LogicalPlan analyzedPlan,
-                ActionListener<Result> listener
-            ) {
-                SubscribableListener.<LogicalPlan>newForked(l -> logicalPlanPreOptimizer.preOptimize(analyzedPlan, l))
-                    .andThenApply(this::optimizedPlan)
-                    // .<LogicalPlan>andThen((l, p) -> preMapper.preMapper(p, l))
-                    .<Result>andThen((l, p) -> executeOptimizedPlan(request, executionInfo, planRunner, p, l))
-                    .addListener(listener);
-            }
-        };
+        );
         TestPhysicalOperationProviders physicalOperationProviders = testOperationProviders(foldCtx, testDatasets);
 
         PlainActionFuture<ActualResults> listener = new PlainActionFuture<>();