fix build error and code style (#781)

kwai · Jan 21, 2025 · ecad36b · ecad36b
1 parent 320772d
commit ecad36b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...extension-shims-spark3/src/test/scala/org/apache/spark/sql/blaze/BlazeFunctionSuite.scala b/...extension-shims-spark3/src/test/scala/org/apache/spark/sql/blaze/BlazeFunctionSuite.scala
@@ -22,10 +22,10 @@ class BlazeFunctionSuite extends org.apache.spark.sql.QueryTest with BaseBlazeSQ
   test("sum function with float input") {
     withTable("t1") {
       withSQLConf("spark.blaze.enable" -> "false") {
-      sql("set spark.blaze.enable=false")
-      sql("create table t1 using parquet as select 1.0f as c1")
-      val df = sql("select sum(c1) from t1")
-      checkAnswer(df, Seq(Row(1.23, 1.1)))
+        sql("set spark.blaze.enable=false")
+        sql("create table t1 using parquet as select 1.0f as c1")
+        val df = sql("select sum(c1) from t1")
+        checkAnswer(df, Seq(Row(1.23, 1.1)))
       }
     }
   }

diff --git a/spark-extension/src/main/scala/org/apache/spark/sql/blaze/NativeRDD.scala b/spark-extension/src/main/scala/org/apache/spark/sql/blaze/NativeRDD.scala
@@ -28,7 +28,6 @@ import org.apache.spark.SparkContext
 import org.apache.spark.TaskContext
 import org.blaze.protobuf.PhysicalPlanNode
 
-
 class NativeRDD(
     @transient private val rddSparkContext: SparkContext,
     val metrics: MetricNode,

diff --git a/...ension/src/main/scala/org/apache/spark/sql/execution/blaze/arrowio/ArrowFFIExporter.scala b/...ension/src/main/scala/org/apache/spark/sql/execution/blaze/arrowio/ArrowFFIExporter.scala
@@ -85,7 +85,7 @@ class ArrowFFIExporter(rowIter: Iterator[InternalRow], schema: StructType) {
         val arrowWriter = ArrowWriter.create(root)
         var rowCount = 0
 
-          rowCount += 1
+        rowCount += 1
         def processRows(): Unit = {
           while (rowIter.hasNext
             && rowCount < maxBatchNumRows
@@ -94,6 +94,9 @@ class ArrowFFIExporter(rowIter: Iterator[InternalRow], schema: StructType) {
             rowCount += 1
           }
         }
+        val currentUserInfo = UserGroupInformation.getCurrentUser
+        val nativeCurrentUser = NativeHelper.currentUser
+        val isNativeCurrentUser = currentUserInfo.equals(nativeCurrentUser)
         // if current user is native user, process rows directly
         if (isNativeCurrentUser) {
           processRows()