apache/kyuubi
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

[KYUUBI #4406] Revert "[KYUUBI #4305][Bug] Backport HIVE-15820: comment at the head …

Browse Source 
…of beeline -e"

This reverts commit c489e29697.

### _Why are the changes needed?_

https://github.com/apache/kyuubi/pull/4333#issuecomment-1441438302

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [ ] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #4406 from cfmcgrady/revert-4333.

Closes #4406

Closes #4305

c7fff72a [Fu Chen] Revert "[KYUUBI #4305][Bug] Backport HIVE-15820: comment at the head of beeline -e"

Authored-by: Fu Chen <cfmcgrady@gmail.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
This commit is contained in:
Fu Chen 2023-02-24 13:35:36 +08:00 committed by Cheng Pan
parent 0175e4649a
commit b39caed98f
No known key found for this signature in database
GPG Key ID: 8001952629BCC75D
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java
View File

@ -29,7 +29,6 @@ import java.util.List;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.hive.common.util.HiveStringUtils;
public class KyuubiBeeLine extends BeeLine {
public static final String KYUUBI_BEELINE_DEFAULT_JDBC_DRIVER =
@ -193,9 +192,4 @@ public class KyuubiBeeLine extends BeeLine {
}
return code;
}
@Override
boolean dispatch(String line) {
return super.dispatch(HiveStringUtils.removeComments(line));
}
}

6
kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiCommands.java
View File

@ -23,7 +23,6 @@ import java.io.*;
import java.sql.*;
import java.util.*;
import org.apache.hive.beeline.logs.KyuubiBeelineInPlaceUpdateStream;
import org.apache.hive.common.util.HiveStringUtils;
import org.apache.kyuubi.jdbc.hive.KyuubiStatement;
import org.apache.kyuubi.jdbc.hive.Utils;
import org.apache.kyuubi.jdbc.hive.logs.InPlaceUpdateStream;
@ -500,7 +499,7 @@ public class KyuubiCommands extends Commands {
@Override
public String handleMultiLineCmd(String line) throws IOException {
line = HiveStringUtils.removeComments(line);
int[] startQuote = {-1};
Character mask =
(System.getProperty("jline.terminal", "").equals("jline.UnsupportedTerminal"))
? null
@ -531,8 +530,7 @@ public class KyuubiCommands extends Commands {
if (extra == null) { // it happens when using -f and the line of cmds does not end with ;
break;
}
extra = HiveStringUtils.removeComments(extra);
if (extra != null && !extra.isEmpty()) {
if (!extra.isEmpty()) {
line += "\n" + extra;
}
}

13
kyuubi-hive-beeline/src/test/java/org/apache/hive/beeline/KyuubiBeeLineTest.java
View File

@ -29,17 +29,4 @@ public class KyuubiBeeLineTest {
int result = kyuubiBeeLine.initArgs(new String[0]);
assertEquals(0, result);
}
@Test
public void testKyuubiBeelineComment() {
KyuubiBeeLine kyuubiBeeLine = new KyuubiBeeLine();
int result = kyuubiBeeLine.initArgsFromCliVars(new String[] {"-e", "--comment show database;"});
assertEquals(0, result);
result = kyuubiBeeLine.initArgsFromCliVars(new String[] {"-e", "--comment\n show database;"});
assertEquals(1, result);
result =
kyuubiBeeLine.initArgsFromCliVars(
new String[] {"-e", "--comment line 1 \n --comment line 2 \n show database;"});
assertEquals(1, result);
}
}