You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "asl3 (via GitHub)" <gi...@apache.org> on 2025/12/23 00:01:55 UTC
[PR] [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec` [spark]
asl3 opened a new pull request, #53571:
URL: https://github.com/apache/spark/pull/53571
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'common/utils/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
Add `numSourceRows` metric for `MergeIntoExec`, from source node's `numOutputRows`.
Update the original attempt to allowlist supported nodes, to account the case of children nodes which do not correctly propagate the numOutputRows metric (e.g. SparkExtension nodes). For non-supported nodes, the default `numSourceRows` returned is -1.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
Improve completeness and debuggability of Merge Into metrics.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as new features, bug fixes, or other behavior changes. Documentation-only updates are not considered user-facing changes.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
Unit test cases for numSourceNodes metric, with an added test case for empty source.
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
No.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec` [spark]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #53571:
URL: https://github.com/apache/spark/pull/53571#issuecomment-4416843971
We're closing this PR because it hasn't been updated in a while. This isn't a judgement on the merit of the PR in any way. It's just a way of keeping the PR queue manageable.
If you'd like to revive this PR, please reopen it and ask a committer to remove the Stale tag!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec` [spark]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] closed pull request #53571: [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec`
URL: https://github.com/apache/spark/pull/53571
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec` [spark]
Posted by "asl3 (via GitHub)" <gi...@apache.org>.
asl3 commented on code in PR #53571:
URL: https://github.com/apache/spark/pull/53571#discussion_r2724639720
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/WriteToDataSourceV2Exec.scala:
##########
@@ -504,6 +508,54 @@ trait V2TableWriteExec extends V2CommandExec with UnaryExecNode with AdaptiveSpa
)
}
}
+
+ private object SourceAncestor {
+ def unapply(p: SparkPlan): Option[SparkPlan] = p match {
+ case w: WholeStageCodegenExec => Some(w.child)
+ case i: InputAdapter => Some(i.child)
+ case p: ProjectExec => Some(p.child)
Review Comment:
Agreed, updated. and these are pass-through operators or wrappers which lack the `numOutputRows`, mostly from observing tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec` [spark]
Posted by "szehon-ho (via GitHub)" <gi...@apache.org>.
szehon-ho commented on code in PR #53571:
URL: https://github.com/apache/spark/pull/53571#discussion_r2743886272
##########
sql/catalyst/src/main/java/org/apache/spark/sql/connector/write/MergeSummary.java:
##########
@@ -27,6 +27,11 @@
@Evolving
public interface MergeSummary extends WriteSummary {
+ /**
+ * Returns the number of source rows.
+ */
+ long numSourceRows();
Review Comment:
nit: add -1 if not found?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec` [spark]
Posted by "szehon-ho (via GitHub)" <gi...@apache.org>.
szehon-ho commented on code in PR #53571:
URL: https://github.com/apache/spark/pull/53571#discussion_r2683529968
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/WriteToDataSourceV2Exec.scala:
##########
@@ -504,6 +508,54 @@ trait V2TableWriteExec extends V2CommandExec with UnaryExecNode with AdaptiveSpa
)
}
}
+
+ private object SourceAncestor {
+ def unapply(p: SparkPlan): Option[SparkPlan] = p match {
+ case w: WholeStageCodegenExec => Some(w.child)
+ case i: InputAdapter => Some(i.child)
+ case p: ProjectExec => Some(p.child)
+ case f: FilterExec => Some(f.child)
+ case s: SortExec => Some(s.child)
+ case e: ShuffleExchangeExec => Some(e.child)
+ case a: AQEShuffleReadExec => Some(a.child)
+ case q: QueryStageExec => Some(q.plan)
+ case _ => None
+ }
+ }
+
+ private def getNumSourceRows(mergeRowsExec: MergeRowsExec): Long = {
+ def hasTargetTable(plan: SparkPlan): Boolean = {
+ collectFirst(plan) {
+ case scan @ BatchScanExec(_, _, _, _, _: RowLevelOperationTable, _) => scan
+ }.isDefined
+ }
+
+ def findSource(plan: SparkPlan): Long = plan match {
+ case SourceAncestor(child) =>
+ findSource(child)
+ case n if n.metrics.contains("numOutputRows") =>
+ n.metrics("numOutputRows").value
+ case _ =>
+ -1L
+ }
+
+ val joinOpt = collectFirst(mergeRowsExec.child) { case j: BaseJoinExec => j }
+
+ joinOpt match {
+ case Some(join) =>
+ // Merge with join, find source side of the join
+ val sourceSide = if (hasTargetTable(join.left)) join.right else join.left
+ findSource(sourceSide)
+ case None =>
+ // Group-based merge, no join.
Review Comment:
the comment is a bit off, group-based still have join. Group-based refers to a mode that is copy-on-write (ie, no delete vectors/merge-on-read). Join disappears due to some kind of optimizater rule (not sure the name of it)
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/WriteToDataSourceV2Exec.scala:
##########
@@ -504,6 +508,54 @@ trait V2TableWriteExec extends V2CommandExec with UnaryExecNode with AdaptiveSpa
)
}
}
+
+ private object SourceAncestor {
+ def unapply(p: SparkPlan): Option[SparkPlan] = p match {
+ case w: WholeStageCodegenExec => Some(w.child)
+ case i: InputAdapter => Some(i.child)
+ case p: ProjectExec => Some(p.child)
Review Comment:
I am wondering, is Project/FilterExec needed, as those have numOutputRows? What format of SparkPlan p is here, that make use need those?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec` [spark]
Posted by "szehon-ho (via GitHub)" <gi...@apache.org>.
szehon-ho commented on code in PR #53571:
URL: https://github.com/apache/spark/pull/53571#discussion_r2743886272
##########
sql/catalyst/src/main/java/org/apache/spark/sql/connector/write/MergeSummary.java:
##########
@@ -27,6 +27,11 @@
@Evolving
public interface MergeSummary extends WriteSummary {
+ /**
+ * Returns the number of source rows.
+ */
+ long numSourceRows();
Review Comment:
nit: add -1 if not found to the comment ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec` [spark]
Posted by "szehon-ho (via GitHub)" <gi...@apache.org>.
szehon-ho commented on code in PR #53571:
URL: https://github.com/apache/spark/pull/53571#discussion_r2743884259
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/WriteToDataSourceV2Exec.scala:
##########
@@ -504,6 +508,53 @@ trait V2TableWriteExec extends V2CommandExec with UnaryExecNode with AdaptiveSpa
)
}
}
+
+ private object SourceAncestor {
+ def unapply(p: SparkPlan): Option[SparkPlan] = p match {
Review Comment:
can we add a comment?
```suggestion
// Bypass known node types that do not change numOutputRows metric
def unapply(p: SparkPlan): Option[SparkPlan] = p match {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec` [spark]
Posted by "asl3 (via GitHub)" <gi...@apache.org>.
asl3 commented on code in PR #53571:
URL: https://github.com/apache/spark/pull/53571#discussion_r2724639720
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/WriteToDataSourceV2Exec.scala:
##########
@@ -504,6 +508,54 @@ trait V2TableWriteExec extends V2CommandExec with UnaryExecNode with AdaptiveSpa
)
}
}
+
+ private object SourceAncestor {
+ def unapply(p: SparkPlan): Option[SparkPlan] = p match {
+ case w: WholeStageCodegenExec => Some(w.child)
+ case i: InputAdapter => Some(i.child)
+ case p: ProjectExec => Some(p.child)
Review Comment:
Agreed, updated. and these are pass-through operators or wrappers which lack the `numOutputRows`, mostly from observing tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec` [spark]
Posted by "asl3 (via GitHub)" <gi...@apache.org>.
asl3 commented on code in PR #53571:
URL: https://github.com/apache/spark/pull/53571#discussion_r2725874814
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/WriteToDataSourceV2Exec.scala:
##########
@@ -504,6 +508,54 @@ trait V2TableWriteExec extends V2CommandExec with UnaryExecNode with AdaptiveSpa
)
}
}
+
+ private object SourceAncestor {
+ def unapply(p: SparkPlan): Option[SparkPlan] = p match {
+ case w: WholeStageCodegenExec => Some(w.child)
+ case i: InputAdapter => Some(i.child)
+ case p: ProjectExec => Some(p.child)
Review Comment:
I find that this test for example fails when we remove ProjectExec `Merge metrics with matched, not matched, and not matched by source clauses: update`
The source side plan is like:
```
Sort [pk#204 ASC NULLS FIRST], false, 0
+- AQEShuffleRead coalesced
+- ShuffleQueryStage 1
+- Exchange hashpartitioning(pk#204, 5), ENSURE_REQUIREMENTS, [plan_id=335]
+- *(2) Project [value#200 AS pk#204, true AS __row_from_source#217]
+- *(2) LocalTableScan [value#200]
```
seems ProjectExec does not guarantee to have numOutputRows
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54310][SQL] Add `numSourceRows` metric for `MergeIntoExec` [spark]
Posted by "szehon-ho (via GitHub)" <gi...@apache.org>.
szehon-ho commented on code in PR #53571:
URL: https://github.com/apache/spark/pull/53571#discussion_r2739428425
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/WriteToDataSourceV2Exec.scala:
##########
@@ -504,6 +508,54 @@ trait V2TableWriteExec extends V2CommandExec with UnaryExecNode with AdaptiveSpa
)
}
}
+
+ private object SourceAncestor {
+ def unapply(p: SparkPlan): Option[SparkPlan] = p match {
+ case w: WholeStageCodegenExec => Some(w.child)
+ case i: InputAdapter => Some(i.child)
+ case p: ProjectExec => Some(p.child)
Review Comment:
I checked the code, you are right. At least FilterExec has it , though, so we can remove that case?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org