From 0e0d20672d58931cd0e8c03889cd67b1cad0aa49 Mon Sep 17 00:00:00 2001
From: v-kkhuang <62878639+v-kkhuang@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:00:53 +0800
Subject: [PATCH] [1.10.0] sdk support shell return (#657)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add a method to obtain the result set, getResultSet is used to obtain the result set

* jdbc driver support shell return

* jdbc driver support shell return

* Code optimization

---------

Co-authored-by: “v_kkhuang” <“420895376@qq.com”>
---
 .../linkis/ujes/jdbc/UJESSQLResultSet.scala   | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLResultSet.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLResultSet.scala
index 37c379a7ca..cbfa94b232 100644
--- a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLResultSet.scala
+++ b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLResultSet.scala
@@ -175,13 +175,23 @@ class UJESSQLResultSet(
     if (null == resultSetResult) {
       return
     }
-    metaData = resultSetResult.getMetadata.asInstanceOf[util.List[util.Map[String, String]]]
-    if (null != metaData) {
-      for (cursor <- 1 to metaData.size()) {
-        val col = metaData.get(cursor - 1)
-        resultSetMetaData.setColumnNameProperties(cursor, col.get("columnName"))
-        resultSetMetaData.setDataTypeProperties(cursor, col.get("dataType"))
-        resultSetMetaData.setCommentPropreties(cursor, col.get("comment"))
+    val metaTmp = resultSetResult.getMetadata
+    if ("NULL".equals(String.valueOf(metaTmp))) {
+      val fileContentList = resultSetResult.getFileContent.asInstanceOf[util.List[util.List[String]]]
+      if (null != fileContentList) {
+        resultSetMetaData.setColumnNameProperties(1, "linkis_string")
+        resultSetMetaData.setDataTypeProperties(1, "String")
+        resultSetMetaData.setCommentPropreties(1, "NULL")
+      }
+    } else {
+      metaData = metaTmp.asInstanceOf[util.List[util.Map[String, String]]]
+      if (null != metaData) {
+        for (cursor <- 1 to metaData.size()) {
+          val col = metaData.get(cursor - 1)
+          resultSetMetaData.setColumnNameProperties(cursor, col.get("columnName"))
+          resultSetMetaData.setDataTypeProperties(cursor, col.get("dataType"))
+          resultSetMetaData.setCommentPropreties(cursor, col.get("comment"))
+        }
       }
     }
   }
@@ -194,12 +204,6 @@ class UJESSQLResultSet(
       resultSetResult.getFileContent.asInstanceOf[util.ArrayList[util.ArrayList[String]]]
   }
 
-  def getResultSet(): util.ArrayList[util.ArrayList[String]] = {
-    resultSetResultInit()
-    resultSetInit()
-    resultSetRow
-  }
-
   private def init(): Unit = {
     resultSetResultInit()
     metaDataInit()