-
Notifications
You must be signed in to change notification settings - Fork 304
chore: native_datafusion to report scan task input metrics
#3842
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.
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
Changes from 2 commits
2ad3b6f
e2c6093
ac6b869
7c8377d
0ec7f55
b1a0d67
70252c2
4137783
aa24794
23b0e3c
44d012d
13d93fe
4d6f06f
e2299fe
9b8557c
b9925a8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,10 +79,21 @@ case class CometMetricNode(metrics: Map[String, SQLMetric], children: Seq[CometM | |
| } | ||
| } | ||
|
|
||
| // Called via JNI from `comet_metric_node.rs` | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is that the only place this will ever be called from? Otherwise I'm not sure the comment is necessary.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. IDE highlights the method as unused because it is called via JNI only, can be accidentally cleaned up. Added comments to clarify |
||
| def set_all_from_bytes(bytes: Array[Byte]): Unit = { | ||
| val metricNode = Metric.NativeMetricNode.parseFrom(bytes) | ||
| set_all(metricNode) | ||
| } | ||
|
|
||
| /** | ||
| * Finds a metric by name in this node or any descendant node. Returns the first match found via | ||
| * depth-first search. | ||
| */ | ||
| def findMetric(name: String): Option[SQLMetric] = { | ||
| metrics.get(name).orElse { | ||
| children.iterator.map(_.findMetric(name)).collectFirst { case Some(m) => m } | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Doesn't this just return the first match it finds with the metric name? Can't multiple plans have nodes that have "output_rows"?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. mm, what if we try to restrict |
||
| } | ||
| } | ||
| } | ||
|
|
||
| object CometMetricNode { | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -21,6 +21,7 @@ package org.apache.spark.sql.comet | |||||||||||
|
|
||||||||||||
| import scala.collection.mutable | ||||||||||||
|
|
||||||||||||
| import org.apache.spark.executor.InputMetrics | ||||||||||||
| import org.apache.spark.executor.ShuffleReadMetrics | ||||||||||||
| import org.apache.spark.executor.ShuffleWriteMetrics | ||||||||||||
| import org.apache.spark.scheduler.SparkListener | ||||||||||||
|
|
@@ -30,6 +31,8 @@ import org.apache.spark.sql.comet.execution.shuffle.CometNativeShuffle | |||||||||||
| import org.apache.spark.sql.comet.execution.shuffle.CometShuffleExchangeExec | ||||||||||||
| import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper | ||||||||||||
|
|
||||||||||||
| import org.apache.comet.CometConf | ||||||||||||
|
|
||||||||||||
| class CometTaskMetricsSuite extends CometTestBase with AdaptiveSparkPlanHelper { | ||||||||||||
|
|
||||||||||||
| import testImplicits._ | ||||||||||||
|
|
@@ -91,4 +94,66 @@ class CometTaskMetricsSuite extends CometTestBase with AdaptiveSparkPlanHelper { | |||||||||||
| } | ||||||||||||
| } | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| test("native_datafusion scan reports task-level input metrics matching Spark") { | ||||||||||||
| withParquetTable((0 until 10000).map(i => (i, (i + 1).toLong)), "tbl") { | ||||||||||||
| // Collect baseline input metrics from vanilla Spark (Comet disabled) | ||||||||||||
| val (sparkBytes, sparkRecords) = collectInputMetrics(CometConf.COMET_ENABLED.key -> "false") | ||||||||||||
|
|
||||||||||||
| // Collect input metrics from Comet native_datafusion scan | ||||||||||||
| val (cometBytes, cometRecords) = collectInputMetrics( | ||||||||||||
| CometConf.COMET_NATIVE_SCAN_IMPL.key -> CometConf.SCAN_NATIVE_DATAFUSION) | ||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||||||||||||
|
|
||||||||||||
| // Records must match exactly | ||||||||||||
| assert( | ||||||||||||
| cometRecords == sparkRecords, | ||||||||||||
| s"recordsRead mismatch: comet=$cometRecords, spark=$sparkRecords") | ||||||||||||
|
|
||||||||||||
| // Bytes should be in the same ballpark -- both read the same Parquet file(s), | ||||||||||||
| // but the exact byte count can differ due to reader implementation details | ||||||||||||
| // (e.g. footer reads, page headers, buffering granularity). | ||||||||||||
| assert(sparkBytes > 0, s"Spark bytesRead should be > 0, got $sparkBytes") | ||||||||||||
| assert(cometBytes > 0, s"Comet bytesRead should be > 0, got $cometBytes") | ||||||||||||
| val ratio = cometBytes.toDouble / sparkBytes.toDouble | ||||||||||||
| assert( | ||||||||||||
| ratio >= 0.8 && ratio <= 1.2, | ||||||||||||
| s"bytesRead ratio out of range: comet=$cometBytes, spark=$sparkBytes, ratio=$ratio") | ||||||||||||
| } | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| /** | ||||||||||||
| * Runs `SELECT * FROM tbl` with the given SQL config overrides and returns the aggregated | ||||||||||||
| * (bytesRead, recordsRead) across all tasks. | ||||||||||||
| */ | ||||||||||||
| private def collectInputMetrics(confs: (String, String)*): (Long, Long) = { | ||||||||||||
| val inputMetricsList = mutable.ArrayBuffer.empty[InputMetrics] | ||||||||||||
|
|
||||||||||||
| val listener = new SparkListener { | ||||||||||||
| override def onTaskEnd(taskEnd: SparkListenerTaskEnd): Unit = { | ||||||||||||
| val im = taskEnd.taskMetrics.inputMetrics | ||||||||||||
| inputMetricsList.synchronized { | ||||||||||||
| inputMetricsList += im | ||||||||||||
| } | ||||||||||||
| } | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| spark.sparkContext.addSparkListener(listener) | ||||||||||||
| try { | ||||||||||||
| // Drain any earlier events | ||||||||||||
| spark.sparkContext.listenerBus.waitUntilEmpty() | ||||||||||||
|
|
||||||||||||
| withSQLConf(confs: _*) { | ||||||||||||
| sql("SELECT * FROM tbl").collect() | ||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
add a filter to make it more realistic
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks @martin-g why the filter would be needed? I'd prefer to keep repro as simple as possible
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A filter would show the discrepancy/incorrect values when scan isn't the first child node. |
||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| spark.sparkContext.listenerBus.waitUntilEmpty() | ||||||||||||
|
|
||||||||||||
| assert(inputMetricsList.nonEmpty, s"No input metrics found for confs=$confs") | ||||||||||||
| val totalBytes = inputMetricsList.map(_.bytesRead).sum | ||||||||||||
| val totalRecords = inputMetricsList.map(_.recordsRead).sum | ||||||||||||
| (totalBytes, totalRecords) | ||||||||||||
| } finally { | ||||||||||||
| spark.sparkContext.removeSparkListener(listener) | ||||||||||||
| } | ||||||||||||
| } | ||||||||||||
| } | ||||||||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
foreachalready handles theNonecase for finding the metric, so I find wrapping this inifunnecessary. You savectx.taskMetrics().inputMetricsbut the result is oddly-structured conditional logic.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
agree