Skip to content

[GLUTEN-11550][UT] Enable GlutenCsvExpressionsSuite #11848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
baibaichen wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −3
Draft

[GLUTEN-11550][UT] Enable GlutenCsvExpressionsSuite #11848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion gluten-ut/common/src/test/scala/org/apache/spark/sql/GlutenTestsTrait.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import org.apache.gluten.execution.ProjectExecTransformer
import org.apache.gluten.test.TestStats
import org.apache.gluten.utils.BackendTestUtils

import org.apache.spark.SparkException
import org.apache.spark.sql.GlutenQueryTestUtil.isNaNOrInf
import org.apache.spark.sql.catalyst.{CatalystTypeConverters, InternalRow}
import org.apache.spark.sql.catalyst.analysis.ResolveTimeZone
Expand Down Expand Up @@ -250,7 +251,19 @@ trait GlutenTestsTrait extends GlutenTestsCommonTrait {
_spark.createDataFrame(_spark.sparkContext.parallelize(empData), schema)
}
val resultDF = df.select(ClassicColumn(expression))
val result = resultDF.collect()
val result =
try {
resultDF.collect()
} catch {
// Match Spark's checkEvaluationWithoutCodegen behavior: wrap exceptions with fail().
// Gluten's DataFrame path wraps execution errors in SparkException, so unwrap it
// to expose the root cause (e.g. ArithmeticException) directly as fail()'s cause,
// just like Spark's interpreted path does.
case e: SparkException if e.getCause != null =>
fail(s"Exception evaluating $expression", e.getCause)
case e: Exception =>
fail(s"Exception evaluating $expression", e)
}
TestStats.testUnitNumber = TestStats.testUnitNumber + 1
if (
checkDataTypeSupported(expression) &&
Expand Down
2 changes: 1 addition & 1 deletion gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenCodeGeneratorWithInterpretedFallbackSuite]
enableSuite[GlutenCollationExpressionSuite]
enableSuite[GlutenCollationRegexpExpressionsSuite]
// TODO: 4.x enableSuite[GlutenCsvExpressionsSuite] // failures with GlutenPlugin
enableSuite[GlutenCsvExpressionsSuite]
enableSuite[GlutenDynamicPruningSubquerySuite]
enableSuite[GlutenExprIdSuite]
// TODO: 4.x enableSuite[GlutenExpressionEvalHelperSuite] // 2 failures
Expand Down
2 changes: 1 addition & 1 deletion gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenCodeGeneratorWithInterpretedFallbackSuite]
enableSuite[GlutenCollationExpressionSuite]
// TODO: 4.x enableSuite[GlutenCollationRegexpExpressionsSuite] // 1 failure
// TODO: 4.x enableSuite[GlutenCsvExpressionsSuite] // failures with GlutenPlugin
enableSuite[GlutenCsvExpressionsSuite]
enableSuite[GlutenDynamicPruningSubquerySuite]
enableSuite[GlutenExprIdSuite]
// TODO: 4.x enableSuite[GlutenExpressionEvalHelperSuite] // 2 failures
Expand Down
Loading