This is an automated email from the ASF dual-hosted git repository.
philo 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 f837f060f [UT] Remove isVeloxBackendLoaded usage from file metadata UT
(#6249)
f837f060f is described below
commit f837f060f60bb8e5ad173ce92d2a85c294da5d1e
Author: 高阳阳 <[email protected]>
AuthorDate: Thu Jun 27 19:52:06 2024 +0800
[UT] Remove isVeloxBackendLoaded usage from file metadata UT (#6249)
---
.../sql/execution/datasources/GlutenFileMetadataStructSuite.scala | 8 ++++----
.../sql/execution/datasources/GlutenFileMetadataStructSuite.scala | 8 ++++----
.../sql/execution/datasources/GlutenFileMetadataStructSuite.scala | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
index efa0fbae0..ed347d024 100644
---
a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
+++
b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
@@ -16,8 +16,8 @@
*/
package org.apache.spark.sql.execution.datasources
+import org.apache.gluten.backendsapi.BackendsApiManager
import org.apache.gluten.execution.{FileSourceScanExecTransformer,
FilterExecTransformer}
-import org.apache.gluten.utils.BackendTestUtils
import org.apache.spark.sql.{Column, DataFrame, Row}
import org.apache.spark.sql.GlutenSQLTestsBaseTrait
@@ -108,7 +108,7 @@ class GlutenFileMetadataStructSuite extends
FileMetadataStructSuite with GlutenS
METADATA_FILE_MODIFICATION_TIME,
"age")
dfWithMetadata.collect
- if (BackendTestUtils.isVeloxBackendLoaded()) {
+ if (BackendsApiManager.getSettings.supportNativeMetadataColumns()) {
checkOperatorMatch[FileSourceScanExecTransformer](dfWithMetadata)
} else {
checkOperatorMatch[FileSourceScanExec](dfWithMetadata)
@@ -133,7 +133,7 @@ class GlutenFileMetadataStructSuite extends
FileMetadataStructSuite with GlutenS
.where(Column(METADATA_FILE_NAME) === f0((METADATA_FILE_NAME)))
val ret = filterDF.collect
assert(ret.size == 1)
- if (BackendTestUtils.isVeloxBackendLoaded()) {
+ if (BackendsApiManager.getSettings.supportNativeMetadataColumns()) {
checkOperatorMatch[FileSourceScanExecTransformer](filterDF)
} else {
checkOperatorMatch[FileSourceScanExec](filterDF)
@@ -149,7 +149,7 @@ class GlutenFileMetadataStructSuite extends
FileMetadataStructSuite with GlutenS
Row(f1(METADATA_FILE_PATH))
)
)
- if (BackendTestUtils.isVeloxBackendLoaded()) {
+ if (BackendsApiManager.getSettings.supportNativeMetadataColumns()) {
checkOperatorMatch[FileSourceScanExecTransformer](filterDF)
} else {
checkOperatorMatch[FileSourceScanExec](filterDF)
diff --git
a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
index b3b9ea739..6e47a94e3 100644
---
a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
+++
b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
@@ -16,8 +16,8 @@
*/
package org.apache.spark.sql.execution.datasources
+import org.apache.gluten.backendsapi.BackendsApiManager
import org.apache.gluten.execution.{FileSourceScanExecTransformer,
FilterExecTransformer}
-import org.apache.gluten.utils.BackendTestUtils
import org.apache.spark.sql.{Column, DataFrame, Row}
import org.apache.spark.sql.GlutenSQLTestsBaseTrait
@@ -109,7 +109,7 @@ class GlutenFileMetadataStructSuite extends
FileMetadataStructSuite with GlutenS
METADATA_FILE_MODIFICATION_TIME,
"age")
dfWithMetadata.collect
- if (BackendTestUtils.isVeloxBackendLoaded()) {
+ if (BackendsApiManager.getSettings.supportNativeMetadataColumns()) {
checkOperatorMatch[FileSourceScanExecTransformer](dfWithMetadata)
} else {
checkOperatorMatch[FileSourceScanExec](dfWithMetadata)
@@ -134,7 +134,7 @@ class GlutenFileMetadataStructSuite extends
FileMetadataStructSuite with GlutenS
.where(Column(METADATA_FILE_NAME) === f0((METADATA_FILE_NAME)))
val ret = filterDF.collect
assert(ret.size == 1)
- if (BackendTestUtils.isVeloxBackendLoaded()) {
+ if (BackendsApiManager.getSettings.supportNativeMetadataColumns()) {
checkOperatorMatch[FileSourceScanExecTransformer](filterDF)
} else {
checkOperatorMatch[FileSourceScanExec](filterDF)
@@ -150,7 +150,7 @@ class GlutenFileMetadataStructSuite extends
FileMetadataStructSuite with GlutenS
Row(f1(METADATA_FILE_PATH))
)
)
- if (BackendTestUtils.isVeloxBackendLoaded()) {
+ if (BackendsApiManager.getSettings.supportNativeMetadataColumns()) {
checkOperatorMatch[FileSourceScanExecTransformer](filterDF)
} else {
checkOperatorMatch[FileSourceScanExec](filterDF)
diff --git
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
index efa0fbae0..ed347d024 100644
---
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
+++
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileMetadataStructSuite.scala
@@ -16,8 +16,8 @@
*/
package org.apache.spark.sql.execution.datasources
+import org.apache.gluten.backendsapi.BackendsApiManager
import org.apache.gluten.execution.{FileSourceScanExecTransformer,
FilterExecTransformer}
-import org.apache.gluten.utils.BackendTestUtils
import org.apache.spark.sql.{Column, DataFrame, Row}
import org.apache.spark.sql.GlutenSQLTestsBaseTrait
@@ -108,7 +108,7 @@ class GlutenFileMetadataStructSuite extends
FileMetadataStructSuite with GlutenS
METADATA_FILE_MODIFICATION_TIME,
"age")
dfWithMetadata.collect
- if (BackendTestUtils.isVeloxBackendLoaded()) {
+ if (BackendsApiManager.getSettings.supportNativeMetadataColumns()) {
checkOperatorMatch[FileSourceScanExecTransformer](dfWithMetadata)
} else {
checkOperatorMatch[FileSourceScanExec](dfWithMetadata)
@@ -133,7 +133,7 @@ class GlutenFileMetadataStructSuite extends
FileMetadataStructSuite with GlutenS
.where(Column(METADATA_FILE_NAME) === f0((METADATA_FILE_NAME)))
val ret = filterDF.collect
assert(ret.size == 1)
- if (BackendTestUtils.isVeloxBackendLoaded()) {
+ if (BackendsApiManager.getSettings.supportNativeMetadataColumns()) {
checkOperatorMatch[FileSourceScanExecTransformer](filterDF)
} else {
checkOperatorMatch[FileSourceScanExec](filterDF)
@@ -149,7 +149,7 @@ class GlutenFileMetadataStructSuite extends
FileMetadataStructSuite with GlutenS
Row(f1(METADATA_FILE_PATH))
)
)
- if (BackendTestUtils.isVeloxBackendLoaded()) {
+ if (BackendsApiManager.getSettings.supportNativeMetadataColumns()) {
checkOperatorMatch[FileSourceScanExecTransformer](filterDF)
} else {
checkOperatorMatch[FileSourceScanExec](filterDF)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
