From 5761dccf904c1fe8120767f86d67ccf0be171726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Wed, 30 Dec 2020 15:01:52 +0800 Subject: [PATCH] support clickhouse nested datatype/create table engine, fix #4106 --- .../statement/SQLCreateTableStatement.java | 12 ++++++ .../visitor/ClickhouseOutputVisitor.java | 31 ++++++++++++++ .../sql/parser/SQLCreateTableParser.java | 10 +++++ .../druid/sql/parser/SQLExprParser.java | 40 +++++++++++++++++++ .../sql/visitor/SQLASTOutputVisitor.java | 6 +++ .../clickhouse/ClickHouseResourceTest.java | 4 ++ .../resources/bvt/parser/clickhouse-3.txt | 20 ++++++++++ 7 files changed, 123 insertions(+) create mode 100644 src/test/resources/bvt/parser/clickhouse-3.txt diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java index 12df37a315..bf2eb5fa4c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java @@ -72,6 +72,7 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS protected boolean replace = false; protected boolean ignore = false; protected boolean dimension; + protected SQLExpr engine; public SQLCreateTableStatement(){ @@ -1534,4 +1535,15 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS return false; } + + public SQLExpr getEngine() { + return engine; + } + + public void setEngine(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.engine = x; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseOutputVisitor.java index 74249363e4..7d068912a6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseOutputVisitor.java @@ -1,6 +1,10 @@ package com.alibaba.druid.sql.dialect.clickhouse.visitor; import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.ast.SQLDataType; +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.SQLRowDataType; +import com.alibaba.druid.sql.ast.SQLStructDataType; import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLWithSubqueryClause; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; @@ -40,4 +44,31 @@ public class ClickhouseOutputVisitor extends SQLASTOutputVisitor implements Clic return false; } + + public boolean visit(SQLStructDataType x) { + print0(ucase ? "NESTED (" : "nested ("); + incrementIndent(); + println(); + printlnAndAccept(x.getFields(), ","); + decrementIndent(); + println(); + print(')'); + return false; + } + + @Override + public boolean visit(SQLStructDataType.Field x) { + SQLName name = x.getName(); + if (name != null) { + name.accept(this); + } + SQLDataType dataType = x.getDataType(); + + if (dataType != null) { + print(' '); + dataType.accept(this); + } + + return false; + } } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java index 05eeb39180..44a484fdc4 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java @@ -182,6 +182,16 @@ public class SQLCreateTableParser extends SQLDDLParser { createTable.setPartitioning(partitionClause); } + if (dbType == DbType.clickhouse) { + if (lexer.identifierEquals(FnvHash.Constants.ENGINE)) { + lexer.nextToken(); + accept(Token.EQ); + createTable.setEngine( + this.exprParser.expr() + ); + } + } + return createTable; } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index ffd61d48da..57cd501230 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -3675,6 +3675,46 @@ public class SQLExprParser extends SQLParser { } else if (lexer.identifierEquals(FnvHash.Constants.ROW) || lexer.token == Token.ROW) { lexer.nextToken(); return parseSqlRowDataType(); + } else if (lexer.identifierEquals(FnvHash.Constants.NESTED) && dbType == DbType.clickhouse) { + lexer.nextToken(); + accept(Token.LPAREN); + + SQLStructDataType struct = new SQLStructDataType(dbType); + + for (;;) { + SQLName name; + switch (lexer.token) { + case GROUP: + case ORDER: + case FROM: + case TO: + name = new SQLIdentifierExpr(lexer.stringVal()); + lexer.nextToken(); + break; + default: + name = this.name(); + break; + } + + SQLDataType dataType = this.parseDataType(); + SQLStructDataType.Field field = struct.addField(name, dataType); + + if (lexer.token == Token.COMMENT) { + lexer.nextToken(); + SQLCharExpr chars = (SQLCharExpr) this.primary(); + field.setComment(chars.getText()); + } + + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + continue; + } + break; + } + + accept(Token.RPAREN); + + return struct; } if (lexer.identifierEquals(FnvHash.Constants.UNIONTYPE)) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index 1f47803b31..0b1ee642b1 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -3526,6 +3526,12 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet tablespace.accept(this); } + SQLExpr engine = x.getEngine(); + if (engine != null) { + print0(ucase ? " ENGINE = " : " engine = "); + engine.accept(this); + } + return false; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java index f0ba762e88..46f395e3b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java @@ -48,6 +48,10 @@ public class ClickHouseResourceTest extends OracleTest { exec_test("bvt/parser/clickhouse-2.txt"); } + public void test_3() throws Exception { + exec_test("bvt/parser/clickhouse-3.txt"); + } + public void exec_test(String resource) throws Exception { System.out.println(resource); InputStream is = null; diff --git a/src/test/resources/bvt/parser/clickhouse-3.txt b/src/test/resources/bvt/parser/clickhouse-3.txt new file mode 100644 index 0000000000..f62ca47f3c --- /dev/null +++ b/src/test/resources/bvt/parser/clickhouse-3.txt @@ -0,0 +1,20 @@ +CREATE TABLE visits ( + time DateTime, + visits Nested + ( + a String, + btime Int64, + c String, + e String + ) +) ENGINE = Memory; +--------------------------- +CREATE TABLE visits ( + time DateTime, + visits NESTED ( + a String, + btime Int64, + c String, + e String + ) +) ENGINE = Memory; \ No newline at end of file