This is an automated email from the ASF dual-hosted git repository.
changchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new f22e21fe41 [UT] Enable GlutenXmlExpressionsSuite for spark4x and
exclude 'from_xml- invalid data' (#11580)
f22e21fe41 is described below
commit f22e21fe414efe2302a1733782a214f6ae1949b4
Author: Chang Chen <[email protected]>
AuthorDate: Sat Feb 28 10:25:11 2026 +0800
[UT] Enable GlutenXmlExpressionsSuite for spark4x and exclude 'from_xml-
invalid data' (#11580)
- Enable GlutenXmlExpressionsSuite in VeloxTestSettings (was TODO disabled)
- Fix mixin: GlutenTestsCommonTrait → GlutenTestsTrait. The prior PR
(#11512)
added GlutenXmlExpressionsSuite with GlutenTestsCommonTrait, which does
not
enable Gluten execution for the test suite.
- Exclude 'from_xml- invalid data': Gluten overrides checkEvaluation to
execute
expressions via DataFrame, which throws SparkException directly instead of
wrapping it in TestFailedException. Same pattern as 'from_json - invalid
data'.
---
gluten-ut/spark40/pom.xml | 23 +++++++++++++++++++++
.../gluten/utils/velox/VeloxTestSettings.scala | 3 ++-
.../expressions/GlutenXmlExpressionsSuite.scala | 4 ++--
gluten-ut/spark41/pom.xml | 24 ++++++++++++++++++++++
.../gluten/utils/velox/VeloxTestSettings.scala | 3 ++-
.../expressions/GlutenXmlExpressionsSuite.scala | 4 ++--
6 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/gluten-ut/spark40/pom.xml b/gluten-ut/spark40/pom.xml
index 2a652007b2..4f4b50d546 100644
--- a/gluten-ut/spark40/pom.xml
+++ b/gluten-ut/spark40/pom.xml
@@ -85,6 +85,29 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index 01db251852..399661654f 100644
---
a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -243,7 +243,8 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenUnwrapUDTExpressionSuite]
enableSuite[GlutenV2ExpressionUtilsSuite]
enableSuite[GlutenValidateExternalTypeSuite]
- // TODO: 4.x enableSuite[GlutenXmlExpressionsSuite] // 7 failures
+ enableSuite[GlutenXmlExpressionsSuite]
+ .exclude("from_xml- invalid data")
// Generated suites for org.apache.spark.sql.connector
enableSuite[GlutenDataSourceV2MetricsSuite]
enableSuite[GlutenDataSourceV2OptionSuite]
diff --git
a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenXmlExpressionsSuite.scala
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenXmlExpressionsSuite.scala
index 380ed0bbf4..5a57f7f01c 100644
---
a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenXmlExpressionsSuite.scala
+++
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenXmlExpressionsSuite.scala
@@ -16,6 +16,6 @@
*/
package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.GlutenTestsCommonTrait
+import org.apache.spark.sql.GlutenTestsTrait
-class GlutenXmlExpressionsSuite extends XmlExpressionsSuite with
GlutenTestsCommonTrait {}
+class GlutenXmlExpressionsSuite extends XmlExpressionsSuite with
GlutenTestsTrait {}
diff --git a/gluten-ut/spark41/pom.xml b/gluten-ut/spark41/pom.xml
index 6aedc2adb9..580d618492 100644
--- a/gluten-ut/spark41/pom.xml
+++ b/gluten-ut/spark41/pom.xml
@@ -85,6 +85,30 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index df4f5766f6..10802c8892 100644
---
a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -254,7 +254,8 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenUnwrapUDTExpressionSuite]
enableSuite[GlutenV2ExpressionUtilsSuite]
enableSuite[GlutenValidateExternalTypeSuite]
- // TODO: 4.x enableSuite[GlutenXmlExpressionsSuite] // 7 failures
+ enableSuite[GlutenXmlExpressionsSuite]
+ .exclude("from_xml- invalid data")
// Generated suites for org.apache.spark.sql.connector
enableSuite[GlutenDataSourceV2MetricsSuite]
enableSuite[GlutenDataSourceV2OptionSuite]
diff --git
a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenXmlExpressionsSuite.scala
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenXmlExpressionsSuite.scala
index 380ed0bbf4..44b6304ff2 100644
---
a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenXmlExpressionsSuite.scala
+++
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenXmlExpressionsSuite.scala
@@ -16,6 +16,6 @@
*/
package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.GlutenTestsCommonTrait
+import org.apache.spark.sql.shim
-class GlutenXmlExpressionsSuite extends XmlExpressionsSuite with
GlutenTestsCommonTrait {}
+class GlutenXmlExpressionsSuite extends XmlExpressionsSuite with
shim.GlutenTestsTrait {}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
