diff --git a/dev/diffs/3.5.7.diff b/dev/diffs/3.5.7.diff index 6c54cd264e..c88f082ff0 100644 --- a/dev/diffs/3.5.7.diff +++ b/dev/diffs/3.5.7.diff @@ -1770,16 +1770,6 @@ index 2f8e401e743..a4f94417dcc 100644 CostEvaluator.instantiate( classOf[SimpleShuffleSortCostEvaluator].getCanonicalName, spark.sparkContext.getConf) intercept[IllegalArgumentException] { -@@ -2417,7 +2457,8 @@ class AdaptiveQueryExecSuite - } - - test("SPARK-48037: Fix SortShuffleWriter lacks shuffle write related metrics " + -- "resulting in potentially inaccurate data") { -+ "resulting in potentially inaccurate data", -+ IgnoreComet("https://github.com/apache/datafusion-comet/issues/1501")) { - withTable("t3") { - withSQLConf( - SQLConf.ADAPTIVE_EXECUTION_ENABLED.key -> "true", @@ -2452,6 +2493,7 @@ class AdaptiveQueryExecSuite val (_, adaptive) = runAdaptiveAndVerifyResult(query) assert(adaptive.collect { diff --git a/dev/diffs/4.0.1.diff b/dev/diffs/4.0.1.diff index 612a8975be..cd4dc2ea8c 100644 --- a/dev/diffs/4.0.1.diff +++ b/dev/diffs/4.0.1.diff @@ -2392,16 +2392,6 @@ index 272be70f9fe..06957694002 100644 CostEvaluator.instantiate( classOf[SimpleShuffleSortCostEvaluator].getCanonicalName, spark.sparkContext.getConf) intercept[IllegalArgumentException] { -@@ -2513,7 +2552,8 @@ class AdaptiveQueryExecSuite - } - - test("SPARK-48037: Fix SortShuffleWriter lacks shuffle write related metrics " + -- "resulting in potentially inaccurate data") { -+ "resulting in potentially inaccurate data", -+ IgnoreComet("too many shuffle partitions causes Java heap OOM")) { - withTable("t3") { - withSQLConf( - SQLConf.ADAPTIVE_EXECUTION_ENABLED.key -> "true", @@ -2548,6 +2588,7 @@ class AdaptiveQueryExecSuite val (_, adaptive) = runAdaptiveAndVerifyResult(query) assert(adaptive.collect {