From 5ca38fd63233752f302225b1ab3d0f54f5847831 Mon Sep 17 00:00:00 2001 From: Yuanjian Li Date: Sun, 28 Jun 2020 11:36:45 +0800 Subject: [PATCH] fix --- .../scala/org/apache/spark/sql/execution/QueryExecution.scala | 2 +- .../spark/sql/execution/streaming/IncrementalExecution.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/QueryExecution.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/QueryExecution.scala index bf60427e5f3bf..791e432269632 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/QueryExecution.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/QueryExecution.scala @@ -131,7 +131,7 @@ class QueryExecution( Option(InsertAdaptiveSparkPlan(AdaptiveExecutionContext(sparkSession, this)))) } - private def executePhase[T](phase: String)(block: => T): T = sparkSession.withActive { + protected def executePhase[T](phase: String)(block: => T): T = sparkSession.withActive { tracker.measurePhase(phase)(block) } diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/IncrementalExecution.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/IncrementalExecution.scala index 09ae7692ec518..7773ac71c4954 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/IncrementalExecution.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/IncrementalExecution.scala @@ -76,7 +76,7 @@ class IncrementalExecution( * with the desired literal */ override - lazy val optimizedPlan: LogicalPlan = tracker.measurePhase(QueryPlanningTracker.OPTIMIZATION) { + lazy val optimizedPlan: LogicalPlan = executePhase(QueryPlanningTracker.OPTIMIZATION) { sparkSession.sessionState.optimizer.executeAndTrack(withCachedData, tracker) transformAllExpressions { case ts @ CurrentBatchTimestamp(timestamp, _, _) =>