Skip to content

[SPARK-41003][SQL] BHJ LeftAnti does not update numOutputRows when codegen is disabled #38489

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
cxzl25 wants to merge 3 commits into from
Closed

[SPARK-41003][SQL] BHJ LeftAnti does not update numOutputRows when codegen is disabled #38489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2db8f6d
numOutputRows
cxzl25 Nov 3, 2022
f93f0a2
add UT
cxzl25 Nov 24, 2022
9af0043
nit
cxzl25 Nov 25, 2022
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
3 changes: 3 additions & 0 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/joins/BroadcastHashJoinExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ case class BroadcastHashJoinExec(
// Anti Join: Drop the row on the streamed side if it is a match on the build
hashed.get(lookupKey) == null
}
}).map(row => {
numOutputRows += 1
row
})
}
}
Expand Down
25 changes: 24 additions & 1 deletion 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 @@ -36,7 +36,7 @@ import org.apache.spark.sql.execution.aggregate.HashAggregateExec
import org.apache.spark.sql.execution.command.DataWritingCommandExec
import org.apache.spark.sql.execution.datasources.{BasicWriteJobStatsTracker, SQLHadoopMapReduceCommitProtocol}
import org.apache.spark.sql.execution.exchange.{BroadcastExchangeExec, ShuffleExchangeExec}
import org.apache.spark.sql.execution.joins.ShuffledHashJoinExec
import org.apache.spark.sql.execution.joins.{BroadcastHashJoinExec, ShuffledHashJoinExec}
import org.apache.spark.sql.functions._
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.test.SharedSparkSession
Expand Down Expand Up @@ -842,6 +842,29 @@ class SQLMetricsSuite extends SharedSparkSession with SQLMetricsTestUtils
assert(createTableAsSelect.metrics("numOutputRows").value == 1)
}
}

test("SPARK-41003: BHJ LeftAnti does not update numOutputRows when codegen is disabled") {
Seq(true, false).foreach { enableWholeStage =>
withSQLConf(SQLConf.WHOLESTAGE_CODEGEN_ENABLED.key -> enableWholeStage.toString) {
withSQLConf(SQLConf.OPTIMIZE_NULL_AWARE_ANTI_JOIN.key -> "true") {
withTable("t1", "t2") {
spark.range(4).write.saveAsTable("t1")
spark.range(2).write.saveAsTable("t2")
val df = sql("SELECT * FROM t1 WHERE id NOT IN (SELECT id FROM t2)")
df.collect()
val plan = df.queryExecution.executedPlan

val joins = plan.collect {
case s: BroadcastHashJoinExec => s
}

assert(joins.size === 1)
testMetricsInSparkPlanOperator(joins.head, Map("numOutputRows" -> 2))
}
}
}
}
}
}

case class CustomFileCommitProtocol(
Expand Down