Skip to content

Commit 94300aa

Browse files
baibaichenCopilot
andcommitted
[GLUTEN-11550][UT] Enable GlutenCsvExpressionsSuite
Wrap exception in glutenCheckExpression with fail() to match Spark's checkEvaluationWithoutCodegen behavior. No testGluten override needed. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 4717f7e commit 94300aa

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsTrait.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,12 @@ trait GlutenTestsTrait extends GlutenTestsCommonTrait {
250250
_spark.createDataFrame(_spark.sparkContext.parallelize(empData), schema)
251251
}
252252
val resultDF = df.select(ClassicColumn(expression))
253-
val result = resultDF.collect()
253+
val result =
254+
try {
255+
resultDF.collect()
256+
} catch {
257+
case e: Exception => fail(s"Exception evaluating $expression", e)
258+
}
254259
TestStats.testUnitNumber = TestStats.testUnitNumber + 1
255260
if (
256261
checkDataTypeSupported(expression) &&

gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ class VeloxTestSettings extends BackendTestSettings {
224224
enableSuite[GlutenCodeGeneratorWithInterpretedFallbackSuite]
225225
enableSuite[GlutenCollationExpressionSuite]
226226
enableSuite[GlutenCollationRegexpExpressionsSuite]
227-
// TODO: 4.x enableSuite[GlutenCsvExpressionsSuite] // failures with GlutenPlugin
227+
enableSuite[GlutenCsvExpressionsSuite]
228228
enableSuite[GlutenDynamicPruningSubquerySuite]
229229
enableSuite[GlutenExprIdSuite]
230230
// TODO: 4.x enableSuite[GlutenExpressionEvalHelperSuite] // 2 failures

gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ class VeloxTestSettings extends BackendTestSettings {
235235
enableSuite[GlutenCodeGeneratorWithInterpretedFallbackSuite]
236236
enableSuite[GlutenCollationExpressionSuite]
237237
// TODO: 4.x enableSuite[GlutenCollationRegexpExpressionsSuite] // 1 failure
238-
// TODO: 4.x enableSuite[GlutenCsvExpressionsSuite] // failures with GlutenPlugin
238+
enableSuite[GlutenCsvExpressionsSuite]
239239
enableSuite[GlutenDynamicPruningSubquerySuite]
240240
enableSuite[GlutenExprIdSuite]
241241
// TODO: 4.x enableSuite[GlutenExpressionEvalHelperSuite] // 2 failures

0 commit comments

Comments
 (0)