From 2bd9915dda431abfffc4654b192618e928836a6a Mon Sep 17 00:00:00 2001 From: Chao Sun Date: Sun, 25 Feb 2024 17:00:37 -0800 Subject: [PATCH] remove non-fast merge test combination --- .../comet/exec/CometColumnarShuffleSuite.scala | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/spark/src/test/scala/org/apache/comet/exec/CometColumnarShuffleSuite.scala b/spark/src/test/scala/org/apache/comet/exec/CometColumnarShuffleSuite.scala index 289ed0767..ff2968e05 100644 --- a/spark/src/test/scala/org/apache/comet/exec/CometColumnarShuffleSuite.scala +++ b/spark/src/test/scala/org/apache/comet/exec/CometColumnarShuffleSuite.scala @@ -35,14 +35,12 @@ import org.apache.comet.CometConf abstract class CometColumnarShuffleSuite extends CometTestBase with AdaptiveSparkPlanHelper { protected val adaptiveExecutionEnabled: Boolean - protected val fastMergeEnabled: Boolean = true protected val numElementsForceSpillThreshold: Int = 10 override protected def sparkConf: SparkConf = { val conf = super.sparkConf conf .set(SQLConf.ADAPTIVE_EXECUTION_ENABLED.key, adaptiveExecutionEnabled.toString) - .set("spark.shuffle.unsafe.fastMergeEnabled", fastMergeEnabled.toString) } protected val asyncShuffleEnable: Boolean @@ -948,22 +946,6 @@ class CometAsyncShuffleSuite extends CometColumnarShuffleSuite { protected val adaptiveExecutionEnabled: Boolean = true } -class CometAsyncNonFastMergeShuffleSuite extends CometColumnarShuffleSuite { - override protected val fastMergeEnabled: Boolean = false - - protected val adaptiveExecutionEnabled: Boolean = true - - protected val asyncShuffleEnable: Boolean = true -} - -class CometNonFastMergeShuffleSuite extends CometColumnarShuffleSuite { - override protected val fastMergeEnabled: Boolean = false - - protected val adaptiveExecutionEnabled: Boolean = true - - protected val asyncShuffleEnable: Boolean = false -} - class CometShuffleSuite extends CometColumnarShuffleSuite { override protected val asyncShuffleEnable: Boolean = false