Skip to content

[SPARK-54749][SQL] Fix incorrect numOutputRows metric in OneRowRelationExec #53520

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
cfmcgrady wants to merge 2 commits into from
+27 −6
Closed

[SPARK-54749][SQL] Fix incorrect numOutputRows metric in OneRowRelationExec #53520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea820a8
Fix incorrect numOutputRows metric in OneRowRelationExec
cfmcgrady Dec 18, 2025
3c2723a
address comment
cfmcgrady Dec 18, 2025
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
14 changes: 8 additions & 6 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/ExistingRDD.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,23 +360,25 @@ case class OneRowRelationExec() extends LeafExecNode
override val output: Seq[Attribute] = Nil

private val rdd: RDD[InternalRow] = {
val numOutputRows = longMetric("numOutputRows")
session
.sparkContext
.parallelize(Seq(""), 1)
.mapPartitionsInternal { _ =>
val proj = UnsafeProjection.create(Seq.empty[Expression])
Iterator(proj.apply(InternalRow.empty)).map { r =>
numOutputRows += 1
r
}
Iterator(proj.apply(InternalRow.empty))
}
}

override lazy val metrics = Map(
"numOutputRows" -> SQLMetrics.createMetric(sparkContext, "number of output rows"))

protected override def doExecute(): RDD[InternalRow] = rdd
protected override def doExecute(): RDD[InternalRow] = {
val numOutputRows = longMetric("numOutputRows")
rdd.map { r =>
numOutputRows += 1
r
}
}

override def simpleString(maxFields: Int): String = s"$nodeName[]"

Expand Down
19 changes: 19 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/metric/SQLMetricsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,25 @@ class SQLMetricsSuite extends SharedSparkSession with SQLMetricsTestUtils
}
}

test("SPARK-54749: OneRowRelation metrics") {
Seq((1L, "false"), (2L, "true")).foreach { case (nodeId, enableWholeStage) =>
withSQLConf(SQLConf.WHOLESTAGE_CODEGEN_ENABLED.key -> enableWholeStage) {
val df = spark.sql("select 1 as c1")
val oneRowRelation = df.queryExecution.executedPlan.collect {
case oneRowRelation: OneRowRelationExec => oneRowRelation
}
df.collect()
sparkContext.listenerBus.waitUntilEmpty()
assert(oneRowRelation.size == 1)

val expected = Map("number of output rows" -> 1L)
testSparkPlanMetrics(df.toDF(), 1, Map(
nodeId -> (("Scan OneRowRelation", expected))))
}
}
}


test("Recursive CTEs metrics") {
withSQLConf(SQLConf.OPTIMIZER_EXCLUDED_RULES.key -> "") {
val df = sql(
Expand Down