From 4c6f2c4f43b981c18217f76dfaee3313a19841ed Mon Sep 17 00:00:00 2001
From: Zhen Li <10524738+zhli1142015@users.noreply.github.com>
Date: Thu, 14 Dec 2023 12:55:43 +0800
Subject: [PATCH] [VL] Enable repartition ut 24940, 40407 and 40660 (#4035)

---
 .../io/glutenproject/utils/velox/VeloxTestSettings.scala    | 3 ---
 .../io/glutenproject/utils/velox/VeloxTestSettings.scala    | 6 ------
 .../io/glutenproject/utils/velox/VeloxTestSettings.scala    | 6 ------
 3 files changed, 15 deletions(-)

diff --git a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
index 6dd18e71f96f..ddad2738f777 100644
--- a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
+++ b/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
@@ -333,9 +333,6 @@ class VeloxTestSettings extends BackendTestSettings {
     .exclude("SPARK-33677: LikeSimplification should be skipped if pattern contains any escapeChar")
     // Different exception.
     .exclude("run sql directly on files")
-    // Columnar shuffle cannot generate the expected number of partitions if the row of a input
-    // batch is less than the expected number of partitions.
-    .exclude("SPARK-24940: coalesce and repartition hint")
     // Not useful and time consuming.
     .exclude("SPARK-33084: Add jar support Ivy URI in SQL")
     .exclude("SPARK-33084: Add jar support Ivy URI in SQL -- jar contains udf class")
diff --git a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
index f767b4bb9344..9f693cac8d80 100644
--- a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
+++ b/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
@@ -1043,9 +1043,6 @@ class VeloxTestSettings extends BackendTestSettings {
     // Rewrite the following two tests in GlutenDatasetSuite.
     .exclude("dropDuplicates: columns with same column name")
     .exclude("groupBy.as")
-    // exclude as velox has different behavior in these cases
-    .exclude("SPARK-40407: repartition should not result in severe data skew")
-    .exclude("SPARK-40660: Switch to XORShiftRandom to distribute elements")
   enableSuite[GlutenDateFunctionsSuite]
     // The below two are replaced by two modified versions.
     .exclude("unix_timestamp")
@@ -1123,9 +1120,6 @@ class VeloxTestSettings extends BackendTestSettings {
     .exclude("SPARK-33677: LikeSimplification should be skipped if pattern contains any escapeChar")
     // Different exception.
     .exclude("run sql directly on files")
-    // Columnar shuffle cannot generate the expected number of partitions if the row of a input
-    // batch is less than the expected number of partitions.
-    .exclude("SPARK-24940: coalesce and repartition hint")
     // Not useful and time consuming.
     .exclude("SPARK-33084: Add jar support Ivy URI in SQL")
     .exclude("SPARK-33084: Add jar support Ivy URI in SQL -- jar contains udf class")
diff --git a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
index f48bf72285ed..b9f905d68b2d 100644
--- a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
+++ b/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
@@ -1076,9 +1076,6 @@ class VeloxTestSettings extends BackendTestSettings {
     // Rewrite the following two tests in GlutenDatasetSuite.
     .exclude("dropDuplicates: columns with same column name")
     .exclude("groupBy.as")
-    // exclude as velox has different behavior in these cases
-    .exclude("SPARK-40407: repartition should not result in severe data skew")
-    .exclude("SPARK-40660: Switch to XORShiftRandom to distribute elements")
   enableSuite[GlutenDateFunctionsSuite]
     // The below two are replaced by two modified versions.
     .exclude("unix_timestamp")
@@ -1168,9 +1165,6 @@ class VeloxTestSettings extends BackendTestSettings {
     .exclude("SPARK-33677: LikeSimplification should be skipped if pattern contains any escapeChar")
     // Different exception.
     .exclude("run sql directly on files")
-    // Columnar shuffle cannot generate the expected number of partitions if the row of a input
-    // batch is less than the expected number of partitions.
-    .exclude("SPARK-24940: coalesce and repartition hint")
     // Not useful and time consuming.
     .exclude("SPARK-33084: Add jar support Ivy URI in SQL")
     .exclude("SPARK-33084: Add jar support Ivy URI in SQL -- jar contains udf class")