Skip to content

[SPARK-29227][SS] Track rule info in optimization phase #25914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wenxuanguan wants to merge 5 commits into from
Closed

[SPARK-29227][SS] Track rule info in optimization phase #25914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53547b2
track rule info in optimization phase
wenxuanguan Sep 24, 2019
8a33aba
revert doc change
wenxuanguan Sep 24, 2019
060b329
add ut
wenxuanguan Oct 21, 2019
41fddba
add jira info in test name
wenxuanguan Oct 22, 2019
81b891c
Merge branch 'github-master' into spark-29227
wenxuanguan Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/IncrementalExecution.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ class IncrementalExecution(
*/
override
lazy val optimizedPlan: LogicalPlan = tracker.measurePhase(QueryPlanningTracker.OPTIMIZATION) {
sparkSession.sessionState.optimizer.execute(withCachedData) transformAllExpressions {
sparkSession.sessionState.optimizer.executeAndTrack(withCachedData,
tracker) transformAllExpressions {
Copy link
Member

@gatorsmile gatorsmile Nov 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpit: in most cases, we do not break the function call in the middle of parameter lists. We can change it to

    val sessionState = sparkSession.sessionState
    sessionState.optimizer.executeAndTrack(withCachedData, tracker).transformAllExpressions {

or

    sparkSession.sessionState.optimizer
      .executeAndTrack(withCachedData, tracker).transformAllExpressions {

case ts @ CurrentBatchTimestamp(timestamp, _, _) =>
logInfo(s"Current batch timestamp = $timestamp")
ts.toLiteral
Expand Down
24 changes: 22 additions & 2 deletions ...ore/src/test/scala/org/apache/spark/sql/execution/QueryPlanningTrackerEndToEndSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@

package org.apache.spark.sql.execution

import org.apache.spark.sql.test.SharedSparkSession
import org.apache.spark.sql.execution.streaming.{MemoryStream, StreamExecution}
import org.apache.spark.sql.streaming.StreamTest

class QueryPlanningTrackerEndToEndSuite extends SharedSparkSession {
class QueryPlanningTrackerEndToEndSuite extends StreamTest {
import testImplicits._

test("programmatic API") {
val df = spark.range(1000).selectExpr("count(*)")
Expand All @@ -38,4 +40,22 @@ class QueryPlanningTrackerEndToEndSuite extends SharedSparkSession {
assert(tracker.rules.nonEmpty)
}

test("SPARK-29227: Track rule info in optimization phase in streaming") {
val inputData = MemoryStream[Int]
val df = inputData.toDF()

def assertStatus(stream: StreamExecution): Unit = {
stream.processAllAvailable()
val tracker = stream.lastExecution.tracker
assert(tracker.phases.keys == Set("analysis", "optimization", "planning"))
assert(tracker.rules.nonEmpty)
}

testStream(df)(
StartStream(),
AddData(inputData, 1, 2, 3),
Execute(assertStatus),
StopStream)
}

}