test

apache · Feb 14, 2023 · dd6b702 · dd6b702
1 parent 63edd34
commit dd6b702
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...k-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/SparkOperation.scala b/...k-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/SparkOperation.scala
@@ -135,7 +135,9 @@ abstract class SparkOperation(session: Session)
     spark.sparkContext.setLocalProperty
 
   protected def withLocalProperties[T](f: => T): T = {
+    val originalSession = SparkSession.getActiveSession
     try {
+      SparkSession.setActiveSession(spark)
       spark.sparkContext.setJobGroup(statementId, redactedStatement, forceCancel)
       spark.sparkContext.setLocalProperty(KYUUBI_SESSION_USER_KEY, session.user)
       spark.sparkContext.setLocalProperty(KYUUBI_STATEMENT_ID_KEY, statementId)
@@ -157,6 +159,10 @@ abstract class SparkOperation(session: Session)
       if (isSessionUserSignEnabled) {
         clearSessionUserSign()
       }
+      originalSession match {
+        case Some(session) => SparkSession.setActiveSession(session)
+        case None => SparkSession.clearActiveSession()
+      }
     }
   }
 

diff --git a/...kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/schema/RowSet.scala b/...kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/schema/RowSet.scala
@@ -24,7 +24,6 @@ import scala.collection.JavaConverters._
 
 import org.apache.hive.service.rpc.thrift._
 import org.apache.spark.sql.Row
-import org.apache.spark.sql.catalyst.util.{DateFormatter, TimestampFormatter}
 import org.apache.spark.sql.execution.HiveResult
 import org.apache.spark.sql.execution.HiveResult.TimeFormatters
 import org.apache.spark.sql.types._
@@ -34,9 +33,7 @@ import org.apache.kyuubi.util.RowSetUtils._
 object RowSet {
 
   def getTimeFormatters(timeZone: ZoneId): TimeFormatters = {
-    val dateFormatter = DateFormatter()
-    val timestampFormatter = TimestampFormatter.getFractionFormatter(timeZone)
-    TimeFormatters(dateFormatter, timestampFormatter)
+    HiveResult.getTimeFormatters
   }
 
   def toTRowSet(