diff --git a/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java b/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java index 5174a14bc980f..4eaf73d08a761 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java +++ b/presto-main-base/src/main/java/com/facebook/presto/event/QueryMonitor.java @@ -235,6 +235,7 @@ public void queryImmediateFailureEvent(BasicQueryInfo queryInfo, ExecutionFailur ofMillis(0), Optional.empty(), ofMillis(0), + ofMillis(0), 0, 0, 0, @@ -446,6 +447,7 @@ private QueryStatistics createQueryStatistics(QueryInfo queryInfo) ofMillis(queryStats.getTotalPlanningTime().toMillis()), Optional.of(ofMillis(queryStats.getAnalysisTime().toMillis())), ofMillis(queryStats.getExecutionTime().toMillis()), + ofMillis(queryStats.getFinishingTime().toMillis()), queryStats.getPeakRunningTasks(), queryStats.getPeakUserMemoryReservation().toBytes(), queryStats.getPeakTotalMemoryReservation().toBytes(), @@ -487,6 +489,7 @@ private QueryStatistics createQueryStatistics(BasicQueryInfo basicQueryInfo) ofMillis(0), Optional.of(ofMillis(0)), ofMillis(queryStats.getExecutionTime().toMillis()), + ofMillis(0), queryStats.getPeakRunningTasks(), queryStats.getPeakUserMemoryReservation().toBytes(), queryStats.getPeakTotalMemoryReservation().toBytes(), diff --git a/presto-main/src/test/java/com/facebook/presto/eventlistener/TestEventListenerManager.java b/presto-main/src/test/java/com/facebook/presto/eventlistener/TestEventListenerManager.java index f6431d1e4cb40..01aa74bb5015a 100644 --- a/presto-main/src/test/java/com/facebook/presto/eventlistener/TestEventListenerManager.java +++ b/presto-main/src/test/java/com/facebook/presto/eventlistener/TestEventListenerManager.java @@ -272,6 +272,7 @@ public static QueryStatistics createDummyQueryStatistics() planningTime, analysisTime, executionTime, + Duration.ofMillis(500), peakRunningTasks, peakUserMemoryBytes, peakTotalNonRevocableMemoryBytes, diff --git a/presto-openlineage-event-listener/src/test/java/com/facebook/presto/plugin/openlineage/PrestoEventData.java b/presto-openlineage-event-listener/src/test/java/com/facebook/presto/plugin/openlineage/PrestoEventData.java index fcbfee384a847..d4ff697173fa4 100644 --- a/presto-openlineage-event-listener/src/test/java/com/facebook/presto/plugin/openlineage/PrestoEventData.java +++ b/presto-openlineage-event-listener/src/test/java/com/facebook/presto/plugin/openlineage/PrestoEventData.java @@ -98,6 +98,7 @@ private PrestoEventData() Duration.ofSeconds(0), // planningTime Optional.empty(), // analysisTime Duration.ofSeconds(1), // executionTime + Duration.ofSeconds(0), // finishingTime 0, // peakRunningTasks 0L, // peakUserMemoryBytes 0L, // peakTotalNonRevocableMemoryBytes diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/QueryStatistics.java b/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/QueryStatistics.java index 7004a91f5dd9d..f50c1c70afae7 100644 --- a/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/QueryStatistics.java +++ b/presto-spi/src/main/java/com/facebook/presto/spi/eventlistener/QueryStatistics.java @@ -35,6 +35,7 @@ public class QueryStatistics private final Duration planningTime; private final Optional analysisTime; private final Duration executionTime; + private final Duration finishingTime; private final int peakRunningTasks; private final long peakUserMemoryBytes; @@ -75,6 +76,7 @@ public QueryStatistics( Duration planningTime, Optional analysisTime, Duration executionTime, + Duration finishingTime, int peakRunningTasks, long peakUserMemoryBytes, long peakTotalNonRevocableMemoryBytes, @@ -110,6 +112,7 @@ public QueryStatistics( this.planningTime = requireNonNull(planningTime, "planningTime is null"); this.analysisTime = requireNonNull(analysisTime, "analysisTime is null"); this.executionTime = requireNonNull(executionTime, "executionTime is null"); + this.finishingTime = requireNonNull(finishingTime, "finishingTime is null"); this.peakRunningTasks = peakRunningTasks; this.peakUserMemoryBytes = peakUserMemoryBytes; this.peakTotalNonRevocableMemoryBytes = peakTotalNonRevocableMemoryBytes; @@ -198,6 +201,11 @@ public Duration getExecutionTime() return executionTime; } + public Duration getFinishingTime() + { + return finishingTime; + } + public int getPeakRunningTasks() { return peakRunningTasks;