(incubator-gluten) branch main updated: [VL] Fix merge conflict on VeloxLocalCacheSuite (#9297)

[philo]

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 cf2a528979 [VL] Fix merge conflict on VeloxLocalCacheSuite (#9297)
cf2a528979 is described below

commit cf2a528979970bb4f87ea9601059497911fb5505
Author: Yuan <yuanz...@apache.org>
AuthorDate: Fri Apr 11 01:30:58 2025 +0100

    [VL] Fix merge conflict on VeloxLocalCacheSuite (#9297)
---
 .../scala/org/apache/spark/sql/execution/VeloxLocalCacheSuite.scala     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxLocalCacheSuite.scala
 
b/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxLocalCacheSuite.scala
index bb50399c13..f4cb27c682 100644
--- 
a/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxLocalCacheSuite.scala
+++ 
b/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxLocalCacheSuite.scala
@@ -34,7 +34,7 @@ class VeloxLocalCacheSuite extends 
VeloxWholeStageTransformerSuite {
       .set(VeloxConfig.COLUMNAR_VELOX_FILE_HANDLE_CACHE_ENABLED.key, "true")
   }
 
-  testWithSpecifiedSparkVersion("read example parquet files", Some("3.5"), 
Some("3.5")) {
+  testWithSpecifiedSparkVersion("read example parquet files", "3.5", "3.5") {
     withTable("test_table") {
       val dir = new File(getClass.getResource(resourcePath).getFile)
       val files = dir.listFiles


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@gluten.apache.org
For additional commands, e-mail: commits-h...@gluten.apache.org