Skip to content

[SPARK-33100][SQL][FOLLOWUP] Find correct bound of bracketed comment in spark-sql #31054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
turboFei wants to merge 10 commits into from
+19 −9
Closed

[SPARK-33100][SQL][FOLLOWUP] Find correct bound of bracketed comment in spark-sql #31054

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b42d28f
[SPARK-33100][FOLLOWUP] Find correct bound for bracketed comment in s…
turboFei Jan 6, 2021
a317344
complete ut
turboFei Jan 6, 2021
ada4d5c
address comment
turboFei Jan 7, 2021
e1814a6
address nits
turboFei Jan 7, 2021
6ee5332
retest please
turboFei Jan 7, 2021
612a58b
first time
turboFei Jan 7, 2021
39a2333
retest please
turboFei Jan 7, 2021
d9d4342
second time
turboFei Jan 7, 2021
bff0fb5
retest please
turboFei Jan 7, 2021
d348489
third time
turboFei Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...hriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@ private[hive] class SparkSQLCLIDriver extends CliDriver with Logging {
var bracketedCommentLevel = 0
var escape = false
var beginIndex = 0
var bracketedCommentRightBound = -1
var includingStatement = false
val ret = new JArrayList[String]

Expand All @@ -539,6 +540,10 @@ private[hive] class SparkSQLCLIDriver extends CliDriver with Logging {
index > beginIndex && !s"${line.charAt(index)}".trim.isEmpty)

for (index <- 0 until line.length) {
if (index > 0 && index - 1 == bracketedCommentRightBound) {
bracketedCommentLevel -= 1
}

if (line.charAt(index) == '\'' && !insideComment) {
// take a look to see if it is escaped
// See the comment above about SPARK-31595
Expand Down Expand Up @@ -585,7 +590,7 @@ private[hive] class SparkSQLCLIDriver extends CliDriver with Logging {
if (insideSingleQuote || insideDoubleQuote) {
// Ignores '/' in any case of quotes
} else if (insideBracketedComment && line.charAt(index - 1) == '*' ) {
bracketedCommentLevel -= 1
bracketedCommentRightBound = index
} else if (hasNext && !insideBracketedComment && line.charAt(index + 1) == '*') {
bracketedCommentLevel += 1
}
Expand Down
4 changes: 2 additions & 2 deletions sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,8 @@ class CliSuite extends SparkFunSuite with BeforeAndAfterAll with Logging {
"/* SELECT 'test';*/ SELECT 'test';" -> "test",
";;/* SELECT 'test';*/ SELECT 'test';" -> "test",
"/* SELECT 'test';*/;; SELECT 'test';" -> "test",
"SELECT 'test'; -- SELECT 'test';" -> "",
"SELECT 'test'; /* SELECT 'test';*/;" -> "",
"SELECT 'test'; -- SELECT 'test';" -> "test",
"SELECT 'test'; /* SELECT 'test';*/;" -> "test",
"/*$meta chars{^\\;}*/ SELECT 'test';" -> "test",
"/*\nmulti-line\n*/ SELECT 'test';" -> "test",
"/*/* multi-level bracketed*/ SELECT 'test';" -> "test"
Expand Down