(kyuubi) branch branch-1.10 updated: [KYUUBI #7109] Ignore the ? in backticks

[chengpan]

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

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


The following commit(s) were added to refs/heads/branch-1.10 by this push:
     new 520f82f8fe [KYUUBI #7109] Ignore the ? in backticks
520f82f8fe is described below

commit 520f82f8fec8ac56ac4b12c2451ebaf16fe60377
Author: Wenjun Ruan <wen...@apache.org>
AuthorDate: Mon Jul 7 20:56:36 2025 +0800

    [KYUUBI #7109] Ignore the ? in backticks
    
    ### Why are the changes needed?
    We will split the sql by `?` when we use `KyuubiPreparedStatement`. But 
there exist corner case when ? exist in backticks.
    For example, below sql contains `?`, but we shouldn't split it by `?`.
    ```sql
    SELECT `(ds|hr)?+.+` FROM sales
    ```
    More details can find at 
https://hive.apache.org/docs/latest/languagemanual-select_27362043/#regex-column-specification
    
    Hive upstream fix - HIVE-29060
    
    ### How was this patch tested?
    
    UT.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    NO.
    
    Closes #7125 from ruanwenjun/dev_wenjun_fix7109.
    
    Closes #7109
    
    7140980fd [ruanwenjun] [KYUUBI #7109] Ignore the ? in backticks
    
    Lead-authored-by: Wenjun Ruan <wen...@apache.org>
    Co-authored-by: ruanwenjun <zyb@wenjuns-MacBook-Pro-2.local>
    Signed-off-by: Cheng Pan <cheng...@apache.org>
    (cherry picked from commit 4e40f9457dfcde9b2748eb6da877e1ee32193fca)
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 .../src/main/java/org/apache/kyuubi/jdbc/hive/Utils.java   | 14 ++++++++++----
 .../test/java/org/apache/kyuubi/jdbc/hive/UtilsTest.java   | 12 ++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git 
a/kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/hive/Utils.java 
b/kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/hive/Utils.java
index 39e5275a5c..c57829a8e0 100644
--- a/kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/hive/Utils.java
+++ b/kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/hive/Utils.java
@@ -124,6 +124,7 @@ public class Utils {
     boolean inSingleQuote = false;
     boolean inDoubleQuote = false;
     boolean inComment = false;
+    boolean inBackticks = false;
     int off = 0;
     boolean skip = false;
 
@@ -148,8 +149,13 @@ public class Utils {
             inDoubleQuote = !inDoubleQuote;
           }
           break;
-        case '-':
+        case '`':
           if (!inSingleQuote && !inDoubleQuote) {
+            inBackticks = !inBackticks;
+          }
+          break;
+        case '-':
+          if (!inSingleQuote && !inDoubleQuote && !inBackticks) {
             if (i < sql.length() - 1 && sql.charAt(i + 1) == '-') {
               inComment = true;
             }
@@ -161,7 +167,7 @@ public class Utils {
           }
           break;
         case '?':
-          if (!inSingleQuote && !inDoubleQuote) {
+          if (!inSingleQuote && !inDoubleQuote && !inBackticks) {
             parts.add(sql.substring(off, i));
             off = i + 1;
           }
@@ -191,7 +197,7 @@ public class Utils {
   }
 
   public static JdbcConnectionParams parseURL(String uri)
-      throws JdbcUriParseException, SQLException, ZooKeeperHiveClientException 
{
+      throws JdbcUriParseException, ZooKeeperHiveClientException {
     return parseURL(uri, new Properties());
   }
 
@@ -215,7 +221,7 @@ public class Utils {
    * 
jdbc:hive2://server:10001/db;user=foo;password=bar?hive.server2.transport.mode=http;hive.server2.thrift.http.path=hs2
    */
   public static JdbcConnectionParams parseURL(String uri, Properties info)
-      throws JdbcUriParseException, SQLException, ZooKeeperHiveClientException 
{
+      throws JdbcUriParseException, ZooKeeperHiveClientException {
     JdbcConnectionParams connParams = extractURLComponents(uri, info);
     if 
(ZooKeeperHiveClientHelper.isZkDynamicDiscoveryMode(connParams.getSessionVars()))
 {
       configureConnParamsFromZooKeeper(connParams);
diff --git 
a/kyuubi-hive-jdbc/src/test/java/org/apache/kyuubi/jdbc/hive/UtilsTest.java 
b/kyuubi-hive-jdbc/src/test/java/org/apache/kyuubi/jdbc/hive/UtilsTest.java
index 87f1a78de5..0c04d4ade9 100644
--- a/kyuubi-hive-jdbc/src/test/java/org/apache/kyuubi/jdbc/hive/UtilsTest.java
+++ b/kyuubi-hive-jdbc/src/test/java/org/apache/kyuubi/jdbc/hive/UtilsTest.java
@@ -197,5 +197,17 @@ public class UtilsTest {
     assertEquals("--comments\n" + "select --? \n", splitSql.get(0));
     assertEquals(" from ", splitSql.get(1));
     assertEquals("", splitSql.get(2));
+
+    String inIdentifierQuoted =
+        "SELECT "
+            + "regexp_replace(col2, '\\n|\\r|\\t', '') as col2, "
+            + "`(col2|col2)?+.+` "
+            + "FROM ?";
+    splitSql = Utils.splitSqlStatement(inIdentifierQuoted);
+    assertEquals(2, splitSql.size());
+    assertEquals(
+        "SELECT regexp_replace(col2, '\\n|\\r|\\t', '') as col2, 
`(col2|col2)?+.+` FROM ",
+        splitSql.get(0));
+    assertEquals("", splitSql.get(1));
   }
 }