update

apache · Mar 24, 2024 · 8d4d8a4 · 8d4d8a4
1 parent e677abb
commit 8d4d8a4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/dev/diffs/3.4.2.diff b/dev/diffs/3.4.2.diff
@@ -571,7 +571,7 @@ index ac710c32296..37746bd470d 100644
            val df = spark.read.parquet(path).selectExpr(projection: _*)
 
 diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/adaptive/AdaptiveQueryExecSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/adaptive/AdaptiveQueryExecSuite.scala
-index 593bd7bb4ba..ccc2c7db7f2 100644
+index 593bd7bb4ba..32c060ec08e 100644
 --- a/sql/core/src/test/scala/org/apache/spark/sql/execution/adaptive/AdaptiveQueryExecSuite.scala
 +++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/adaptive/AdaptiveQueryExecSuite.scala
 @@ -29,6 +29,7 @@ import org.apache.spark.scheduler.{SparkListener, SparkListenerEvent, SparkListe
@@ -582,11 +582,14 @@ index 593bd7bb4ba..ccc2c7db7f2 100644
  import org.apache.spark.sql.execution.{CollectLimitExec, LocalTableScanExec, PartialReducerPartitionSpec, QueryExecution, ReusedSubqueryExec, ShuffledRowRDD, SortExec, SparkPlan, SparkPlanInfo, UnionExec}
  import org.apache.spark.sql.execution.aggregate.BaseAggregateExec
  import org.apache.spark.sql.execution.command.DataWritingCommandExec
-@@ -116,6 +117,7 @@ class AdaptiveQueryExecSuite
+@@ -116,6 +117,10 @@ class AdaptiveQueryExecSuite
    private def findTopLevelSortMergeJoin(plan: SparkPlan): Seq[SortMergeJoinExec] = {
      collect(plan) {
        case j: SortMergeJoinExec => j
-+      case j: CometSortMergeJoinExec => j
++      case j: CometSortMergeJoinExec => {
++        assert(j.originalPlan.isInstanceOf[SortMergeJoinExec])
++        j.originalPlan.asInstanceOf[SortMergeJoinExec]
++      }
      }
    }