Add tracking of analysis time

as a Java bean. This is useful for tracking macro impact of planner
features like Quick Stats

Author: aaneja

presto-main/src/main/java/com/facebook/presto/execution/QueryManagerStats.java

@@ -53,6 +53,7 @@ public class QueryManagerStats
     private final CounterStat consumedInputBytes = new CounterStat();
     private final CounterStat consumedCpuTimeSecs = new CounterStat();
     private final TimeStat executionTime = new TimeStat(MILLISECONDS);
+    private final TimeStat analysisTime = new TimeStat(MILLISECONDS);
     private final TimeStat queuedTime = new TimeStat(MILLISECONDS);
     private final DistributionStat wallInputBytesRate = new DistributionStat();
     private final DistributionStat cpuInputByteRate = new DistributionStat();
@@ -101,6 +102,7 @@ private void queryFinished(BasicQueryInfo info)
         consumedInputBytes.update(info.getQueryStats().getRawInputDataSize().toBytes());
         consumedInputRows.update(info.getQueryStats().getRawInputPositions());
         executionTime.add(info.getQueryStats().getExecutionTime());
+        analysisTime.add(info.getQueryStats().getAnalysisTime());
         queuedTime.add(info.getQueryStats().getQueuedTime());
 
         long executionWallMillis = info.getQueryStats().getExecutionTime().toMillis();
@@ -273,6 +275,13 @@ public TimeStat getExecutionTime()
         return executionTime;
     }
 
+    @Managed
+    @Nested
+    public TimeStat getAnalysisTime()
+    {
+        return analysisTime;
+    }
+
     @Managed
     @Nested
     public TimeStat getQueuedTime()

presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java

@@ -379,6 +379,7 @@ public BasicQueryInfo getBasicQueryInfo(Optional<BasicStageExecutionStats> rootS
                 queryStateTimer.getQueuedTime(),
                 queryStateTimer.getElapsedTime(),
                 queryStateTimer.getExecutionTime(),
+                queryStateTimer.getAnalysisTime(),
 
                 getCurrentRunningTaskCount(),
                 getPeakRunningTaskCount(),

presto-main/src/main/java/com/facebook/presto/server/BasicQueryStats.java

@@ -50,6 +50,7 @@ public class BasicQueryStats
     private final Duration queuedTime;
     private final Duration elapsedTime;
     private final Duration executionTime;
+    private final Duration analysisTime;
 
     private final int runningTasks;
     private final int peakRunningTasks;
@@ -89,6 +90,7 @@ public BasicQueryStats(
             @JsonProperty("queuedTime") Duration queuedTime,
             @JsonProperty("elapsedTime") Duration elapsedTime,
             @JsonProperty("executionTime") Duration executionTime,
+            @JsonProperty("analysisTime") Duration analysisTime,
             @JsonProperty("runningTasks") int runningTasks,
             @JsonProperty("peakRunningTasks") int peakRunningTasks,
             @JsonProperty("totalDrivers") int totalDrivers,
@@ -119,7 +121,7 @@ public BasicQueryStats(
         this.queuedTime = requireNonNull(queuedTime, "queuedTime is null");
         this.elapsedTime = requireNonNull(elapsedTime, "elapsedTime is null");
         this.executionTime = requireNonNull(executionTime, "executionTime is null");
-
+        this.analysisTime = requireNonNull(analysisTime, "analysisTime is null");
         this.runningTasks = runningTasks;
         this.peakRunningTasks = peakRunningTasks;
 
@@ -162,6 +164,7 @@ public BasicQueryStats(QueryStats queryStats)
                 queryStats.getQueuedTime(),
                 queryStats.getElapsedTime(),
                 queryStats.getExecutionTime(),
+                queryStats.getAnalysisTime(),
                 queryStats.getRunningTasks(),
                 queryStats.getPeakRunningTasks(),
                 queryStats.getTotalDrivers(),
@@ -196,6 +199,7 @@ public static BasicQueryStats immediateFailureQueryStats()
                 new Duration(0, MILLISECONDS),
                 new Duration(0, MILLISECONDS),
                 new Duration(0, MILLISECONDS),
+                new Duration(0, MILLISECONDS),
                 0,
                 0,
                 0,
@@ -414,4 +418,11 @@ public int getRunningTasks()
     {
         return runningTasks;
     }
+
+    @ThriftField(29)
+    @JsonProperty
+    public Duration getAnalysisTime()
+    {
+        return analysisTime;
+    }
 }

presto-main/src/test/java/com/facebook/presto/execution/MockManagedQueryExecution.java

@@ -131,6 +131,7 @@ public BasicQueryInfo getBasicQueryInfo()
                         new Duration(3, NANOSECONDS),
                         new Duration(4, NANOSECONDS),
                         new Duration(5, NANOSECONDS),
+                        new Duration(1, NANOSECONDS),
                         5,
                         5,
                         6,

presto-main/src/test/java/com/facebook/presto/execution/TestNodeScheduler.java

@@ -183,6 +183,7 @@ private BasicQueryStats getBasicQueryStats(Duration executionTime)
                     defaultDuration,
                     defaultDuration,
                     executionTime,
+                    defaultDuration,
                     0,
                     0,
                     0,

presto-main/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStateProvider.java

@@ -751,6 +751,7 @@ private static BasicQueryInfo createQueryInfo(String queryId, QueryState state,
                         Duration.valueOf("8m"),
                         Duration.valueOf("7m"),
                         Duration.valueOf("34m"),
+                        Duration.valueOf("10m"),
                         11,
                         12,
                         13,

presto-tests/src/test/java/com/facebook/presto/memory/TestClusterMemoryLeakDetector.java

@@ -88,6 +88,7 @@ private static BasicQueryInfo createQueryInfo(String queryId, QueryState state)
                         Duration.valueOf("8m"),
                         Duration.valueOf("7m"),
                         Duration.valueOf("34m"),
+                        Duration.valueOf("10m"),
                         11,
                         12,
                         13,