-
Notifications
You must be signed in to change notification settings - Fork 28.9k
[SPARK-52578][SQL] Add numSourceRows metric for MergeIntoExec
#52669
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
Open
asl3
wants to merge
12
commits into
apache:master
Choose a base branch
from
asl3:merge-numsourcerows
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+346
−227
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
e2b8ae1
merge numsourcerows metric
asl3 3c08974
numsourcerows -1
asl3 262b1d1
comment
asl3 5bdb385
comment
asl3 1746f82
nit
asl3 36b14dd
format
asl3 c448379
fmt
asl3 e1e14b8
BaseJoinExec
asl3 25760a0
style, aqe tests
asl3 9f6ebea
Merge remote-tracking branch 'origin/master' into merge-numsourcerows
asl3 6944108
mergeSummary
asl3 62a8340
test
asl3 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,10 +31,11 @@ import org.apache.spark.sql.catalyst.util.RowDeltaUtils.{DELETE_OPERATION, INSER | |
| import org.apache.spark.sql.connector.catalog.{CatalogV2Util, Column, Identifier, StagedTable, StagingTableCatalog, Table, TableCatalog, TableInfo, TableWritePrivilege} | ||
| import org.apache.spark.sql.connector.expressions.Transform | ||
| import org.apache.spark.sql.connector.metric.CustomMetric | ||
| import org.apache.spark.sql.connector.write.{BatchWrite, DataWriter, DataWriterFactory, DeltaWrite, DeltaWriter, MergeSummaryImpl, PhysicalWriteInfoImpl, Write, WriterCommitMessage, WriteSummary} | ||
| import org.apache.spark.sql.connector.write.{BatchWrite, DataWriter, DataWriterFactory, DeltaWrite, DeltaWriter, MergeSummaryImpl, PhysicalWriteInfoImpl, RowLevelOperationTable, Write, WriterCommitMessage, WriteSummary} | ||
| import org.apache.spark.sql.errors.{QueryCompilationErrors, QueryExecutionErrors} | ||
| import org.apache.spark.sql.execution.{SparkPlan, SQLExecution, UnaryExecNode} | ||
| import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper | ||
| import org.apache.spark.sql.execution.joins.BaseJoinExec | ||
| import org.apache.spark.sql.execution.metric.{CustomMetrics, SQLMetric, SQLMetrics} | ||
| import org.apache.spark.sql.types.StructType | ||
| import org.apache.spark.util.{LongAccumulator, Utils} | ||
|
|
@@ -483,7 +484,9 @@ trait V2TableWriteExec extends V2CommandExec with UnaryExecNode with AdaptiveSpa | |
| private def getWriteSummary(query: SparkPlan): Option[WriteSummary] = { | ||
| collectFirst(query) { case m: MergeRowsExec => m }.map { n => | ||
| val metrics = n.metrics | ||
| val numSourceRows = getNumSourceRows(n) | ||
| MergeSummaryImpl( | ||
| numSourceRows, | ||
| metrics.get("numTargetRowsCopied").map(_.value).getOrElse(-1L), | ||
| metrics.get("numTargetRowsDeleted").map(_.value).getOrElse(-1L), | ||
| metrics.get("numTargetRowsUpdated").map(_.value).getOrElse(-1L), | ||
|
|
@@ -495,6 +498,40 @@ trait V2TableWriteExec extends V2CommandExec with UnaryExecNode with AdaptiveSpa | |
| ) | ||
| } | ||
| } | ||
|
|
||
| private def getNumSourceRows(mergeRowsExec: MergeRowsExec): Long = { | ||
| def hasTargetTable(plan: SparkPlan): Boolean = { | ||
| collectFirst(plan) { | ||
| case scan @ BatchScanExec(_, _, _, _, _: RowLevelOperationTable, _) => scan | ||
| }.isDefined | ||
| } | ||
|
|
||
| def findSourceScan(join: BaseJoinExec): Option[SparkPlan] = { | ||
| val leftHasTarget = hasTargetTable(join.left) | ||
| val rightHasTarget = hasTargetTable(join.right) | ||
|
|
||
| val sourceSide = if (leftHasTarget) { | ||
| Some(join.right) | ||
| } else if (rightHasTarget) { | ||
| Some(join.left) | ||
| } else { | ||
| None | ||
| } | ||
|
|
||
| sourceSide.flatMap { side => | ||
|
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. Maybe we don't need this, we want to find the first join child (on source side) with numOutputRows, else -1? |
||
| collectFirst(side) { | ||
| case source if source.metrics.contains("numOutputRows") => | ||
| source | ||
| } | ||
| } | ||
| } | ||
|
|
||
| (for { | ||
| join <- collectFirst(mergeRowsExec.child) { case j: BaseJoinExec => j } | ||
| sourceScan <- findSourceScan(join) | ||
| metric <- sourceScan.metrics.get("numOutputRows") | ||
| } yield metric.value).getOrElse(-1L) | ||
| } | ||
| } | ||
|
|
||
| trait WritingSparkTask[W <: DataWriter[InternalRow]] extends Logging with Serializable { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
The method name should reflect that its finding the source side child, not the source itself.