diff --git a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala index 3683c8d44..59448d27e 100644 --- a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala +++ b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala @@ -1357,8 +1357,10 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper { assume(isSpark34Plus) withSQLConf( SQLConf.ANSI_ENABLED.key -> "false", + SQLConf.COALESCE_PARTITIONS_ENABLED.key -> "true", CometConf.COMET_ENABLED.key -> "true", CometConf.COMET_EXEC_ENABLED.key -> "true", + CometConf.COMET_SHUFFLE_ENFORCE_MODE_ENABLED.key -> "true", CometConf.COMET_EXEC_ALL_EXPR_ENABLED.key -> "true", CometConf.COMET_EXEC_ALL_OPERATOR_ENABLED.key -> "true", "spark.sql.extendedExplainProvider" -> "org.apache.comet.ExtendedExplainInfo") { diff --git a/spark/src/test/scala/org/apache/comet/exec/CometExecSuite.scala b/spark/src/test/scala/org/apache/comet/exec/CometExecSuite.scala index f37183563..6702a7c33 100644 --- a/spark/src/test/scala/org/apache/comet/exec/CometExecSuite.scala +++ b/spark/src/test/scala/org/apache/comet/exec/CometExecSuite.scala @@ -339,11 +339,11 @@ class CometExecSuite extends CometTestBase { }.map(_.metrics).get assert(metrics.contains("input_batches")) - assert(metrics("input_batches").value == 2L) + assert(metrics("input_batches").value == 8L) assert(metrics.contains("input_rows")) assert(metrics("input_rows").value == 10L) assert(metrics.contains("output_batches")) - assert(metrics("output_batches").value == 1L) + assert(metrics("output_batches").value == 4L) assert(metrics.contains("output_rows")) assert(metrics("output_rows").value == 5L) assert(metrics.contains("peak_mem_used")) diff --git a/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala b/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala index 1ed447dc3..e06145012 100644 --- a/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala +++ b/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala @@ -264,6 +264,8 @@ abstract class CometTestBase } val extendedInfo = new ExtendedExplainInfo().generateExtendedInfo(dfComet.queryExecution.executedPlan) + // scalastyle:off println + println(s"extendedInfo: $extendedInfo, expectedInfo: $expectedInfo") assert(extendedInfo.equalsIgnoreCase(expectedInfo)) }