Record scheduled time in QueryCompletedEvent

trinodb · Nov 18, 2020 · 9790127 · 9790127
1 parent d19513a
commit 9790127
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/presto-main/src/main/java/io/prestosql/event/QueryMonitor.java b/presto-main/src/main/java/io/prestosql/event/QueryMonitor.java
@@ -157,6 +157,7 @@ public void queryImmediateFailureEvent(BasicQueryInfo queryInfo, ExecutionFailur
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
+                        Optional.empty(),
                         0,
                         0,
                         0,
@@ -238,6 +239,7 @@ private QueryStatistics createQueryStatistics(QueryInfo queryInfo)
                 ofMillis(queryStats.getTotalCpuTime().toMillis()),
                 ofMillis(queryStats.getElapsedTime().toMillis()),
                 ofMillis(queryStats.getQueuedTime().toMillis()),
+                Optional.of(ofMillis(queryStats.getTotalScheduledTime().toMillis())),
                 Optional.of(ofMillis(queryStats.getResourceWaitingTime().toMillis())),
                 Optional.of(ofMillis(queryStats.getAnalysisTime().toMillis())),
                 Optional.of(ofMillis(queryStats.getPlanningTime().toMillis())),

diff --git a/presto-spi/src/main/java/io/prestosql/spi/eventlistener/QueryStatistics.java b/presto-spi/src/main/java/io/prestosql/spi/eventlistener/QueryStatistics.java
@@ -24,6 +24,7 @@ public class QueryStatistics
     private final Duration cpuTime;
     private final Duration wallTime;
     private final Duration queuedTime;
+    private final Optional<Duration> scheduledTime;
     private final Optional<Duration> waitingTime;
     private final Optional<Duration> analysisTime;
     private final Optional<Duration> planningTime;
@@ -69,6 +70,7 @@ public QueryStatistics(
             Duration cpuTime,
             Duration wallTime,
             Duration queuedTime,
+            Optional<Duration> scheduledTime,
             Optional<Duration> waitingTime,
             Optional<Duration> analysisTime,
             Optional<Duration> planningTime,
@@ -97,8 +99,9 @@ public QueryStatistics(
     {
         this.cpuTime = requireNonNull(cpuTime, "cpuTime is null");
         this.wallTime = requireNonNull(wallTime, "wallTime is null");
-        this.waitingTime = requireNonNull(waitingTime, "waitingTime is null");
         this.queuedTime = requireNonNull(queuedTime, "queuedTime is null");
+        this.scheduledTime = requireNonNull(scheduledTime, "scheduledTime is null");
+        this.waitingTime = requireNonNull(waitingTime, "waitingTime is null");
         this.analysisTime = requireNonNull(analysisTime, "analysisTime is null");
         this.planningTime = requireNonNull(planningTime, "planningTime is null");
         this.executionTime = requireNonNull(executionTime, "executionTime is null");
@@ -140,6 +143,11 @@ public Duration getQueuedTime()
         return queuedTime;
     }
 
+    public Optional<Duration> getScheduledTime()
+    {
+        return scheduledTime;
+    }
+
     public Optional<Duration> getResourceWaitingTime()
     {
         return waitingTime;

diff --git a/presto-tests/src/test/java/io/prestosql/execution/TestEventListenerBasic.java b/presto-tests/src/test/java/io/prestosql/execution/TestEventListenerBasic.java
@@ -335,6 +335,7 @@ public void testOutputStats()
         assertEquals(statistics.getCpuTime().toMillis(), queryStats.getTotalCpuTime().toMillis());
         assertEquals(statistics.getWallTime().toMillis(), queryStats.getElapsedTime().toMillis());
         assertEquals(statistics.getQueuedTime().toMillis(), queryStats.getQueuedTime().toMillis());
+        assertEquals(statistics.getScheduledTime().get().toMillis(), queryStats.getTotalScheduledTime().toMillis());
         assertEquals(statistics.getResourceWaitingTime().get().toMillis(), queryStats.getResourceWaitingTime().toMillis());
         assertEquals(statistics.getAnalysisTime().get().toMillis(), queryStats.getAnalysisTime().toMillis());
         assertEquals(statistics.getPlanningTime().get().toMillis(), queryStats.getPlanningTime().toMillis());

diff --git a/presto-tests/src/test/java/io/prestosql/execution/TestEventListenerWithSplits.java b/presto-tests/src/test/java/io/prestosql/execution/TestEventListenerWithSplits.java
@@ -170,6 +170,7 @@ public void testSplitsForNormalQuery()
         assertTrue(statistics.isComplete());
 
         // Check only the presence because they are non-deterministic.
+        assertTrue(statistics.getScheduledTime().isPresent());
         assertTrue(statistics.getResourceWaitingTime().isPresent());
         assertTrue(statistics.getAnalysisTime().isPresent());
         assertTrue(statistics.getPlanningTime().isPresent());