From 546d353a77778ca3a34b706fedf09661fc9269f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Sat, 12 Dec 2020 22:46:40 +0800 Subject: [PATCH] improved hive sql parser. fix #4050 --- .../hive/parser/HiveCreateTableParser.java | 50 +++++++++++-------- .../druid/bvt/sql/hive/HiveResourceTest.java | 4 ++ 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java index 5075a7d27a..32176f5697 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java @@ -280,26 +280,7 @@ public class HiveCreateTableParser extends SQLCreateTableParser { } if (lexer.identifierEquals(FnvHash.Constants.TBLPROPERTIES)) { - lexer.nextToken(); - accept(Token.LPAREN); - - for (;;) { - String name = lexer.stringVal(); - lexer.nextToken(); - accept(Token.EQ); - SQLExpr value = this.exprParser.primary(); - stmt.addTblProperty(name, value); - if (lexer.token() == Token.COMMA) { - lexer.nextToken(); - if (lexer.token() == Token.RPAREN) { - break; - } - continue; - } - break; - } - - accept(Token.RPAREN); + parseTblProperties(stmt); } if (lexer.identifierEquals(FnvHash.Constants.META)) { @@ -356,6 +337,35 @@ public class HiveCreateTableParser extends SQLCreateTableParser { return stmt; } + private void parseTblProperties(HiveCreateTableStatement stmt) { + lexer.nextToken(); + accept(Token.LPAREN); + + for (;;) { + String name = lexer.stringVal(); + lexer.nextToken(); + if (lexer.token() == Token.DOT) { + lexer.nextToken(); + name += "." + lexer.stringVal(); + lexer.nextToken(); + } + + accept(Token.EQ); + SQLExpr value = this.exprParser.primary(); + stmt.addTblProperty(name, value); + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + if (lexer.token() == Token.RPAREN) { + break; + } + continue; + } + break; + } + + accept(Token.RPAREN); + } + protected void parseLike(HiveCreateTableStatement stmt) { lexer.nextToken(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java index 17f1a99ebb..10097ce334 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java @@ -40,6 +40,10 @@ public class HiveResourceTest extends TestCase { exec_test("bvt/parser/hive-1.txt"); } + public void test_2() throws Exception { + exec_test("bvt/parser/hive-2.txt"); + } + public void exec_test(String resource) throws Exception { // System.out.println(resource); InputStream is = null;