Merge pull request alibaba#942 from wenshao/master

improved odps sql formatter
StempG · Aug 31, 2015 · 2aff049 · 2aff049
2 parents ac2e74d + 549c66a
commit 2aff049
Showing 11 changed files with 45 additions and 18 deletions.
diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
@@ -30,6 +30,7 @@
 import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
+import com.alibaba.druid.sql.ast.statement.SQLSetStatement;
 import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem;
 import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
 import com.alibaba.druid.sql.dialect.db2.visitor.DB2OutputVisitor;
@@ -267,6 +268,10 @@ public static String toSQLString(List<SQLStatement> statementList, String dbType
                     }
                 }
                 visitor.println();
+
+                if (!(stmt instanceof SQLSetStatement)) {
+                    visitor.println();
+                }
             }
             {
                 List<String> comments = stmt.getBeforeCommentsDirect();

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
@@ -21,6 +21,7 @@
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLHint;
 import com.alibaba.druid.sql.ast.SQLOrderBy;
+import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
@@ -34,7 +35,7 @@ public class OdpsSelectQueryBlock extends SQLSelectQueryBlock {
     protected List<SQLHint> hints;
 
     protected SQLExpr distributeBy;
-    protected SQLExpr sortBy;
+    protected SQLSelectOrderByItem sortBy;
 
     public OdpsSelectQueryBlock(){
 
@@ -56,11 +57,11 @@ public void setDistributeBy(SQLExpr distributeBy) {
         this.distributeBy = distributeBy;
     }
 
-    public SQLExpr getSortBy() {
+    public SQLSelectOrderByItem getSortBy() {
         return sortBy;
     }
 
-    public void setSortBy(SQLExpr sortBy) {
+    public void setSortBy(SQLSelectOrderByItem sortBy) {
         this.sortBy = 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
@@ -16,7 +16,9 @@
 package com.alibaba.druid.sql.dialect.odps.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLOrderingSpecification;
 import com.alibaba.druid.sql.ast.SQLSetQuantifier;
+import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock;
 import com.alibaba.druid.sql.parser.SQLExprParser;
@@ -88,7 +90,18 @@ public SQLSelectQuery query() {
             if (identifierEquals("SORT")) {
                 lexer.nextToken();
                 accept(Token.BY);
-                SQLExpr sortBy = this.expr();
+                SQLExpr expr = this.expr();
+
+                SQLSelectOrderByItem sortBy = new SQLSelectOrderByItem(expr);
+
+                if (lexer.token() == Token.ASC) {
+                    sortBy.setType(SQLOrderingSpecification.ASC);
+                    lexer.nextToken();
+                } else if (lexer.token() == Token.DESC) {
+                    sortBy.setType(SQLOrderingSpecification.DESC);
+                    lexer.nextToken();
+                }
+
                 queryBlock.setSortBy(sortBy);
             }
         }

diff --git a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java
@@ -79,6 +79,8 @@ public class Lexer {
     protected boolean        keepComments = false;
 
     protected int            line         = 0;
+
+    protected int            lines        = 0;
 
     public Lexer(String input){
         this(input, null);
@@ -293,10 +295,15 @@ public final void nextToken() {
             comments = null;
         }
 
+        this.lines = 0;
+        int startLine = line;
+
         for (;;) {
             if (isWhitespace(ch)) {
                 if (ch == '\n') {
                     line++;
+
+                    lines = line - startLine;
                 }
 
                 scanChar();

diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest2.java
@@ -19,6 +19,7 @@ public void test_column_comment() throws Exception {
                 + "\n--[Created -2015-06-10 13:19:18]"
                 + "\n--[Update ]"
                 + "\nSET odps.sql.mapper.split.size = 2048;"
+                + "\n" //
                 + "\nSELECT *"
                 + "\nFROM dual;", SQLUtils.formatOdps(sql));
     }

diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest3.java
@@ -20,8 +20,10 @@ public void test_column_comment() throws Exception {
                 + "\nSET odps.service.mode = all;"//
                 + "\n-- 使用新引擎"//
                 + "\nSET odps.nvm.enabled = true;"//
+                + "\n" //
                 + "\nSELECT f1 -- aa"//
                 + "\nFROM t0;"//
+                + "\n" //
                 + "\nSELECT f2 -- aa"//
                 + "\nFROM t1;", SQLUtils.formatOdps(sql));
     }

diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java
@@ -15,6 +15,7 @@ public void test_column_comment() throws Exception {
         Assert.assertEquals("--这里是注释"
                 + "\nSELECT *"
                 + "\nFROM table1;"
+                + "\n"
                 + "\nSELECT *"
                 + "\nFROM table2;", SQLUtils.formatOdps(sql));
     }

diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest8.java
@@ -15,9 +15,11 @@ public void test_column_comment() throws Exception {
                 ;//
         Assert.assertEquals("SELECT *"
                 + "\nFROM table1;"
+                + "\n"
                 + "\n--comment1 goes here"
                 + "\nSELECT *"
                 + "\nFROM table2;"
+                + "\n"
                 + "\nSELECT *"
                 + "\nFROM table3;--comment2 goes here", SQLUtils.formatOdps(sql));
     }

diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java
@@ -11,6 +11,7 @@ public void test_format() throws Exception {
         String sql = "select * from t1; ;select * from t2;";
         Assert.assertEquals("SELECT *" //
                 + "\nFROM t1;" //
+                + "\n"
                 + "\nSELECT *" //
                 + "\nFROM t2;", SQLUtils.formatOdps(sql));
     }
@@ -19,6 +20,7 @@ public void test_no_semi() throws Exception {
         String sql = "select * from t1; ;select * from t2";
         Assert.assertEquals("SELECT *" //
                 + "\nFROM t1;" //
+                + "\n"
                 + "\nSELECT *" //
                 + "\nFROM t2", SQLUtils.formatOdps(sql));
     }

diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest.java
@@ -36,5 +36,12 @@ public void test_distribute_by_1() throws Exception {
                             + "\nFROM sale_detail" //
                             + "\nDISTRIBUTE BY region SORT BY f1;", SQLUtils.formatOdps(sql));
     }
+
+    public void test_distribute_by_2() throws Exception {
+        String sql = " select region from sale_detail distribute by region sort by f1 asc;";//
+        Assert.assertEquals("SELECT region" //
+                            + "\nFROM sale_detail" //
+                            + "\nDISTRIBUTE BY region SORT BY f1 ASC;", SQLUtils.formatOdps(sql));
+    }
 
 }
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportColumnsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportColumnsTest.java