Skip to content

test: extend SPARK-43402 plan-match to CometNativeScanExec and retag to #4042 #4044

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

Draft
andygrove wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −3
Draft

test: extend SPARK-43402 plan-match to CometNativeScanExec and retag to #4042 #4044

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
11 changes: 8 additions & 3 deletions dev/diffs/4.0.1.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@ index 0df7f806272..92390bd819f 100644

test("non-matching optional group") {
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
index 2e33f6505ab..3a8b154b565 100644
index 2e33f6505ab..8fca1231d66 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/SubquerySuite.scala
@@ -23,11 +23,13 @@ import org.apache.spark.SparkRuntimeException
Expand Down Expand Up @@ -1365,13 +1365,13 @@ index 2e33f6505ab..3a8b154b565 100644
}
assert(exchanges.size === 1)
}
@@ -2674,22 +2688,31 @@ class SubquerySuite extends QueryTest
@@ -2674,22 +2688,36 @@ class SubquerySuite extends QueryTest
}
}

- test("SPARK-43402: FileSourceScanExec supports push down data filter with scalar subquery") {
+ test("SPARK-43402: FileSourceScanExec supports push down data filter with scalar subquery",
+ IgnoreCometNativeDataFusion("https://github.com/apache/datafusion-comet/issues/3315")) {
+ IgnoreCometNativeDataFusion("https://github.com/apache/datafusion-comet/issues/4042")) {
def checkFileSourceScan(query: String, answer: Seq[Row]): Unit = {
val df = sql(query)
checkAnswer(df, answer)
Expand All @@ -1380,6 +1380,7 @@ index 2e33f6505ab..3a8b154b565 100644
+ val dataSourceScanExec = collect(df.queryExecution.executedPlan) {
+ case f: FileSourceScanLike => f
+ case c: CometScanExec => c
+ case n: CometNativeScanExec => n
}
sparkContext.listenerBus.waitUntilEmpty()
- assert(fileSourceScanExec.size === 1)
Expand All @@ -1396,6 +1397,10 @@ index 2e33f6505ab..3a8b154b565 100644
+ c.dataFilters.flatMap(_.collect {
+ case s: ScalarSubquery => s
+ })
+ case n: CometNativeScanExec =>
+ n.dataFilters.flatMap(_.collect {
+ case s: ScalarSubquery => s
+ })
+ }
assert(scalarSubquery.length === 1)
assert(scalarSubquery.head.plan.isInstanceOf[ReusedSubqueryExec])
Expand Down
Loading