(kyuubi) branch branch-1.9 updated: [KYUUBI #6182] JDBC engine using the overlay conf as session conf

[ch...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-1.9 by this push:
     new 250438d80 [KYUUBI #6182] JDBC engine using the overlay conf as session conf
250438d80 is described below

commit 250438d8083d9151397dcd2822044dcb1d3eb656
Author: senmiaoliu <se...@trip.com>
AuthorDate: Tue Mar 19 10:39:35 2024 +0800

    [KYUUBI #6182] JDBC engine using the overlay conf as session conf
    
    # :mag: Description
    ## Issue References 🔗
    
    ## Describe Your Solution 🔧
    
    Like #6147, JDBC engine should overwriting the engine conf with the passed conf consider as the full session conf.
    
    ## 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 📝
    
    - [ ] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html)
    
    **Be nice. Be informative.**
    
    Closes #6182 from lsm1/branch-jdbc-engine-use-overlay-conf.
    
    Closes #6182
    
    9ca8b487a [senmiaoliu] Using the overlay conf as session conf
    
    Authored-by: senmiaoliu <se...@trip.com>
    Signed-off-by: Cheng Pan <ch...@apache.org>
    (cherry picked from commit f4f79566481cb96f76c69ec30e1a2e60571caef4)
    Signed-off-by: Cheng Pan <ch...@apache.org>
---
 .../scala/org/apache/kyuubi/engine/jdbc/session/JdbcSessionImpl.scala    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/session/JdbcSessionImpl.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/session/JdbcSessionImpl.scala
index 09d08d2c8..9e2ffe858 100644
--- a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/session/JdbcSessionImpl.scala
+++ b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/session/JdbcSessionImpl.scala
@@ -53,6 +53,7 @@ class JdbcSessionImpl(
       kyuubiConf.set(ENGINE_JDBC_CONNECTION_USER, user)
       kyuubiConf.set(ENGINE_JDBC_CONNECTION_PASSWORD, password)
     }
+    conf.foreach { case (k, v) => kyuubiConf.set(k, v) }
     kyuubiConf
   }