improved sql parser odps support

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDescribeStatement.java

@@ -16,11 +16,11 @@
 package com.alibaba.druid.sql.dialect.mysql.ast.statement;
 
 import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.statement.SQLDescribeStatement;
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
-public class MySqlDescribeStatement extends MySqlStatementImpl {
-
-    private SQLName object;
+public class MySqlDescribeStatement extends SQLDescribeStatement implements MySqlStatement {
 
     private SQLName colName;
 
@@ -32,12 +32,13 @@ public class MySqlDescribeStatement extends MySqlStatementImpl {
         visitor.endVisit(this);
     }
 
-    public SQLName getObject() {
-        return object;
-    }
-
-    public void setObject(SQLName object) {
-        this.object = object;
+    @Override
+    public void accept0(SQLASTVisitor visitor) {
+        if (visitor instanceof MySqlASTVisitor) {
+            accept0((MySqlASTVisitor) visitor);
+        } else {
+            throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName());
+        }
     }
 
     public SQLName getColName() {

src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddStatisticStatement.java

@@ -0,0 +1,43 @@
+package com.alibaba.druid.sql.dialect.odps.ast;
+
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
+import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor;
+
+public class OdpsAddStatisticStatement extends OdpsStatementImpl {
+
+    private SQLExprTableSource table;
+
+    private OdpsStatisticClause statisticClause;
+
+    @Override
+    protected void accept0(OdpsASTVisitor visitor) {
+        if (visitor.visit(this)) {
+            this.acceptChild(visitor, table);
+        }
+        visitor.endVisit(this);
+    }
+
+    public SQLExprTableSource getTable() {
+        return table;
+    }
+
+    public void setTable(SQLExprTableSource table) {
+        if (table != null) {
+            table.setParent(table);
+        }
+        this.table = table;
+    }
+
+    public void setTable(SQLName table) {
+        this.setTable(new SQLExprTableSource(table));
+    }
+
+    public OdpsStatisticClause getStatisticClause() {
+        return statisticClause;
+    }
+
+    public void setStatisticClause(OdpsStatisticClause statisticClause) {
+        this.statisticClause = statisticClause;
+    }
+}

src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAnalyzeTableStatement.java

@@ -0,0 +1,44 @@
+package com.alibaba.druid.sql.dialect.odps.ast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
+import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
+import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor;
+
+public class OdpsAnalyzeTableStatement extends OdpsStatementImpl {
+
+    private SQLExprTableSource  table;
+    private List<SQLAssignItem> partition = new ArrayList<SQLAssignItem>();
+
+    @Override
+    protected void accept0(OdpsASTVisitor visitor) {
+        if (visitor.visit(this)) {
+            this.acceptChild(visitor, table);
+            this.acceptChild(visitor, partition);
+        }
+        visitor.endVisit(this);
+    }
+
+    public SQLExprTableSource getTable() {
+        return table;
+    }
+
+    public void setTable(SQLExprTableSource table) {
+        if (table != null) {
+            table.setParent(table);
+        }
+        this.table = table;
+    }
+    
+    public void setTable(SQLName table) {
+        this.setTable(new SQLExprTableSource(table));
+    }
+
+    public List<SQLAssignItem> getPartition() {
+        return partition;
+    }
+
+}

src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsObjectImpl.java

@@ -0,0 +1,20 @@
+package com.alibaba.druid.sql.dialect.odps.ast;
+
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public abstract class OdpsObjectImpl extends SQLObjectImpl {
+    @Override
+    protected void accept0(SQLASTVisitor visitor) {
+        accept0((OdpsASTVisitor) visitor);
+    }
+    
+    protected abstract void accept0(OdpsASTVisitor visitor);
+    
+    public String toString() {
+        return SQLUtils.toOdpsString(this);
+    }
+
+}

src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRemoveStatisticStatement.java

@@ -0,0 +1,44 @@
+package com.alibaba.druid.sql.dialect.odps.ast;
+
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
+import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor;
+
+public class OdpsRemoveStatisticStatement extends OdpsStatementImpl {
+
+    private SQLExprTableSource table;
+
+    private OdpsStatisticClause statisticClause;
+
+    @Override
+    protected void accept0(OdpsASTVisitor visitor) {
+        if (visitor.visit(this)) {
+            this.acceptChild(visitor, table);
+        }
+        visitor.endVisit(this);
+    }
+
+    public SQLExprTableSource getTable() {
+        return table;
+    }
+
+    public void setTable(SQLExprTableSource table) {
+        if (table != null) {
+            table.setParent(table);
+        }
+        this.table = table;
+    }
+
+    public void setTable(SQLName table) {
+        this.setTable(new SQLExprTableSource(table));
+    }
+
+    public OdpsStatisticClause getStatisticClause() {
+        return statisticClause;
+    }
+
+    public void setStatisticClause(OdpsStatisticClause statisticClause) {
+        this.statisticClause = statisticClause;
+    }
+
+}

src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java

@@ -15,7 +15,11 @@
  */
 package com.alibaba.druid.sql.dialect.odps.ast;
 
+import java.util.ArrayList;
+import java.util.List;
+
 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.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor;
@@ -26,6 +30,8 @@ public class OdpsSelectQueryBlock extends SQLSelectQueryBlock {
     private SQLOrderBy orderBy;
 
     private SQLExpr    limit;
+    
+    protected List<SQLHint> hints;
 
     public OdpsSelectQueryBlock(){
 
@@ -69,6 +75,21 @@ public class OdpsSelectQueryBlock extends SQLSelectQueryBlock {
         } else if (!limit.equals(other.limit)) return false;
         return true;
     }
+    
+    public List<SQLHint> getHintsDirect() {
+        return hints;
+    }
+    
+    public List<SQLHint> getHints() {
+        if (hints == null) {
+            hints = new ArrayList<SQLHint>(2);
+        }
+        return hints;
+    }
+
+    public void setHints(List<SQLHint> hints) {
+        this.hints = hints;
+    }
 
     @Override
     protected void accept0(SQLASTVisitor visitor) {
@@ -82,6 +103,7 @@ public class OdpsSelectQueryBlock extends SQLSelectQueryBlock {
 
     public void accept0(OdpsASTVisitor visitor) {
         if (visitor.visit(this)) {
+            acceptChild(visitor, this.hints);
             acceptChild(visitor, this.selectList);
             acceptChild(visitor, this.from);
             acceptChild(visitor, this.where);

src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsStatisticClause.java

@@ -0,0 +1,102 @@
+package com.alibaba.druid.sql.dialect.odps.ast;
+
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor;
+
+public abstract class OdpsStatisticClause extends OdpsObjectImpl {
+
+    public static abstract class ColumnStatisticClause extends OdpsStatisticClause {
+    
+        protected SQLName column;
+    
+        public SQLName getColumn() {
+            return column;
+        }
+    
+        public void setColumn(SQLName column) {
+            if (column != null) {
+                column.setParent(this);
+            }
+            this.column = column;
+        }
+    
+    }
+
+    public static class NullValue extends ColumnStatisticClause {
+        @Override
+        protected void accept0(OdpsASTVisitor visitor) {
+            if (visitor.visit(this)) {
+                acceptChild(visitor, column);
+            }
+            visitor.endVisit(this);
+        }
+    }
+
+    public static class ColumnSum extends ColumnStatisticClause {
+        @Override
+        protected void accept0(OdpsASTVisitor visitor) {
+            if (visitor.visit(this)) {
+                acceptChild(visitor, column);
+            }
+            visitor.endVisit(this);
+        }
+    }
+
+    public static class ColumnMin extends ColumnStatisticClause {
+        @Override
+        protected void accept0(OdpsASTVisitor visitor) {
+            if (visitor.visit(this)) {
+                acceptChild(visitor, column);
+            }
+            visitor.endVisit(this);
+        }
+    }
+
+    public static class ColumnMax extends ColumnStatisticClause {
+        @Override
+        protected void accept0(OdpsASTVisitor visitor) {
+            if (visitor.visit(this)) {
+                acceptChild(visitor, column);
+            }
+            visitor.endVisit(this);
+        }
+    }
+
+    public static class ExpressionCondition extends OdpsStatisticClause {
+    
+        private SQLExpr expr;
+    
+        public SQLExpr getExpr() {
+            return expr;
+        }
+    
+        public void setExpr(SQLExpr expr) {
+            if (expr != null) {
+                expr.setParent(this);
+            }
+            this.expr = expr;
+        }
+    
+        @Override
+        protected void accept0(OdpsASTVisitor visitor) {
+            if (visitor.visit(this)) {
+                acceptChild(visitor, expr);
+            }
+            visitor.endVisit(this);
+        }
+    }
+
+    public static class TableCount extends OdpsStatisticClause {
+    
+        @Override
+        protected void accept0(OdpsASTVisitor visitor) {
+            if (visitor.visit(this)) {
+    
+            }
+            visitor.endVisit(this);
+        }
+    
+    }
+
+}

src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java

@@ -43,6 +43,7 @@ public class OdpsLexer extends Lexer {
         map.put("OVERWRITE", Token.OVERWRITE);
         map.put("OVER", Token.OVER);
         map.put("LIMIT", Token.LIMIT);
+        map.put("IF", Token.IF);
         
         DEFAULT_ODPS_KEYWORDS = new Keywords(map);
     }

src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java

@@ -47,6 +47,10 @@ public class OdpsSelectParser extends SQLSelectParser {
         }
         
         accept(Token.SELECT);
+        
+        if (lexer.token() == Token.HINT) {
+            this.exprParser.parseHints(queryBlock.getHints());
+        }
 
         if (lexer.token() == Token.COMMENT) {
             lexer.nextToken();

src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsStatementParser.java

@@ -28,11 +28,15 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
 import com.alibaba.druid.sql.ast.statement.SQLSetStatement;
 import com.alibaba.druid.sql.ast.statement.SQLShowTablesStatement;
 import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsAddStatisticStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsAnalyzeTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsert;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsertStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsRemoveStatisticStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsSetLabelStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowPartitionsStmt;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowStatisticStmt;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsStatisticClause;
 import com.alibaba.druid.sql.parser.ParserException;
 import com.alibaba.druid.sql.parser.SQLCreateTableParser;
 import com.alibaba.druid.sql.parser.SQLExprParser;
@@ -73,9 +77,97 @@ public class OdpsStatementParser extends SQLStatementParser {
             statementList.add(stmt);
             return true;
         }
+        
+        if (identifierEquals("ANALYZE")) {
+            lexer.nextToken();
+            accept(Token.TABLE);
+            
+            OdpsAnalyzeTableStatement stmt = new OdpsAnalyzeTableStatement();
+            
+            SQLName table = this.exprParser.name();
+            stmt.setTable(table);
+            
+            if (lexer.token() == Token.PARTITION) {
+                lexer.nextToken();
+
+                accept(Token.LPAREN);
+                parseAssignItems(stmt.getPartition(), stmt);
+                accept(Token.RPAREN);
+            }
+            
+            accept(Token.COMPUTE);
+            acceptIdentifier("STATISTICS");
+            
+            statementList.add(stmt);
+            return true;
+        }
+        
+        if (identifierEquals("ADD")) {
+            lexer.nextToken();
+            
+            if (identifierEquals("STATISTIC")) {
+                lexer.nextToken();
+                OdpsAddStatisticStatement stmt = new OdpsAddStatisticStatement();
+                stmt.setTable(this.exprParser.name());
+                stmt.setStatisticClause(parseStaticClause());
+                statementList.add(stmt);
+                return true;
+            }
+            
+            throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+        }
+        
+        if (identifierEquals("REMOVE")) {
+            lexer.nextToken();
+            
+            if (identifierEquals("STATISTIC")) {
+                lexer.nextToken();
+                OdpsRemoveStatisticStatement stmt = new OdpsRemoveStatisticStatement();
+                stmt.setTable(this.exprParser.name());
+                stmt.setStatisticClause(parseStaticClause());
+                statementList.add(stmt);
+                return true;
+            }
+            
+            throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+        }
         return false;
     }
 
+    protected OdpsStatisticClause parseStaticClause() {
+        if (identifierEquals("TABLE_COUNT")) {
+            lexer.nextToken();
+            return new OdpsStatisticClause.TableCount();
+        } else if (identifierEquals("NULL_VALUE")) {
+            lexer.nextToken();
+            OdpsStatisticClause.NullValue null_value = new OdpsStatisticClause.NullValue();
+            null_value.setColumn(this.exprParser.name());
+            return null_value;
+        } else if (identifierEquals("COLUMN_SUM")) {
+            lexer.nextToken();
+            OdpsStatisticClause.ColumnSum column_sum = new OdpsStatisticClause.ColumnSum();
+            column_sum.setColumn(this.exprParser.name());
+            return column_sum;
+        } else if (identifierEquals("COLUMN_MAX")) {
+            lexer.nextToken();
+            OdpsStatisticClause.ColumnMax column_max = new OdpsStatisticClause.ColumnMax();
+            column_max.setColumn(this.exprParser.name());
+            return column_max;
+        } else if (identifierEquals("COLUMN_MIN")) {
+            lexer.nextToken();
+            OdpsStatisticClause.ColumnMin column_min = new OdpsStatisticClause.ColumnMin();
+            column_min.setColumn(this.exprParser.name());
+            return column_min;
+        } else if (identifierEquals("EXPRESSION_CONDITION")) {
+            lexer.nextToken();
+            OdpsStatisticClause.ExpressionCondition expr_condition = new OdpsStatisticClause.ExpressionCondition();
+            expr_condition.setExpr(this.exprParser.expr());
+            return expr_condition;
+        } else {
+            throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+        }
+    }
+
     public SQLStatement parseInsert() {
         OdpsInsertStatement stmt = new OdpsInsertStatement();
 

src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsASTVisitor.java

@@ -15,13 +15,17 @@
  */
 package com.alibaba.druid.sql.dialect.odps.visitor;
 
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsAddStatisticStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsAnalyzeTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsCreateTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsert;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsertStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsRemoveStatisticStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsSetLabelStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowPartitionsStmt;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowStatisticStmt;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsStatisticClause;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsUDTFSQLSelectItem;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
@@ -58,4 +62,40 @@ public interface OdpsASTVisitor extends SQLASTVisitor {
     void endVisit(OdpsSelectQueryBlock x);
     
     boolean visit(OdpsSelectQueryBlock x);
+    
+    void endVisit(OdpsAnalyzeTableStatement x);
+    
+    boolean visit(OdpsAnalyzeTableStatement x);
+    
+    void endVisit(OdpsAddStatisticStatement x);
+    
+    boolean visit(OdpsAddStatisticStatement x);
+    
+    void endVisit(OdpsRemoveStatisticStatement x);
+    
+    boolean visit(OdpsRemoveStatisticStatement x);
+    
+    void endVisit(OdpsStatisticClause.TableCount x);
+    
+    boolean visit(OdpsStatisticClause.TableCount x);
+    
+    void endVisit(OdpsStatisticClause.ExpressionCondition x);
+    
+    boolean visit(OdpsStatisticClause.ExpressionCondition x);
+    
+    void endVisit(OdpsStatisticClause.NullValue x);
+    
+    boolean visit(OdpsStatisticClause.NullValue x);
+    
+    void endVisit(OdpsStatisticClause.ColumnSum x);
+    
+    boolean visit(OdpsStatisticClause.ColumnSum x);
+    
+    void endVisit(OdpsStatisticClause.ColumnMax x);
+    
+    boolean visit(OdpsStatisticClause.ColumnMax x);
+    
+    void endVisit(OdpsStatisticClause.ColumnMin x);
+    
+    boolean visit(OdpsStatisticClause.ColumnMin x);
 }

src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsASTVisitorAdapter.java

@@ -15,13 +15,17 @@
  */
 package com.alibaba.druid.sql.dialect.odps.visitor;
 
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsAddStatisticStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsAnalyzeTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsCreateTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsert;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsertStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsRemoveStatisticStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsSetLabelStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowPartitionsStmt;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowStatisticStmt;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsStatisticClause;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsUDTFSQLSelectItem;
 import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter;
 
@@ -107,5 +111,95 @@ public class OdpsASTVisitorAdapter extends SQLASTVisitorAdapter implements OdpsA
     public boolean visit(OdpsSelectQueryBlock x) {
         return true;
     }
+    
+    @Override
+    public void endVisit(OdpsAnalyzeTableStatement x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsAnalyzeTableStatement x) {
+        return true;
+    }
+
+    @Override
+    public void endVisit(OdpsAddStatisticStatement x) {
+        
+    }
+
+    @Override
+    public boolean visit(OdpsAddStatisticStatement x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsRemoveStatisticStatement x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsRemoveStatisticStatement x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.TableCount x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.TableCount x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ExpressionCondition x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ExpressionCondition x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.NullValue x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.NullValue x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ColumnSum x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ColumnSum x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ColumnMax x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ColumnMax x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ColumnMin x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ColumnMin x) {
+        return true;
+    }
 
 }

src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java

@@ -17,6 +17,7 @@ package com.alibaba.druid.sql.dialect.odps.visitor;
 
 import java.util.List;
 
+import com.alibaba.druid.sql.ast.SQLHint;
 import com.alibaba.druid.sql.ast.SQLOrderBy;
 import com.alibaba.druid.sql.ast.SQLSetQuantifier;
 import com.alibaba.druid.sql.ast.SQLStatement;
@@ -28,13 +29,17 @@ import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource.JoinType;
 import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause;
 import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
 import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsAddStatisticStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsAnalyzeTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsCreateTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsert;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsertStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsRemoveStatisticStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsSetLabelStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowPartitionsStmt;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowStatisticStmt;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsStatisticClause;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsUDTFSQLSelectItem;
 import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
 
@@ -395,6 +400,12 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
         
         print("SELECT ");
 
+        List<SQLHint> hints= x.getHintsDirect();
+        if (hints != null) {
+            printAndAccept(hints, " ");
+            print(' ');
+        }
+
         if (SQLSetQuantifier.ALL == x.getDistionOption()) {
             print("ALL ");
         } else if (SQLSetQuantifier.DISTINCT == x.getDistionOption()) {
@@ -457,4 +468,126 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
 
         return false;
     }
+
+    @Override
+    public void endVisit(OdpsAnalyzeTableStatement x) {
+        
+    }
+
+    @Override
+    public boolean visit(OdpsAnalyzeTableStatement x) {
+        print("ANALYZE TABLE ");
+        x.getTable().accept(this);
+        
+        if (x.getPartition().size() > 0) {
+            print(" PARTITION (");
+            printAndAccept(x.getPartition(), ", ");
+            print(")");
+        }
+        
+        print(" COMPUTE STATISTICS");
+        
+        return false;
+    }
+
+    @Override
+    public void endVisit(OdpsAddStatisticStatement x) {
+        
+    }
+
+    @Override
+    public boolean visit(OdpsAddStatisticStatement x) {
+        print("ADD STATISTIC ");
+        x.getTable().accept(this);
+        print(" ");
+        x.getStatisticClause().accept(this);
+        
+        return false;
+    }
+    
+    @Override
+    public void endVisit(OdpsRemoveStatisticStatement x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsRemoveStatisticStatement x) {
+        print("REMOVE STATISTIC ");
+        x.getTable().accept(this);
+        print(" ");
+        x.getStatisticClause().accept(this);
+        
+        return false;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.TableCount x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.TableCount x) {
+        print("TABLE_COUNT");
+        return false;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ExpressionCondition x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ExpressionCondition x) {
+        print("EXPRESSION_CONDITION ");
+        x.getExpr().accept(this);
+        return false;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.NullValue x) {
+  
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.NullValue x) {
+        print("NULL_VALUE ");
+        x.getColumn().accept(this);
+        return false;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ColumnSum x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ColumnSum x) {
+        print("COLUMN_SUM ");
+        x.getColumn().accept(this);
+        return false;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ColumnMax x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ColumnMax x) {
+        print("COLUMN_MAX ");
+        x.getColumn().accept(this);
+        return false;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ColumnMin x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ColumnMin x) {
+        print("COLUMN_MIN ");
+        x.getColumn().accept(this);
+        return false;
+    }
 }

src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsSchemaStatVisitor.java

@@ -17,13 +17,17 @@ package com.alibaba.druid.sql.dialect.odps.visitor;
 
 import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsAddStatisticStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsAnalyzeTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsCreateTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsert;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsertStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsRemoveStatisticStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsSetLabelStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowPartitionsStmt;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowStatisticStmt;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsStatisticClause;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsUDTFSQLSelectItem;
 import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
 
@@ -111,5 +115,94 @@ public class OdpsSchemaStatVisitor extends SchemaStatVisitor implements OdpsASTV
     public boolean visit(OdpsSelectQueryBlock x) {
         return this.visit((SQLSelectQueryBlock) x);
     }
+    
+    @Override
+    public void endVisit(OdpsAnalyzeTableStatement x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsAnalyzeTableStatement x) {
+        return true;
+    }
 
+    @Override
+    public void endVisit(OdpsAddStatisticStatement x) {
+        
+    }
+
+    @Override
+    public boolean visit(OdpsAddStatisticStatement x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsRemoveStatisticStatement x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsRemoveStatisticStatement x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.TableCount x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.TableCount x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ExpressionCondition x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ExpressionCondition x) {
+        return true;
+    }
+
+    @Override
+    public void endVisit(OdpsStatisticClause.NullValue x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.NullValue x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ColumnSum x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ColumnSum x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ColumnMax x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ColumnMax x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsStatisticClause.ColumnMin x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsStatisticClause.ColumnMin x) {
+        return true;
+    }
 }