(kyuubi) branch branch-1.9 updated: Revert "[KYUUBI #6526] Kyuubi BeeLine wrongly process JDBC URL that contains `--`"

[chengpan]

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 2fd7f0cba Revert "[KYUUBI #6526] Kyuubi BeeLine wrongly process JDBC 
URL that contains `--`"
2fd7f0cba is described below

commit 2fd7f0cbafeac0de58eaa00ce46352a48e1fa004
Author: Cheng Pan <cheng...@apache.org>
AuthorDate: Mon Jul 8 16:39:39 2024 +0800

    Revert "[KYUUBI #6526] Kyuubi BeeLine wrongly process JDBC URL that 
contains `--`"
    
    This reverts commit 73d7ee64229f059b18ee929cc5d914f84b367bc1.
---
 .../src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java   |  7 ++++---
 .../test/java/org/apache/hive/beeline/KyuubiBeeLineTest.java   | 10 ----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git 
a/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java 
b/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java
index 9498c1156..bcfa6944e 100644
--- 
a/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java
+++ 
b/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java
@@ -218,7 +218,7 @@ public class KyuubiBeeLine extends BeeLine {
     if (!commands.isEmpty()) {
       for (String command : commands) {
         debug(loc("executing-command", command));
-        if (!removeCommentsDispatch(command)) {
+        if (!dispatch(command)) {
           code++;
         }
       }
@@ -282,8 +282,9 @@ public class KyuubiBeeLine extends BeeLine {
     return executionResult;
   }
 
-  // see HIVE-15820: comment at the head of beeline -e only dispatch commands
-  boolean removeCommentsDispatch(String line) {
+  // see HIVE-15820: comment at the head of beeline -e
+  @Override
+  boolean dispatch(String line) {
     return super.dispatch(isPythonMode() ? line : 
HiveStringUtils.removeComments(line));
   }
 
diff --git 
a/kyuubi-hive-beeline/src/test/java/org/apache/hive/beeline/KyuubiBeeLineTest.java
 
b/kyuubi-hive-beeline/src/test/java/org/apache/hive/beeline/KyuubiBeeLineTest.java
index a58d9057c..8b87b13a0 100644
--- 
a/kyuubi-hive-beeline/src/test/java/org/apache/hive/beeline/KyuubiBeeLineTest.java
+++ 
b/kyuubi-hive-beeline/src/test/java/org/apache/hive/beeline/KyuubiBeeLineTest.java
@@ -95,14 +95,12 @@ public class KyuubiBeeLineTest {
 
   @Test
   public void testKyuubiBeelineComment() {
-    String[] url = new String[] {""};
     KyuubiBeeLine interceptedKyuubiBeeLine =
         new KyuubiBeeLine() {
           @Override
           boolean dispatch(String line) {
             if (line != null && line.startsWith("!connect")) {
               LOG.info("Return true for command: {} to pretend connection is 
established.", line);
-              url[0] = line;
               return true;
             }
             return super.dispatch(line);
@@ -124,14 +122,12 @@ public class KyuubiBeeLineTest {
     interceptedKyuubiBeeLine.initArgs(
         new String[] {"-u", "dummy_url", "-e", "--comment show database;"});
     assertEquals(0, cmd[0].length());
-    assertEquals("!connect dummy_url '' '' ", url[0]);
 
     // Beeline#exit must be false to execute sql
     interceptedKyuubiBeeLine.setExit(false);
     interceptedKyuubiBeeLine.initArgs(
         new String[] {"-u", "dummy_url", "-e", "--comment\n show database;"});
     assertEquals("show database;", cmd[0]);
-    assertEquals("!connect dummy_url '' '' ", url[0]);
 
     interceptedKyuubiBeeLine.setExit(false);
     interceptedKyuubiBeeLine.initArgs(
@@ -139,12 +135,6 @@ public class KyuubiBeeLineTest {
           "-u", "dummy_url", "-e", "--comment line 1 \n    --comment line 2 \n 
show database;"
         });
     assertEquals("show database;", cmd[0]);
-
-    interceptedKyuubiBeeLine.setExit(false);
-    interceptedKyuubiBeeLine.initArgs(
-        new String[] {"-u", "dummy--url", "-e", "--comment\n show database;"});
-    assertEquals("show database;", cmd[0]);
-    assertEquals("!connect dummy--url '' '' ", url[0]);
   }
 
   static class BufferPrintStream extends PrintStream {