Skip to content

[SPARK-54988][SQL] Simplify the implementation of ObservationManager.tryComplete #53752

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
heyihong wants to merge 1 commit into from
Closed

[SPARK-54988][SQL] Simplify the implementation of ObservationManager.tryComplete #53752

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 9 additions & 18 deletions sql/core/src/main/scala/org/apache/spark/sql/classic/ObservationManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,27 +54,18 @@ private[sql] class ObservationManager(session: SparkSession) {
})

private def tryComplete(qe: QueryExecution): Unit = {
val allMetrics = qe.observedMetrics
// Use lazy val to defer collecting the observed metrics until it is needed so that tryComplete
// can finish faster (e.g., when the logical plan doesn't contain CollectMetrics).
lazy val allMetrics = qe.observedMetrics
qe.logical.foreachWithSubqueriesAndPruning(
_.containsPattern(TreePattern.COLLECT_METRICS)) {
case c: CollectMetrics =>
val keyExists = observations.containsKey((c.name, c.dataframeId))
val metrics = allMetrics.get(c.name)
if (keyExists && metrics.isEmpty) {
// If the key exists but no metrics were collected, it means for some reason the metrics
// could not be collected. This can happen e.g., if the CollectMetricsExec was optimized
// away.
val observation = observations.remove((c.name, c.dataframeId))
if (observation != null) {
observation.setMetricsAndNotify(Row.empty)
}
} else {
metrics.foreach { metrics =>
val observation = observations.remove((c.name, c.dataframeId))
if (observation != null) {
observation.setMetricsAndNotify(metrics)
}
}
val observation = observations.remove((c.name, c.dataframeId))
if (observation != null) {
// If the key exists but no metrics were collected, it means for some reason the
// metrics could not be collected. This can happen e.g., if the CollectMetricsExec
// was optimized away.
observation.setMetricsAndNotify(allMetrics.getOrElse(c.name, Row.empty))
}
case _ =>
}
Expand Down