(kyuubi) branch branch-1.8 updated: [KYUUBI #5969] Trino engine add default schema

[chengpan]

This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/kyuubi.git


The following commit(s) were added to refs/heads/branch-1.8 by this push:
     new 583d616af [KYUUBI #5969] Trino engine add default schema
583d616af is described below

commit 583d616af51eb28701ced994abfc1ce39f6e1579
Author: senmiaoliu <senmiao...@trip.com>
AuthorDate: Mon Jan 15 10:20:06 2024 +0800

    [KYUUBI #5969] Trino engine add default schema
    
    # :mag: Description
    ## Issue References 🔗
    
    This pull request fixes #5969
    
    ## Describe Your Solution 🔧
    
    Please include a summary of the change and which issue is fixed. Please 
also include relevant motivation and context. List any dependencies that are 
required for this change.
    
    ## Types of changes :bookmark:
    
    - [x] Bugfix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing 
functionality to change)
    
    ## Test Plan 🧪
    
    #### Behavior Without This Pull Request :coffin:
    
    #### Behavior With This Pull Request :tada:
    
    #### Related Unit Tests
    
    ---
    
    # Checklist 📝
    
    - [x] This patch was not authored or co-authored using [Generative 
Tooling](https://www.apache.org/legal/generative-tooling.html)
    
    **Be nice. Be informative.**
    
    Closes #5971 from lsm1/branch-kyuubi-trino-schema.
    
    Closes #5969
    
    dfc987e03 [senmiaoliu] trino engine add default result schema
    
    Authored-by: senmiaoliu <senmiao...@trip.com>
    Signed-off-by: Cheng Pan <cheng...@apache.org>
    (cherry picked from commit fcad8b520cd2e028b9103aaaf06fe9d5e7a337f7)
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 .../main/scala/org/apache/kyuubi/engine/trino/TrinoStatement.scala | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git 
a/externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/TrinoStatement.scala
 
b/externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/TrinoStatement.scala
index 2508f326e..65a0a3cde 100644
--- 
a/externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/TrinoStatement.scala
+++ 
b/externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/TrinoStatement.scala
@@ -25,6 +25,7 @@ import scala.concurrent.ExecutionContext
 
 import com.google.common.base.Verify
 import io.trino.client.ClientSession
+import io.trino.client.ClientTypeSignature
 import io.trino.client.Column
 import io.trino.client.StatementClient
 import io.trino.client.StatementClientFactory
@@ -46,6 +47,9 @@ class TrinoStatement(
     sql: String,
     operationLog: Option[OperationLog]) extends Logging {
 
+  private val defaultSchema: List[Column] =
+    List(new Column("Result", "VARCHAR", new ClientTypeSignature("VARCHAR")))
+
   private lazy val trino = StatementClientFactory
     .newStatementClient(trinoContext.httpClient, 
trinoContext.clientSession.get, sql)
 
@@ -68,6 +72,9 @@ class TrinoStatement(
       val columns = results.getColumns()
       if (columns != null) {
         info(s"Execute with Trino query id: ${results.getId}")
+        if (columns.isEmpty) {
+          return defaultSchema
+        }
         return columns.asScala.toList
       }
       trino.advance()