@@ -502,26 +502,18 @@ index a206e97c353..79813d8e259 100644
502502
503503 test("SPARK-35884: Explain Formatted") {
504504diff --git a/sql/core/src/test/scala/org/apache/spark/sql/FileBasedDataSourceSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/FileBasedDataSourceSuite.scala
505- index 93275487f29..55902457a16 100644
505+ index 93275487f29..ca79ad8b6d9 100644
506506--- a/sql/core/src/test/scala/org/apache/spark/sql/FileBasedDataSourceSuite.scala
507507+++ b/sql/core/src/test/scala/org/apache/spark/sql/FileBasedDataSourceSuite.scala
508- @@ -23,6 +23,7 @@ import java.nio.file.{Files, StandardOpenOption}
509-
510- import scala.collection.mutable
511-
512- + import org.apache.comet.CometConf
513- import org.apache.hadoop.conf.Configuration
514- import org.apache.hadoop.fs.{LocalFileSystem, Path}
515-
516- @@ -33,6 +34,7 @@ import org.apache.spark.sql.catalyst.expressions.{AttributeReference, GreaterTha
508+ @@ -33,6 +33,7 @@ import org.apache.spark.sql.catalyst.expressions.{AttributeReference, GreaterTha
517509 import org.apache.spark.sql.catalyst.expressions.IntegralLiteralTestUtils.{negativeInt, positiveInt}
518510 import org.apache.spark.sql.catalyst.plans.logical.Filter
519511 import org.apache.spark.sql.catalyst.types.DataTypeUtils
520512+ import org.apache.spark.sql.comet.{CometBatchScanExec, CometNativeScanExec, CometScanExec, CometSortMergeJoinExec}
521513 import org.apache.spark.sql.execution.{FileSourceScanLike, SimpleMode}
522514 import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
523515 import org.apache.spark.sql.execution.datasources.FilePartition
524- @@ -639,7 +641 ,8 @@ class FileBasedDataSourceSuite extends QueryTest
516+ @@ -639,7 +640 ,8 @@ class FileBasedDataSourceSuite extends QueryTest
525517 }
526518
527519 Seq("parquet", "orc").foreach { format =>
@@ -531,31 +523,31 @@ index 93275487f29..55902457a16 100644
531523 withTempDir { dir =>
532524 val tableName = s"spark_25132_${format}_native"
533525 val tableDir = dir.getCanonicalPath + s"/$tableName"
534- @@ -955,6 +958 ,7 @@ class FileBasedDataSourceSuite extends QueryTest
526+ @@ -955,6 +957 ,7 @@ class FileBasedDataSourceSuite extends QueryTest
535527 assert(bJoinExec.isEmpty)
536528 val smJoinExec = collect(joinedDF.queryExecution.executedPlan) {
537529 case smJoin: SortMergeJoinExec => smJoin
538530+ case smJoin: CometSortMergeJoinExec => smJoin
539531 }
540532 assert(smJoinExec.nonEmpty)
541533 }
542- @@ -1015,6 +1019 ,7 @@ class FileBasedDataSourceSuite extends QueryTest
534+ @@ -1015,6 +1018 ,7 @@ class FileBasedDataSourceSuite extends QueryTest
543535
544536 val fileScan = df.queryExecution.executedPlan collectFirst {
545537 case BatchScanExec(_, f: FileScan, _, _, _, _) => f
546538+ case CometBatchScanExec(BatchScanExec(_, f: FileScan, _, _, _, _), _, _) => f
547539 }
548540 assert(fileScan.nonEmpty)
549541 assert(fileScan.get.partitionFilters.nonEmpty)
550- @@ -1056,6 +1061 ,7 @@ class FileBasedDataSourceSuite extends QueryTest
542+ @@ -1056,6 +1060 ,7 @@ class FileBasedDataSourceSuite extends QueryTest
551543
552544 val fileScan = df.queryExecution.executedPlan collectFirst {
553545 case BatchScanExec(_, f: FileScan, _, _, _, _) => f
554546+ case CometBatchScanExec(BatchScanExec(_, f: FileScan, _, _, _, _), _, _) => f
555547 }
556548 assert(fileScan.nonEmpty)
557549 assert(fileScan.get.partitionFilters.isEmpty)
558- @@ -1240,6 +1246 ,9 @@ class FileBasedDataSourceSuite extends QueryTest
550+ @@ -1240,6 +1245 ,9 @@ class FileBasedDataSourceSuite extends QueryTest
559551 val filters = df.queryExecution.executedPlan.collect {
560552 case f: FileSourceScanLike => f.dataFilters
561553 case b: BatchScanExec => b.scan.asInstanceOf[FileScan].dataFilters
@@ -1413,18 +1405,6 @@ index 47679ed7865..9ffbaecb98e 100644
14131405 }.length == hashAggCount)
14141406 assert(collectWithSubqueries(plan) { case s: SortAggregateExec => s }.length == sortAggCount)
14151407 }
1416- diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/SQLViewSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/SQLViewSuite.scala
1417- index a1147c16cc8..90085de90d4 100644
1418- --- a/sql/core/src/test/scala/org/apache/spark/sql/execution/SQLViewSuite.scala
1419- +++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/SQLViewSuite.scala
1420- @@ -19,6 +19,7 @@ package org.apache.spark.sql.execution
1421-
1422- import org.apache.spark.{SparkArithmeticException, SparkException, SparkFileNotFoundException}
1423- import org.apache.spark.sql._
1424- + import org.apache.spark.sql.IgnoreCometNativeDataFusion
1425- import org.apache.spark.sql.catalyst.TableIdentifier
1426- import org.apache.spark.sql.catalyst.expressions.{Add, Alias, Divide}
1427- import org.apache.spark.sql.catalyst.parser.ParseException
14281408diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/SQLWindowFunctionSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/SQLWindowFunctionSuite.scala
14291409index eec396b2e39..bf3f1c769d6 100644
14301410--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/SQLWindowFunctionSuite.scala
0 commit comments