From 11acec2d5ae1e6523225d4bb3411cfb45280d085 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 23 Mar 2024 17:07:55 -0700 Subject: [PATCH] update --- dev/diffs/3.4.2.diff | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dev/diffs/3.4.2.diff b/dev/diffs/3.4.2.diff index 9e1095410b..a9df68cf20 100644 --- 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..be1b82d0030 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,13 @@ 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,9 @@ 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] } }