test

apache · Aug 19, 2024 · 5588878 · 5588878
1 parent 9f5d95d
commit 5588878
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 25 deletions.
diff --git a/native/Cargo.lock b/native/Cargo.lock
diff --git a/native/Cargo.toml b/native/Cargo.toml
@@ -39,15 +39,15 @@ arrow-buffer = { version = "52.2.0" }
 arrow-data = { version = "52.2.0" }
 arrow-schema = { version = "52.2.0" }
 parquet = { version = "52.2.0", default-features = false, features = ["experimental"] }
-datafusion-common = { git = "https://github.com/apache/datafusion.git", rev = "41.0.0-rc1" }
-datafusion = { default-features = false, git = "https://github.com/apache/datafusion.git", rev = "41.0.0-rc1", features = ["unicode_expressions", "crypto_expressions"] }
-datafusion-functions = { git = "https://github.com/apache/datafusion.git", rev = "41.0.0-rc1", features = ["crypto_expressions"] }
-datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git",  rev = "41.0.0-rc1", default-features = false }
-datafusion-expr = { git = "https://github.com/apache/datafusion.git", rev = "41.0.0-rc1", default-features = false }
-datafusion-execution = { git = "https://github.com/apache/datafusion.git", rev = "41.0.0-rc1", default-features = false }
-datafusion-physical-plan = { git = "https://github.com/apache/datafusion.git", rev = "41.0.0-rc1", default-features = false }
-datafusion-physical-expr-common = { git = "https://github.com/apache/datafusion.git", rev = "41.0.0-rc1", default-features = false }
-datafusion-physical-expr = { git = "https://github.com/apache/datafusion.git", rev = "41.0.0-rc1", default-features = false }
+datafusion-common = { path = "../../arrow-datafusion/datafusion/common" }
+datafusion = { default-features = false, path = "../../arrow-datafusion/datafusion/core", features = ["unicode_expressions", "crypto_expressions"] }
+datafusion-functions = { path = "../../arrow-datafusion/datafusion/functions", features = ["crypto_expressions"] }
+datafusion-functions-nested = { path = "../../arrow-datafusion/datafusion/functions-nested", default-features = false }
+datafusion-expr = { path = "../../arrow-datafusion/datafusion/expr", default-features = false }
+datafusion-execution = { path = "../../arrow-datafusion/datafusion/execution", default-features = false }
+datafusion-physical-plan = { path = "../../arrow-datafusion/datafusion/physical-plan", default-features = false }
+datafusion-physical-expr-common = { path = "../../arrow-datafusion/datafusion/physical-expr-common", default-features = false }
+datafusion-physical-expr = { path = "../../arrow-datafusion/datafusion/physical-expr", default-features = false }
 datafusion-comet-spark-expr = { path = "spark-expr", version = "0.2.0" }
 datafusion-comet-proto = { path = "proto", version = "0.2.0" }
 chrono = { version = "0.4", default-features = false, features = ["clock"] }

diff --git a/spark/src/test/scala/org/apache/comet/exec/CometJoinSuite.scala b/spark/src/test/scala/org/apache/comet/exec/CometJoinSuite.scala
@@ -338,6 +338,7 @@ class CometJoinSuite extends CometTestBase {
 
   test("SortMergeJoin with join filter") {
     withSQLConf(
+      CometConf.COMET_EXEC_SORT_MERGE_JOIN_DISABLED.key -> "true",
       SQLConf.ADAPTIVE_AUTO_BROADCASTJOIN_THRESHOLD.key -> "-1",
       SQLConf.AUTO_BROADCASTJOIN_THRESHOLD.key -> "-1") {
       withParquetTable((0 until 10).map(i => (i, i % 5)), "tbl_a") {
@@ -373,7 +374,7 @@ class CometJoinSuite extends CometTestBase {
             "SELECT * FROM tbl_a FULL JOIN tbl_b ON tbl_a._2 = tbl_b._1 " +
               "AND tbl_a._1 > tbl_b._2")
           df6.explain()
-          checkSparkAnswerAndOperator(df6)
+          checkSparkAnswer(df6)
 
           /*
           val df7 = sql(