Skip to content

[HUDI-4325] fix spark sql procedure cause ParseException with semicolon #5982

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

Merged
XuQianJin-Stars merged 2 commits into from
Jun 28, 2022
Merged

[HUDI-4325] fix spark sql procedure cause ParseException with semicolon #5982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50af663
[HUDI-4325] fix saprk sql procedure cause ParseException with semicolon
KnightChess Jun 27, 2022
ed65b16
update
KnightChess Jun 27, 2022
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
2 changes: 1 addition & 1 deletion ...datasource/hudi-spark/src/main/antlr4/org/apache/hudi/spark/sql/parser/HoodieSqlCommon.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}

singleStatement
: statement EOF
: statement ';'* EOF
;

statement
Expand Down
20 changes: 20 additions & 0 deletions ...hudi-spark/src/test/scala/org/apache/spark/sql/hudi/procedure/TestCallCommandParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,26 @@ class TestCallCommandParser extends HoodieSparkSqlTestBase {
checkParseExceptionContain("CALL cat.system radish kebab")("mismatched input 'CALL' expecting")
}

test("Test Call Produce with semicolon") {
val call = parser.parsePlan("CALL system.func(c1 => 1, c2 => '2', c3 => true)").asInstanceOf[CallCommand]
assertResult(ImmutableList.of("system", "func"))(JavaConverters.seqAsJavaListConverter(call.name).asJava)

assertResult(3)(call.args.size)

checkArg(call, 0, "c1", 1, DataTypes.IntegerType)
checkArg(call, 1, "c2", "2", DataTypes.StringType)
checkArg(call, 2, "c3", true, DataTypes.BooleanType)

val call2 = parser.parsePlan("CALL system.func2(c1 => 1, c2 => '2', c3 => true);").asInstanceOf[CallCommand]
assertResult(ImmutableList.of("system", "func2"))(JavaConverters.seqAsJavaListConverter(call2.name).asJava)

assertResult(3)(call2.args.size)

checkArg(call2, 0, "c1", 1, DataTypes.IntegerType)
checkArg(call2, 1, "c2", "2", DataTypes.StringType)
checkArg(call2, 2, "c3", true, DataTypes.BooleanType)
}

protected def checkParseExceptionContain(sql: String)(errorMsg: String): Unit = {
var hasException = false
try {
Expand Down