Skip to content

[SPARK-40259][SQL][FOLLOWUP] Add cross-table DSv2 scan merge regression test #58202

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
cloud-fan wants to merge 1 commit into from
+24 −0
Closed

[SPARK-40259][SQL][FOLLOWUP] Add cross-table DSv2 scan merge regression test #58202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions ...core/src/test/scala/org/apache/spark/sql/execution/planmerging/DSv2PlanMergingSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class DSv2PlanMergingSuite extends QueryTest with SharedSparkSession

private val v2Source = classOf[FakeV2ProviderWithCustomSchema].getName
private val tbl = "scanmerge.t"
private val tbl2 = "scanmerge.t2"

before {
spark.conf.set("spark.sql.catalog.scanmerge",
Expand Down Expand Up @@ -174,6 +175,29 @@ class DSv2PlanMergingSuite extends QueryTest with SharedSparkSession
}
}

test("SPARK-40259: do not merge DSv2 scans from different tables") {
withTable(tbl, tbl2) {
sql(s"CREATE TABLE $tbl (part_col string, c1 int) USING $v2Source " +
"PARTITIONED BY (part_col)")
sql(s"CREATE TABLE $tbl2 (part_col string, c2 int) USING $v2Source " +
"PARTITIONED BY (part_col)")
sql(s"INSERT INTO $tbl VALUES ('a', 1), ('a', 2)")
sql(s"INSERT INTO $tbl2 VALUES ('a', 10), ('a', 30)")

val df = sql(
s"""
|SELECT
| (SELECT max(c1) FROM $tbl WHERE part_col IN ('a')) AS m1,
| (SELECT max(c2) FROM $tbl2 WHERE part_col IN ('a')) AS m2
|""".stripMargin)

checkAnswer(df, Row(2, 30))
val scans = v2Scans(df)
assert(scans.map(_.canonicalized).distinct.length == 2,
s"scans from different tables must remain separate:\n${df.queryExecution.optimizedPlan}")
}
}

test("SPARK-58549: a scan merge preserves the sources' reported key-grouped partitioning") {
val t = "scanmergereport.t2"
withTable(t) {
Expand Down