Remove plan time from profiling

Author: carlosdelest

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/PlanTimeProfile.java

@@ -22,42 +22,35 @@
  *
  */
 public final class PlanTimeProfile implements Writeable, ToXContentObject {
-    private long planNanos;
     private long logicalOptimizationNanos;
     private long physicalOptimizationNanos;
 
     /**
      * @param logicalOptimizationNanos  Time spent on local logical plan optimization (in nanoseconds)
      * @param physicalOptimizationNanos Time spent on local physical plan optimization (in nanoseconds)
      */
-    public PlanTimeProfile(long planNanos, long logicalOptimizationNanos, long physicalOptimizationNanos) {
-        this.planNanos = planNanos;
+    public PlanTimeProfile(long logicalOptimizationNanos, long physicalOptimizationNanos) {
         this.logicalOptimizationNanos = logicalOptimizationNanos;
         this.physicalOptimizationNanos = physicalOptimizationNanos;
     }
 
     public PlanTimeProfile() {
-        this.planNanos = 0L;
         this.logicalOptimizationNanos = 0L;
         this.physicalOptimizationNanos = 0L;
     }
 
     public PlanTimeProfile(StreamInput in) throws IOException {
-        this(in.readVLong(), in.readVLong(), in.readVLong());
+        this(in.readVLong(), in.readVLong());
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeVLong(planNanos);
         out.writeVLong(logicalOptimizationNanos);
         out.writeVLong(physicalOptimizationNanos);
     }
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        if (planNanos > 0) {
-            builder.field("plan_nanos", planNanos);
-        }
         if (logicalOptimizationNanos > 0) {
             builder.field("logical_optimization_nanos", logicalOptimizationNanos);
         }
@@ -67,10 +60,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         return builder;
     }
 
-    public void addPlanTime(long planNanos) {
-        this.planNanos = this.planNanos + planNanos;
-    }
-
     public void addLogicalOptimizationPlanTime(long logicalOptimizationPlanTime) {
         this.logicalOptimizationNanos = this.logicalOptimizationNanos + logicalOptimizationPlanTime;
     }
@@ -84,22 +73,18 @@ public boolean equals(Object obj) {
         if (obj == this) return true;
         if (obj == null || obj.getClass() != this.getClass()) return false;
         var that = (PlanTimeProfile) obj;
-        return this.planNanos == that.planNanos
-            && this.logicalOptimizationNanos == that.logicalOptimizationNanos
+        return this.logicalOptimizationNanos == that.logicalOptimizationNanos
             && this.physicalOptimizationNanos == that.physicalOptimizationNanos;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(planNanos, logicalOptimizationNanos, physicalOptimizationNanos);
+        return Objects.hash(logicalOptimizationNanos, physicalOptimizationNanos);
     }
 
     @Override
     public String toString() {
         return "PlanTimeProfile["
-            + "planNanos="
-            + planNanos
-            + ", "
             + "logicalOptimizationNanos="
             + logicalOptimizationNanos
             + ", "

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

@@ -224,20 +224,11 @@ public static PhysicalPlan localPlan(
     ) {
         final LocalMapper localMapper = new LocalMapper();
         var isCoordPlan = new Holder<>(Boolean.TRUE);
-        long planStartNanos = 0L;
-        boolean profilingEnabled = planTimeProfile != null;
-        if (profilingEnabled) {
-            planStartNanos = System.nanoTime();
-        }
         Set<PhysicalPlan> lookupJoinExecRightChildren = plan.collect(LookupJoinExec.class::isInstance)
             .stream()
             .map(x -> ((LookupJoinExec) x).right())
             .collect(Collectors.toSet());
 
-        if (profilingEnabled) {
-            planTimeProfile.addPlanTime(System.nanoTime() - planStartNanos);
-        }
-
         PhysicalPlan localPhysicalPlan = plan.transformUp(FragmentExec.class, f -> {
             if (lookupJoinExecRightChildren.contains(f)) {
                 // Do not optimize the right child of a lookup join exec
@@ -248,6 +239,7 @@ public static PhysicalPlan localPlan(
             isCoordPlan.set(Boolean.FALSE);
 
             // Logical optimization
+            boolean profilingEnabled = planTimeProfile != null;
             long logicalStartNanos = profilingEnabled ? System.nanoTime() : 0;
             LogicalPlan optimizedFragment = logicalOptimizer.localOptimize(f.fragment());
             if (profilingEnabled) {

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

@@ -327,17 +327,10 @@ public void executePlan(
         Supplier<ExchangeSink> exchangeSinkSupplier,
         PlanTimeProfile planTimeProfile
     ) {
-        long startTime = 0L;
-        if (configuration.profile()) {
-            startTime = System.nanoTime();
-        }
         Tuple<PhysicalPlan, PhysicalPlan> coordinatorAndDataNodePlan = PlannerUtils.breakPlanBetweenCoordinatorAndDataNode(
             physicalPlan,
             configuration
         );
-        if (configuration.profile()) {
-            planTimeProfile.addPlanTime(System.nanoTime() - startTime);
-        }
         final List<Page> collectedPages = Collections.synchronizedList(new ArrayList<>());
         listener = listener.delegateResponse((l, e) -> {
             collectedPages.forEach(p -> Releasables.closeExpectNoException(p::releaseBlocks));

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

@@ -568,13 +568,8 @@ public void messageReceived(DataNodeRequest request, TransportChannel channel, T
         Configuration configuration = request.configuration();
         // We can avoid synchronization (for the most part) since the array elements are never modified, and the array is only added to,
         // with its size being known before we start the computation.
-        long planTime = 0L;
         PlanTimeProfile planTimeProfile = null;
         if (request.plan() instanceof ExchangeSinkExec plan) {
-            long startPlanTime = 0L;
-            if (configuration.profile()) {
-                startPlanTime = System.nanoTime();
-            }
             reductionPlan = ComputeService.reductionPlan(
                 computeService.plannerSettings(),
                 computeService.createFlags(),
@@ -586,8 +581,6 @@ public void messageReceived(DataNodeRequest request, TransportChannel channel, T
             );
             if (configuration.profile()) {
                 planTimeProfile = new PlanTimeProfile();
-                planTimeProfile.addPlanTime(System.nanoTime() - startPlanTime);
-
             }
         } else {
             listener.onFailure(new IllegalStateException("expected exchange sink for a remote compute; got " + request.plan()));

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

@@ -74,7 +74,7 @@ private List<PlanProfile> randomPlanProfiles() {
     }
 
     private PlanTimeProfile randomPlanTimeProfile() {
-        return randomBoolean() ? null : new PlanTimeProfile(randomNonNegativeLong(), randomNonNegativeLong(), randomNonNegativeLong());
+        return randomBoolean() ? null : new PlanTimeProfile(randomNonNegativeLong(), randomNonNegativeLong());
     }
 
     private OperatorStatus randomOperatorStatus() {

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

@@ -95,7 +95,7 @@ private DriverCompletionInfo randomCompletionInfo() {
     }
 
     private PlanTimeProfile randomPlanTimeProfile() {
-        return randomBoolean() ? null : new PlanTimeProfile(randomNonNegativeLong(), randomNonNegativeLong(), randomNonNegativeLong());
+        return randomBoolean() ? null : new PlanTimeProfile(randomNonNegativeLong(), randomNonNegativeLong());
     }
 
     public void testEmpty() {