From df440aa78c0f193397d33a7a65f361369b11e0a1 Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 18 Nov 2016 22:12:54 +0800 Subject: [PATCH] improved odps sql parser for select_distribute_by. issue #1492 --- .../odps/ast/OdpsSelectQueryBlock.java | 8 +-- .../dialect/odps/parser/OdpsSelectParser.java | 4 +- .../odps/visitor/OdpsOutputVisitor.java | 4 +- .../druid/bvt/sql/odps/OdpsSelectTest20.java | 60 +++++++++++++++++++ 4 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java index 570a11e8b7..de48c11635 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java @@ -35,7 +35,7 @@ public class OdpsSelectQueryBlock extends SQLSelectQueryBlock { protected List hints; - protected SQLExpr distributeBy; + protected List distributeBy = new ArrayList(); protected List sortBy = new ArrayList(2); public OdpsSelectQueryBlock(){ @@ -50,14 +50,10 @@ public class OdpsSelectQueryBlock extends SQLSelectQueryBlock { this.orderBy = orderBy; } - public SQLExpr getDistributeBy() { + public List getDistributeBy() { return distributeBy; } - public void setDistributeBy(SQLExpr distributeBy) { - this.distributeBy = distributeBy; - } - public List getSortBy() { return sortBy; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java index 62442cf85f..6386abef9d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java @@ -85,9 +85,7 @@ public class OdpsSelectParser extends SQLSelectParser { if (lexer.token() == Token.DISTRIBUTE) { lexer.nextToken(); accept(Token.BY); - SQLExpr distributeBy = this.expr(); - queryBlock.setDistributeBy(distributeBy); - + this.exprParser.exprList(queryBlock.getDistributeBy(), queryBlock); if (identifierEquals("SORT")) { lexer.nextToken(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java index b83ec015fa..3b31a2e5b3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java @@ -513,10 +513,10 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis x.getOrderBy().accept(this); } - if (x.getDistributeBy() != null) { + if (x.getDistributeBy().size() > 0) { println(); print0(ucase ? "DISTRIBUTE BY " : "distribute by "); - x.getDistributeBy().accept(this); + printAndAccept(x.getDistributeBy(), ", "); if (!x.getSortBy().isEmpty()) { print0(ucase ? " SORT BY " : " sort by "); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java new file mode 100644 index 0000000000..07b31fe785 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java @@ -0,0 +1,60 @@ +/* + * Copyright 1999-2101 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.odps; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; +import org.junit.Assert; + +import java.util.List; + +public class OdpsSelectTest20 extends TestCase { + + public void test_select() throws Exception { + // 1095288847322 + String sql = "select * from a DISTRIBUTE BY b,c";// + Assert.assertEquals("SELECT *\n" + + "FROM a\n" + + "DISTRIBUTE BY b, c", SQLUtils.formatOdps(sql)); + Assert.assertEquals("select *\n" + + "from a\n" + + "distribute by b, c", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); + SQLStatement stmt = statementList.get(0); + + Assert.assertEquals(1, statementList.size()); + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); + stmt.accept(visitor); + +// System.out.println("Tables : " + visitor.getTables()); +// System.out.println("fields : " + visitor.getColumns()); +// System.out.println("coditions : " + visitor.getConditions()); +// System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(3, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + +// Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); + } + + +}