[KYUUBI #360] move ThriftUtils to kyuubi-common

pan3793 · pan3793 · commit 2307f1f62012 · 2021-02-25T17:04:38.000+08:00
diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/Utils.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/Utils.scala
@@ -155,5 +155,5 @@ private[kyuubi] object Utils extends Logging {
   /**
    * Whether the underlying operating system is Windows.
    */
-  val isWindows = SystemUtils.IS_OS_WINDOWS
+  val isWindows: Boolean = SystemUtils.IS_OS_WINDOWS
 }
diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/util/ThriftUtils.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/util/ThriftUtils.scala
@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.kyuubi
+package org.apache.kyuubi.util
 
 import org.apache.hive.service.rpc.thrift.{TRow, TRowSet, TStatus, TStatusCode}
 
+import org.apache.kyuubi.KyuubiSQLException
+
 object ThriftUtils {
 
   def verifyTStatus(tStatus: TStatus): Unit = {
diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/operation/NoopOperation.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/operation/NoopOperation.scala
@@ -22,12 +22,13 @@ import java.nio.ByteBuffer
 import scala.collection.JavaConverters._
 
 import org.apache.hive.service.rpc.thrift.{TColumn, TColumnDesc, TPrimitiveTypeEntry, TRow, TRowSet, TStringColumn, TTableSchema, TTypeDesc, TTypeEntry, TTypeId}
-
 import org.apache.kyuubi.KyuubiSQLException
+
 import org.apache.kyuubi.operation.FetchOrientation.FetchOrientation
 import org.apache.kyuubi.operation.OperationType.OperationType
 import org.apache.kyuubi.operation.log.OperationLog
 import org.apache.kyuubi.session.Session
+import org.apache.kyuubi.util.ThriftUtils
 
 class NoopOperation(typ: OperationType, session: Session, shouldFail: Boolean = false)
   extends AbstractOperation(typ, session) {
@@ -75,7 +76,7 @@ class NoopOperation(typ: OperationType, session: Session, shouldFail: Boolean =
 
   override def getNextRowSet(order: FetchOrientation, rowSetSize: Int): TRowSet = {
     val col = TColumn.stringVal(new TStringColumn(Seq(typ.toString).asJava, ByteBuffer.allocate(0)))
-    val tRowSet = new TRowSet(0, new java.util.ArrayList[TRow](0))
+    val tRowSet = ThriftUtils.EMPTY_ROW_SET
     tRowSet.addToColumns(col)
     tRowSet
   }
diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/operation/NoopOperationManager.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/operation/NoopOperationManager.scala
@@ -21,6 +21,7 @@ import org.apache.hive.service.rpc.thrift.{TRow, TRowSet}
 
 import org.apache.kyuubi.operation.FetchOrientation.FetchOrientation
 import org.apache.kyuubi.session.Session
+import org.apache.kyuubi.util.ThriftUtils
 
 class NoopOperationManager extends OperationManager("noop") {
   private val invalid = "invalid"
@@ -90,5 +91,5 @@ class NoopOperationManager extends OperationManager("noop") {
   override def getOperationLogRowSet(
       opHandle: OperationHandle,
       order: FetchOrientation,
-      maxRows: Int): TRowSet = new TRowSet(0, new java.util.ArrayList[TRow](0))
+      maxRows: Int): TRowSet = ThriftUtils.EMPTY_ROW_SET
 }
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/KyuubiOperation.scala b/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/KyuubiOperation.scala
@@ -18,12 +18,13 @@
 package org.apache.kyuubi.operation
 
 import org.apache.hive.service.rpc.thrift._
+import org.apache.kyuubi.KyuubiSQLException
 
-import org.apache.kyuubi.{KyuubiSQLException, ThriftUtils}
 import org.apache.kyuubi.operation.FetchOrientation.FetchOrientation
 import org.apache.kyuubi.operation.OperationType.OperationType
 import org.apache.kyuubi.operation.log.OperationLog
 import org.apache.kyuubi.session.Session
+import org.apache.kyuubi.util.ThriftUtils
 
 abstract class KyuubiOperation(
     opType: OperationType,
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/KyuubiOperationManager.scala b/kyuubi-main/src/main/scala/org/apache/kyuubi/operation/KyuubiOperationManager.scala
@@ -20,10 +20,11 @@ package org.apache.kyuubi.operation
 import java.util.concurrent.ConcurrentHashMap
 
 import org.apache.hive.service.rpc.thrift.{TCLIService, TFetchResultsReq, TRow, TRowSet, TSessionHandle}
+import org.apache.kyuubi.KyuubiSQLException
 
-import org.apache.kyuubi.{KyuubiSQLException, ThriftUtils}
 import org.apache.kyuubi.operation.FetchOrientation.FetchOrientation
 import org.apache.kyuubi.session.{Session, SessionHandle}
+import org.apache.kyuubi.util.ThriftUtils
 
 class KyuubiOperationManager private (name: String) extends OperationManager(name) {
 
diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala b/kyuubi-main/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala
@@ -26,8 +26,8 @@ import org.apache.hive.service.rpc.thrift.{TCLIService, TCloseSessionReq, TOpenS
 import org.apache.thrift.TException
 import org.apache.thrift.protocol.TBinaryProtocol
 import org.apache.thrift.transport.{TSocket, TTransport}
+import org.apache.kyuubi.{KyuubiSQLException, Utils}
 
-import org.apache.kyuubi.{KyuubiSQLException, ThriftUtils, Utils}
 import org.apache.kyuubi.config.KyuubiConf
 import org.apache.kyuubi.config.KyuubiConf._
 import org.apache.kyuubi.engine.{ShareLevel, SQLEngineAppName}
@@ -36,6 +36,7 @@ import org.apache.kyuubi.engine.spark.SparkProcessBuilder
 import org.apache.kyuubi.ha.HighAvailabilityConf._
 import org.apache.kyuubi.ha.client.ServiceDiscovery._
 import org.apache.kyuubi.service.authentication.PlainSASLHelper
+import org.apache.kyuubi.util.ThriftUtils
 
 class KyuubiSessionImpl(
     protocol: TProtocolVersion,

Original file line number	Diff line number	Diff line change
`@@ -155,5 +155,5 @@ private[kyuubi] object Utils extends Logging {`
`155`	`155`	`/**`
`156`	`156`	`* Whether the underlying operating system is Windows.`
`157`	`157`	`*/`
`158`		`- val isWindows = SystemUtils.IS_OS_WINDOWS`
	`158`	`+ val isWindows: Boolean = SystemUtils.IS_OS_WINDOWS`
`159`	`159`	`}`