From ce8462705ff8c1e5584c87391b69b3f0524453a0 Mon Sep 17 00:00:00 2001
From: SteNicholas <programgeek@163.com>
Date: Fri, 4 Mar 2022 18:41:34 +0800
Subject: [PATCH] [KYUUBI #1961] Upgrade `hive-service-rpc` to 3.1.2

### _Why are the changes needed?_

Upgrade `hive-service-rpc` to 3.1.2.

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #2031 from SteNicholas/KYUUBI-1961.

Closes #1961

88c29557 [SteNicholas] [KYUUBI #1961] Upgrade hive-service-rpc to 3.1.2

Authored-by: SteNicholas <programgeek@163.com>
Signed-off-by: Kent Yao <yao@apache.org>
---
 dev/dependencyList                                  |  2 +-
 .../apache/kyuubi/service/TFrontendService.scala    | 13 +++++++++++++
 .../server/mysql/constant/MySQLDataType.scala       |  1 +
 pom.xml                                             |  3 ++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/dev/dependencyList b/dev/dependencyList
index 6e24cde92..283eda924 100644
--- a/dev/dependencyList
+++ b/dev/dependencyList
@@ -28,7 +28,7 @@ hadoop-client-runtime/3.3.2//hadoop-client-runtime-3.3.2.jar
 hive-common/2.3.9//hive-common-2.3.9.jar
 hive-metastore/2.3.9//hive-metastore-2.3.9.jar
 hive-serde/2.3.9//hive-serde-2.3.9.jar
-hive-service-rpc/2.3.9//hive-service-rpc-2.3.9.jar
+hive-service-rpc/3.1.2//hive-service-rpc-3.1.2.jar
 hive-shims-0.23/2.3.9//hive-shims-0.23-2.3.9.jar
 hive-shims-common/2.3.9//hive-shims-common-2.3.9.jar
 hk2-api/2.6.1//hk2-api-2.6.1.jar
diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/service/TFrontendService.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/TFrontendService.scala
index 464901d13..9f1e9df8c 100644
--- a/kyuubi-common/src/main/scala/org/apache/kyuubi/service/TFrontendService.scala
+++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/TFrontendService.scala
@@ -493,6 +493,19 @@ abstract class TFrontendService(name: String)
     resp
   }
 
+  override def GetQueryId(req: TGetQueryIdReq): TGetQueryIdResp = {
+    debug(req.toString)
+    val resp = new TGetQueryIdResp
+    resp
+  }
+
+  override def SetClientInfo(req: TSetClientInfoReq): TSetClientInfoResp = {
+    debug(req.toString)
+    val resp = new TSetClientInfoResp
+    resp.setStatus(KyuubiSQLException.featureNotSupported().toTStatus)
+    resp
+  }
+
   protected def isServer(): Boolean = false
 
   class FeTServerEventHandler extends TServerEventHandler {
diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/constant/MySQLDataType.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/constant/MySQLDataType.scala
index 5322e02e6..a3b21fad8 100644
--- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/constant/MySQLDataType.scala
+++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/constant/MySQLDataType.scala
@@ -178,5 +178,6 @@ object MySQLDataType {
     case TTypeId.CHAR_TYPE => STRING
     case TTypeId.INTERVAL_YEAR_MONTH_TYPE => VAR_STRING // not exactly match, fallback
     case TTypeId.INTERVAL_DAY_TIME_TYPE => VAR_STRING // not exactly match, fallback
+    case TTypeId.TIMESTAMPLOCALTZ_TYPE => TIMESTAMP
   }
 }
diff --git a/pom.xml b/pom.xml
index aae2c4591..5bad86497 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,7 @@
         <guava.failureaccess.version>1.0.1</guava.failureaccess.version>
         <hadoop.version>3.3.2</hadoop.version>
         <hive.version>2.3.9</hive.version>
+        <hive.service.rpc.version>3.1.2</hive.service.rpc.version>
         <hudi.version>0.10.0</hudi.version>
         <iceberg.name>iceberg-spark-runtime-3.2_${scala.binary.version}</iceberg.name>
         <iceberg.version>0.13.1</iceberg.version>
@@ -557,7 +558,7 @@
             <dependency>
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-service-rpc</artifactId>
-                <version>${hive.version}</version>
+                <version>${hive.service.rpc.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>*</groupId>