Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

improved odps sql parser for select_distribute_by. issue #1492

Browse Source
This commit is contained in:
wenshao
2016-11-18 22:12:54 +08:00
parent f412712241
commit df440aa78c
4 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java
+2 -6
View File
@@ -35,7 +35,7 @@ public class OdpsSelectQueryBlock extends SQLSelectQueryBlock {
protected List<SQLHint> hints;
protected SQLExpr distributeBy;
protected List<SQLExpr> distributeBy = new ArrayList<SQLExpr>();
protected List<SQLSelectOrderByItem> sortBy = new ArrayList<SQLSelectOrderByItem>(2);
public OdpsSelectQueryBlock(){
@@ -50,14 +50,10 @@ public class OdpsSelectQueryBlock extends SQLSelectQueryBlock {
this.orderBy = orderBy;
}
public SQLExpr getDistributeBy() {
public List<SQLExpr> getDistributeBy() {
return distributeBy;
}
public void setDistributeBy(SQLExpr distributeBy) {
this.distributeBy = distributeBy;
}
public List<SQLSelectOrderByItem> getSortBy() {
return sortBy;
}
src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java
+1 -3
View File
@@ -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();
src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java
+2 -2
View File
@@ -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 ");