diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java index 79dce715a8..8135a585fe 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java @@ -37,6 +37,9 @@ public class SQLInSubQueryExpr extends SQLExprImpl implements Serializable, SQLR // for ads query hint public SQLCommentHint hint; + // for clickhouse + private boolean global; + public SQLInSubQueryExpr(){ } @@ -53,6 +56,7 @@ public class SQLInSubQueryExpr extends SQLExprImpl implements Serializable, SQLR public SQLInSubQueryExpr clone() { SQLInSubQueryExpr x = new SQLInSubQueryExpr(); x.not = not; + x.global = global; if (expr != null) { x.setExpr(expr.clone()); } @@ -118,6 +122,7 @@ public class SQLInSubQueryExpr extends SQLExprImpl implements Serializable, SQLR int result = 1; result = prime * result + ((expr == null) ? 0 : expr.hashCode()); result = prime * result + (not ? 1231 : 1237); + result = prime * result + (global ? 1231 : 1237); result = prime * result + ((subQuery == null) ? 0 : subQuery.hashCode()); return result; } @@ -144,6 +149,9 @@ public class SQLInSubQueryExpr extends SQLExprImpl implements Serializable, SQLR if (not != other.not) { return false; } + if (global != other.global) { + return false; + } if (subQuery == null) { if (other.subQuery != null) { return false; @@ -174,4 +182,12 @@ public class SQLInSubQueryExpr extends SQLExprImpl implements Serializable, SQLR public void setHint(SQLCommentHint hint) { this.hint = hint; } + + public boolean isGlobal() { + return global; + } + + public void setGlobal(boolean global) { + this.global = global; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java index 3c365e21b3..a8acd4d8f2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java @@ -27,6 +27,7 @@ public class ClickhouseLexer extends Lexer { map.put("LIMIT", Token.LIMIT); map.put("SHOW", Token.SHOW); map.put("ALL", Token.ALL); + map.put("GLOBAL", Token.GLOBAL); DEFAULT_KEYWORDS = new Keywords(map); } 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 6fdc1cd006..d5d19c652f 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -1022,6 +1022,7 @@ public class SQLExprParser extends SQLParser { sqlExpr = new SQLBinaryExpr(strVal); break; } + case GLOBAL: case CONTAINS: sqlExpr = inRest(null); break; @@ -2580,6 +2581,14 @@ public class SQLExprParser extends SQLParser { } public final SQLExpr inRest(SQLExpr expr) { + boolean global = false; + + // for clickhouse + if (lexer.token == Token.GLOBAL) { + global = true; + lexer.nextToken(); + } + if (lexer.token == Token.IN) { lexer.nextTokenLParen(); @@ -2675,6 +2684,11 @@ public class SQLExprParser extends SQLParser { inSubQueryExpr.setSubQuery(((SQLQueryExpr) targetExpr).getSubQuery()); inSubQueryExpr.setHint(inListExpr.getHint()); + + if (global) { + inSubQueryExpr.setGlobal(true); + } + expr = inSubQueryExpr; } } @@ -3261,6 +3275,7 @@ public class SQLExprParser extends SQLParser { break; case IN: case CONTAINS: + case GLOBAL: expr = inRest(expr); break; case EQEQ: diff --git a/src/main/java/com/alibaba/druid/sql/parser/Token.java b/src/main/java/com/alibaba/druid/sql/parser/Token.java index 657a40d2b5..a03b208b0b 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Token.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Token.java @@ -66,12 +66,13 @@ public enum Token { EXPLAIN("EXPLAIN"), FOR("FOR"), - IF("IF"), - - - - ALL("ALL"), - UNION("UNION"), + IF("IF"), + + + + GLOBAL("GLOBAL"), + ALL("ALL"), + UNION("UNION"), EXCEPT("EXCEPT"), INTERSECT("INTERSECT"), MINUS("MINUS"), 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 56fe4df818..6d9d4ddea5 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -4239,7 +4239,11 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet if (x.isNot()) { print0(ucase ? " NOT IN (" : " not in ("); } else { - print0(ucase ? " IN (" : " in ("); + if (x.isGlobal()) { + print0(ucase ? " GLOBAL IN (" : " global in ("); + } else { + print0(ucase ? " IN (" : " in ("); + } } this.indentCount++; diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index 34c338280e..8bcf2bd932 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -121,7 +121,7 @@ public interface JdbcConstants { String ELASTIC_SEARCH_DRIVER = "com.alibaba.xdriver.elastic.jdbc.ElasticDriver"; - String CLICKHOUSE = "clickhouse"; + DbType CLICKHOUSE = DbType.clickhouse; String CLICKHOUSE_DRIVER = "ru.yandex.clickhouse.ClickHouseDriver"; String KDB = "kdb"; 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 new file mode 100644 index 0000000000..f9ac221333 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java @@ -0,0 +1,80 @@ +/* + * Copyright 1999-2018 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.clickhouse; + +import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.OracleTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.sql.parser.SQLParserUtils; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.Utils; +import org.junit.Assert; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.List; + +public class ClickHouseResourceTest extends OracleTest { + + public void test_0() throws Exception { + exec_test("bvt/parser/clickhouse-0.txt"); + } + + public void exec_test(String resource) throws Exception { + System.out.println(resource); + InputStream is = null; + + is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource); + Reader reader = new InputStreamReader(is, "UTF-8"); + String input = Utils.read(reader); + JdbcUtils.close(reader); + String[] items = input.split("---------------------------"); + String sql = items[0].trim(); + String expect = items.length > 1 ? items[1].trim() : null; + + List statementList = SQLUtils.parseStatements(sql, DbType.clickhouse); + + assertEquals(1, statementList.size()); + + SQLStatement stmt = statementList.get(0); + System.out.println(stmt.toString()); + + if (expect != null) { + assertEquals(expect, stmt.toString()); + } + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(DbType.clickhouse); + + for (int i = 0, size = statementList.size(); i < size; ++i) { + SQLStatement statement = statementList.get(i); + statement.accept(visitor); + } + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + + System.out.println(); + System.out.println(); + } + +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouse_select_0.java b/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouse_select_0.java index dce9d9725d..d67521dcb6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouse_select_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouse_select_0.java @@ -1,5 +1,6 @@ package com.alibaba.druid.bvt.sql.clickhouse; +import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; @@ -12,7 +13,7 @@ public class ClickHouse_select_0 extends TestCase { public void test_0() throws Exception { String sql = "SELECT date, transactionChannel, tranactionType FROM preComp_3All_20180322 limit 1,10"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.CLICKHOUSE); + List statementList = SQLUtils.parseStatements(sql, DbType.clickhouse); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -35,7 +36,7 @@ public class ClickHouse_select_0 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); - String output = SQLUtils.toSQLString(stmt, JdbcConstants.CLICKHOUSE); + String output = SQLUtils.toSQLString(stmt, DbType.clickhouse); assertEquals("SELECT date, transactionChannel, tranactionType\n" + "FROM preComp_3All_20180322\n" + "LIMIT 1, 10", // diff --git a/src/test/resources/bvt/parser/clickhouse-0.txt b/src/test/resources/bvt/parser/clickhouse-0.txt new file mode 100644 index 0000000000..594baf5ddd --- /dev/null +++ b/src/test/resources/bvt/parser/clickhouse-0.txt @@ -0,0 +1,13 @@ +SELECT uniq(UserID) FROM distributed_table WHERE CounterID = 101500 + AND UserID GLOBAL IN ( + SELECT UserID FROM distributed_table WHERE CounterID = 34 + ) +--------------------------- +SELECT uniq(UserID) +FROM distributed_table +WHERE CounterID = 101500 + AND UserID GLOBAL IN ( + SELECT UserID + FROM distributed_table + WHERE CounterID = 34 + ) \ No newline at end of file