diff --git a/README.md b/README.md index 270cb158c9..6ef23f0ba5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +# 请参与投票 +* 2019最受欢迎中国开源软件评选投票 https://www.oschina.net/project/top_cn_2019 请参与投票 + # druid [![Build Status](https://travis-ci.org/alibaba/druid.svg?branch=master)](https://travis-ci.org/alibaba/druid) diff --git a/lib/openjdk-1.8-jconsole.jar b/lib/openjdk-1.8-jconsole.jar new file mode 100644 index 0000000000..5c221cd536 Binary files /dev/null and b/lib/openjdk-1.8-jconsole.jar differ diff --git a/lib/openjdk-1.8-tools.jar b/lib/openjdk-1.8-tools.jar new file mode 100644 index 0000000000..04bb8af666 Binary files /dev/null and b/lib/openjdk-1.8-tools.jar differ diff --git a/pom.xml b/pom.xml index 0452ef1813..4d4db226ae 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,8 @@ 4.0.0 com.alibaba druid - 1.1.20 + 1.1.21_preview_01 + jar druid @@ -20,13 +21,13 @@ true UTF-8 - 1.6 + 1.8 local-file - file://${basedir}/lib/ + file://${project.basedir}/lib/ default @@ -678,5 +679,21 @@ test - + + com.sun + tools + 1.8 + system + ${project.basedir}/lib/openjdk-1.8-tools.jar + + + + com.sun + jconsole + 1.8 + system + ${project.basedir}/lib/openjdk-1.8-jconsole.jar + + + diff --git a/src/main/java/com/alibaba/druid/VERSION.java b/src/main/java/com/alibaba/druid/VERSION.java index 5870e4ab75..a36fe871d6 100644 --- a/src/main/java/com/alibaba/druid/VERSION.java +++ b/src/main/java/com/alibaba/druid/VERSION.java @@ -19,7 +19,7 @@ public final class VERSION { public final static int MajorVersion = 1; public final static int MinorVersion = 1; - public final static int RevisionVersion = 20; + public final static int RevisionVersion = 21; public static String getVersionNumber() { return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion; diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 1e76d94d27..ae2daeddf5 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -1464,6 +1464,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements long currentTimeMillis = System.currentTimeMillis(); if (holder != null) { holder.lastValidTimeMillis = currentTimeMillis; + holder.lastExecTimeMillis = currentTimeMillis; } if (valid && isMySql) { // unexcepted branch @@ -1472,7 +1473,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements long mysqlIdleMillis = currentTimeMillis - lastPacketReceivedTimeMs; if (lastPacketReceivedTimeMs > 0 // && mysqlIdleMillis >= timeBetweenEvictionRunsMillis) { - discardConnection(conn); + discardConnection(holder); String errorMsg = "discard long time none received connection. " + ", jdbcUrl : " + jdbcUrl + ", jdbcUrl : " + jdbcUrl @@ -2063,7 +2064,10 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements } public abstract void discardConnection(Connection realConnection); - + + public void discardConnection(DruidConnectionHolder holder) { + discardConnection(holder.getConnection()); + } public boolean isAsyncCloseConnectionEnable() { if (isRemoveAbandoned()) { diff --git a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java index 26b1f3cf22..f586f6a7e6 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java +++ b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java @@ -51,6 +51,7 @@ public final class DruidConnectionHolder { protected final List statementEventListeners = new CopyOnWriteArrayList(); protected final long connectTimeMillis; protected volatile long lastActiveTimeMillis; + protected volatile long lastExecTimeMillis; protected volatile long lastKeepTimeMillis; protected volatile long lastValidTimeMillis; protected long useCount = 0; @@ -67,7 +68,8 @@ public final class DruidConnectionHolder { protected int underlyingHoldability; protected int underlyingTransactionIsolation; protected boolean underlyingAutoCommit; - protected boolean discard = false; + protected volatile boolean discard = false; + protected volatile boolean active = false; protected final Map variables; protected final Map globleVariables; final ReentrantLock lock = new ReentrantLock(); @@ -97,6 +99,7 @@ public final class DruidConnectionHolder { this.connectTimeMillis = System.currentTimeMillis(); this.lastActiveTimeMillis = connectTimeMillis; + this.lastExecTimeMillis = connectTimeMillis; this.underlyingAutoCommit = conn.getAutoCommit(); @@ -153,6 +156,10 @@ public final class DruidConnectionHolder { this.defaultReadOnly = underlyingReadOnly; } + public long getConnectTimeMillis() { + return connectTimeMillis; + } + public boolean isUnderlyingReadOnly() { return underlyingReadOnly; } @@ -193,6 +200,14 @@ public final class DruidConnectionHolder { this.lastActiveTimeMillis = lastActiveMillis; } + public long getLastExecTimeMillis() { + return lastExecTimeMillis; + } + + public void setLastExecTimeMillis(long lastExecTimeMillis) { + this.lastExecTimeMillis = lastExecTimeMillis; + } + public void addTrace(DruidPooledStatement stmt) { lock.lock(); try { diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 3831a402a5..c2116ad0a7 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -172,6 +172,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat private volatile boolean keepAlive = false; private boolean asyncInit = false; protected boolean killWhenSocketReadTimeout = false; + protected boolean checkExecuteTime = false; private static List autoFilters = null; private boolean loadSpifilterSkip = false; @@ -526,6 +527,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat loadSpifilterSkip = true; } } + { + String property = System.getProperty("druid.checkExecuteTime"); + if (property != null && !"false".equals(property)) { + checkExecuteTime = true; + } + } } public boolean isKillWhenSocketReadTimeout() { @@ -1411,14 +1418,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat LOG.debug("skip not validate connection."); } - Connection realConnection = poolableConnection.conn; - discardConnection(realConnection); + discardConnection(poolableConnection.holder); continue; } } else { - Connection realConnection = poolableConnection.conn; if (poolableConnection.conn.isClosed()) { - discardConnection(null); // 传入null,避免重复关闭 + discardConnection(poolableConnection.holder); // 传入null,避免重复关闭 continue; } @@ -1426,8 +1431,14 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat final DruidConnectionHolder holder = poolableConnection.holder; long currentTimeMillis = System.currentTimeMillis(); long lastActiveTimeMillis = holder.lastActiveTimeMillis; + long lastExecTimeMillis = holder.lastExecTimeMillis; long lastKeepTimeMillis = holder.lastKeepTimeMillis; + if (checkExecuteTime + && lastExecTimeMillis != lastActiveTimeMillis) { + lastActiveTimeMillis = lastExecTimeMillis; + } + if (lastKeepTimeMillis > lastActiveTimeMillis) { lastActiveTimeMillis = lastKeepTimeMillis; } @@ -1449,7 +1460,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat LOG.debug("skip not validate connection."); } - discardConnection(realConnection); + discardConnection(poolableConnection.holder); continue; } } @@ -1482,6 +1493,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat * 抛弃连接,不进行回收,而是抛弃 * * @param realConnection + * @deprecated */ public void discardConnection(Connection realConnection) { JdbcUtils.close(realConnection); @@ -1499,6 +1511,38 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } } + public void discardConnection(DruidConnectionHolder holder) { + if (holder == null) { + return; + } + + Connection conn = holder.getConnection(); + if (conn != null) { + JdbcUtils.close(conn); + } + + lock.lock(); + try { + if (holder.discard) { + return; + } + + if (holder.active) { + activeCount--; + holder.active = false; + } + discardCount++; + + holder.discard = true; + + if (activeCount <= minIdle) { + emptySignal(); + } + } finally { + lock.unlock(); + } + } + private DruidPooledConnection getConnectionInternal(long maxWait) throws SQLException { if (closed) { connectErrorCountUpdater.incrementAndGet(this); @@ -1540,6 +1584,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat try { if (activeCount < maxActive) { activeCount++; + holder.active = true; if (activeCount > activePeak) { activePeak = activeCount; activePeakTime = System.currentTimeMillis(); @@ -1621,7 +1666,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } if (holder != null) { + if (holder.discard) { + continue; + } + activeCount++; + holder.active = true; if (activeCount > activePeak) { activePeak = activeCount; activePeakTime = System.currentTimeMillis(); @@ -1748,7 +1798,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat lock.lock(); try { if ((!conn.isClosed()) || !conn.isDisable()) { - holder.setDiscard(true); conn.disable(error); requireDiscard = true; } @@ -1787,8 +1836,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } } - this.discardConnection(holder.getConnection()); - holder.setDiscard(true); + this.discardConnection(holder); } LOG.error("discard connection", error); @@ -1861,14 +1909,17 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } if (phyMaxUseCount > 0 && holder.useCount >= phyMaxUseCount) { - discardConnection(holder.conn); + discardConnection(holder); return; } if (physicalConnection.isClosed()) { lock.lock(); try { - activeCount--; + if (holder.active) { + activeCount--; + holder.active = false; + } closeCount++; } finally { lock.unlock(); @@ -1885,7 +1936,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat lock.lock(); try { - activeCount--; + if (holder.active) { + activeCount--; + holder.active = false; + } closeCount++; } finally { lock.unlock(); @@ -1895,7 +1949,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } if (!enable) { - discardConnection(holder.conn); + discardConnection(holder); return; } @@ -1905,14 +1959,17 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat if (phyTimeoutMillis > 0) { long phyConnectTimeMillis = currentTimeMillis - holder.connectTimeMillis; if (phyConnectTimeMillis > phyTimeoutMillis) { - discardConnection(holder.conn); + discardConnection(holder); return; } } lock.lock(); try { - activeCount--; + if (holder.active) { + activeCount--; + holder.active = false; + } closeCount++; result = putLast(holder, currentTimeMillis); @@ -1929,7 +1986,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat holder.clearStatementCache(); if (!holder.discard) { - this.discardConnection(physicalConnection); + discardConnection(holder); holder.discard = true; } @@ -2075,7 +2132,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } boolean putLast(DruidConnectionHolder e, long lastActiveTimeMillis) { - if (poolingCount >= maxActive) { + if (poolingCount >= maxActive || e.discard) { return false; } @@ -3536,6 +3593,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat dataMap.put("PhysicalCloseCount", this.getDestroyCount()); dataMap.put("PhysicalConnectErrorCount", this.getCreateErrorCount()); + dataMap.put("DiscardCount", this.getDiscardCount()); + dataMap.put("ExecuteCount", this.getExecuteCount()); dataMap.put("ExecuteUpdateCount", this.getExecuteUpdateCount()); dataMap.put("ExecuteQueryCount", this.getExecuteQueryCount()); @@ -3802,4 +3861,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat public boolean isClosed() { return this.closed; } + + public boolean isCheckExecuteTime() { + return checkExecuteTime; + } + + public void setCheckExecuteTime(boolean checkExecuteTime) { + this.checkExecuteTime = checkExecuteTime; + } } diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java index ed181235ec..d3ec2f51ab 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java @@ -1068,11 +1068,11 @@ public class DruidPooledCallableStatement extends DruidPooledPreparedStatement i } public T getObject(int parameterIndex, Class type) throws SQLException { - throw new SQLFeatureNotSupportedException(); + return stmt.getObject(parameterIndex, type); } public T getObject(String parameterName, Class type) throws SQLException { - throw new SQLFeatureNotSupportedException(); + return stmt.getObject(parameterName, type); } @SuppressWarnings("unchecked") diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java index 56f55c60ae..7ee1d6d129 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java @@ -712,12 +712,17 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql. try { conn.setAutoCommit(autoCommit); holder.setUnderlyingAutoCommit(autoCommit); + holder.setLastExecTimeMillis(System.currentTimeMillis()); } catch (SQLException ex) { handleException(ex, null); } } protected void transactionRecord(String sql) throws SQLException { + if (holder != null) { + holder.setLastExecTimeMillis(System.currentTimeMillis()); + } + if (transactionInfo == null && (!conn.getAutoCommit())) { DruidAbstractDataSource dataSource = holder.getDataSource(); dataSource.incrementStartTransactionCount(); diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java index d2b3417064..0fedf16ddb 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java @@ -76,20 +76,20 @@ public class DruidPooledStatement extends PoolableWrapper implements Statement { sql = ((DruidPooledPreparedStatement) this).getSql(); } - handleScoketTimeout(error); + handleSocketTimeout(error); exceptionCount++; return conn.handleException(error, sql); } protected SQLException checkException(Throwable error, String sql) throws SQLException { - handleScoketTimeout(error); + handleSocketTimeout(error); exceptionCount++; return conn.handleException(error, sql); } - protected void handleScoketTimeout(Throwable error) throws SQLException { + protected void handleSocketTimeout(Throwable error) throws SQLException { if (this.conn == null || this.conn.transactionInfo != null || this.conn.holder == null) { @@ -879,10 +879,10 @@ public class DruidPooledStatement extends PoolableWrapper implements Statement { } public void closeOnCompletion() throws SQLException { - throw new SQLFeatureNotSupportedException(); + stmt.closeOnCompletion(); } public boolean isCloseOnCompletion() throws SQLException { - throw new SQLFeatureNotSupportedException(); + return stmt.isCloseOnCompletion(); } } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxyImpl.java index 1f7dc00e74..51fd625cc4 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxyImpl.java @@ -603,11 +603,11 @@ public class CallableStatementProxyImpl extends PreparedStatementProxyImpl imple } public T getObject(int parameterIndex, Class type) throws SQLException { - throw new SQLFeatureNotSupportedException(); + return statement.getObject(parameterIndex, type); } public T getObject(String parameterName, Class type) throws SQLException { - throw new SQLFeatureNotSupportedException(); + return statement.getObject(parameterName, type); } @SuppressWarnings("unchecked") diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java index e4db5b1e86..8621e13b81 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java @@ -503,11 +503,11 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro } public void closeOnCompletion() throws SQLException { - throw new SQLFeatureNotSupportedException(); + statement.closeOnCompletion(); } public boolean isCloseOnCompletion() throws SQLException { - throw new SQLFeatureNotSupportedException(); + return statement.isCloseOnCompletion(); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java index de448d5caa..1fb6bbd08a 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java @@ -491,7 +491,11 @@ public class SQLUtils { } public static List parseStatements(String sql, String dbType) { - SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); + return parseStatements(sql, dbType, new SQLParserFeature[0]); + } + + public static List parseStatements(String sql, String dbType, SQLParserFeature... features) { + SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType, features); List stmtList = parser.parseStatementList(); if (parser.getLexer().token() != Token.EOF) { throw new ParserException("syntax error : " + sql); diff --git a/src/main/java/com/alibaba/druid/sql/ast/AutoIncrementType.java b/src/main/java/com/alibaba/druid/sql/ast/AutoIncrementType.java new file mode 100644 index 0000000000..c2aff5effa --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/ast/AutoIncrementType.java @@ -0,0 +1,19 @@ +package com.alibaba.druid.sql.ast; + +public enum AutoIncrementType +{ + GROUP("GROUP"), SIMPLE("SIMPLE"), + SIMPLE_CACHE("SIMPLE WITH CACHE"), TIME("TIME"); + + private final String keyword; + + public String getKeyword() { + return this.keyword; + } + + private AutoIncrementType(String keyword){ + this.keyword = keyword; + } + + +} diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLAdhocTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/SQLAdhocTableSource.java new file mode 100644 index 0000000000..65fcb3e326 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLAdhocTableSource.java @@ -0,0 +1,35 @@ +package com.alibaba.druid.sql.ast; + +import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; +import com.alibaba.druid.sql.ast.statement.SQLTableSourceImpl; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + +public class SQLAdhocTableSource + extends SQLTableSourceImpl { + private SQLCreateTableStatement definition; + + public SQLAdhocTableSource(SQLCreateTableStatement definition) { + setDefinition(definition); + } + + @Override + protected void accept0(SQLASTVisitor v) { + if (v.visit(this)) { + if (definition != null) { + definition.accept(v); + } + } + v.endVisit(this); + } + + public SQLCreateTableStatement getDefinition() { + return definition; + } + + public void setDefinition(SQLCreateTableStatement x) { + if (x != null) { + x.setParent(this); + } + this.definition = x; + } +} diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentTimeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentTimeExpr.java new file mode 100644 index 0000000000..dcec3ae025 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentTimeExpr.java @@ -0,0 +1,66 @@ +package com.alibaba.druid.sql.ast; + +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + +public class SQLCurrentTimeExpr + extends SQLExprImpl { + private final Type type; + + public SQLCurrentTimeExpr(Type type) { + if (type == null) { + throw new NullPointerException(); + } + + this.type = type; + } + + @Override + protected void accept0(SQLASTVisitor v) { + v.visit(this); + v.endVisit(this); + } + + public Type getType() { + return type; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (getClass() != o.getClass()) return false; + + SQLCurrentTimeExpr that = (SQLCurrentTimeExpr) o; + + return type == that.type; + } + + @Override + public int hashCode() { + return type.hashCode(); + } + + public SQLCurrentTimeExpr clone() { + return new SQLCurrentTimeExpr(type); + } + + public static enum Type { + CURRENT_TIME("CURRENT_TIME"), + CURRENT_DATE("CURRENT_DATE"), + CURDATE("CURDATE"), + CURTIME("CURTIME"), + CURRENT_TIMESTAMP("CURRENT_TIMESTAMP"), + LOCALTIME("LOCALTIME"), + LOCALTIMESTAMP("LOCALTIMESTAMP"), + SYSDATE("SYSDATE"), + ; + + public final String name; + public final String name_lower; + + Type(String name) + { + this.name = name; + this.name_lower = name.toLowerCase(); + } + } +} diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentUserExpr.java b/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentUserExpr.java new file mode 100644 index 0000000000..e5816ae067 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentUserExpr.java @@ -0,0 +1,38 @@ +package com.alibaba.druid.sql.ast; + +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + +public class SQLCurrentUserExpr + extends SQLExprImpl { + + public SQLCurrentUserExpr() { + } + + @Override + protected void accept0(SQLASTVisitor v) { + v.visit(this); + v.endVisit(this); + } + + @Override + public boolean equals(Object o) { + if (o == null) { + return false; + } + + if (this == o) { + return true; + } + + return getClass() == o.getClass(); + } + + @Override + public int hashCode() { + return 0; + } + + public SQLCurrentUserExpr clone() { + return new SQLCurrentUserExpr(); + } +} diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionBy.java b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionBy.java index 69b5759c2b..0aeff32e51 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionBy.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionBy.java @@ -15,6 +15,8 @@ */ package com.alibaba.druid.sql.ast; +import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; + import java.util.ArrayList; import java.util.List; @@ -102,5 +104,20 @@ public abstract class SQLPartitionBy extends SQLObjectImpl { } } + public boolean isPartitionByColumn(long columnNameHashCode64) { + for (SQLExpr column : columns) { + if (column instanceof SQLIdentifierExpr + && ((SQLIdentifierExpr) column) + .nameHashCode64() == columnNameHashCode64) { + return true; + } + } + + if (subPartitionBy != null) { + return subPartitionBy.isPartitionByColumn(columnNameHashCode64); + } + return false; + } + public abstract SQLPartitionBy clone(); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionBy.java b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionBy.java index b3c60d2648..f579d07f01 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionBy.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionBy.java @@ -73,5 +73,9 @@ public abstract class SQLSubPartitionBy extends SQLObjectImpl { } } + public boolean isPartitionByColumn(long columnNameHashCode64) { + return false; + } + public abstract SQLSubPartitionBy clone(); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByHash.java b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByHash.java index 367fca69a6..cdec8566e0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByHash.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByHash.java @@ -61,4 +61,8 @@ public class SQLSubPartitionByHash extends SQLSubPartitionBy { return x; } + public boolean isPartitionByColumn(long columnNameHashCode64) { + return expr instanceof SQLName + && ((SQLName) expr).nameHashCode64() == columnNameHashCode64; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByList.java b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByList.java index 9d113b2601..ad9de2a1ef 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByList.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByList.java @@ -48,4 +48,9 @@ public class SQLSubPartitionByList extends SQLSubPartitionBy { } return x; } + + public boolean isPartitionByColumn(long columnNameHashCode64) { + return column != null + && column.nameHashCode64() == columnNameHashCode64; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByRange.java b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByRange.java index 8a0b4be7dd..f97b3723ea 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByRange.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByRange.java @@ -18,6 +18,7 @@ package com.alibaba.druid.sql.ast; import java.util.ArrayList; import java.util.List; +import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSubPartitionByRange extends SQLSubPartitionBy { @@ -43,4 +44,14 @@ public class SQLSubPartitionByRange extends SQLSubPartitionBy { return x; } + + public boolean isPartitionByColumn(long columnNameHashCode64) { + for (SQLExpr column : columns) { + if (column instanceof SQLIdentifierExpr + && ((SQLIdentifierExpr) column).nameHashCode64() == columnNameHashCode64) { + return true; + } + } + return false; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDecimalExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDecimalExpr.java new file mode 100644 index 0000000000..dc0d46ae3b --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDecimalExpr.java @@ -0,0 +1,125 @@ +/* + * Copyright 1999-2017 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.sql.ast.expr; + +import com.alibaba.druid.sql.ast.SQLDataType; +import com.alibaba.druid.sql.ast.SQLDataTypeImpl; +import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + +import java.math.BigDecimal; +import java.util.Collections; +import java.util.List; + +public class SQLDecimalExpr + extends SQLNumericLiteralExpr implements SQLValuableExpr, Comparable +{ + public final static SQLDataType DATA_TYPE = new SQLDataTypeImpl("DECIMAL"); + + private BigDecimal value; + private transient String literal; + + public SQLDecimalExpr(){ + + } + + public SQLDecimalExpr(BigDecimal value){ + super(); + this.value = value; + } + + public SQLDecimalExpr(String value){ + super(); + this.value = new BigDecimal(value); + this.literal = value; + } + + public String getLiteral() { + return literal; + } + + public SQLDecimalExpr clone() { + return new SQLDecimalExpr(value); + } + + @Override + public List getChildren() { + return Collections.emptyList(); + } + + @Override + public Number getNumber() { + return value; + } + + public BigDecimal getValue() { + return value; + } + + public void setValue(BigDecimal value) { + this.value = value; + } + + protected void accept0(SQLASTVisitor visitor) { + visitor.visit(this); + + visitor.endVisit(this); + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((value == null) ? 0 : value.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + SQLDecimalExpr other = (SQLDecimalExpr) obj; + if (value == null) { + if (other.value != null) { + return false; + } + } else if (!value.equals(other.value)) { + return false; + } + return true; + } + + @Override + public void setNumber(Number number) { + if (number == null) { + this.setValue(null); + return; + } + + this.setValue(((BigDecimal) number)); + } + + @Override + public int compareTo(SQLDecimalExpr o) { + return value.compareTo(o.value); + } +} diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalUnit.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalUnit.java index f63f9289a0..ebb226f612 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalUnit.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalUnit.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 Alibaba Group Holding Ltd. + * Copyright 1999-2017 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. @@ -15,24 +15,95 @@ */ package com.alibaba.druid.sql.ast.expr; +import java.util.Calendar; +import java.util.Date; + public enum SQLIntervalUnit { - YEAR, YEAR_MONTH, - + YEAR, + YEAR_MONTH, QUARTER, + MONTH, + WEEK, + DAY, + DAY_HOUR, + DAY_MINUTE, + DAY_SECOND, + DAY_MICROSECOND, + HOUR, + HOUR_MINUTE, + HOUR_SECOND, + HOUR_MICROSECOND, + MINUTE, + MINUTE_SECOND, + MINUTE_MICROSECOND, + SECOND, + SECOND_MICROSECOND, + MICROSECOND, + DAY_OF_WEEK, + DOW, + DAY_OF_MONTH, + DAY_OF_YEAR, + YEAR_OF_WEEK, + YOW, + TIMEZONE_HOUR, + TIMEZONE_MINUTE, + DOY, + YEAR_TO_MONTH("YEAR TO MONTH") + ; - MONTH, WEEK, DAY, DAY_HOUR, DAY_MINUTE, DAY_SECOND, DAY_MICROSECOND, - - HOUR, HOUR_MINUTE, HOUR_SECOND, HOUR_MICROSECOND, - - MINUTE, MINUTE_SECOND, MINUTE_MICROSECOND, - - SECOND, SECOND_MICROSECOND, - - MICROSECOND; - + public final String name; public final String name_lcase; - - private SQLIntervalUnit() { - this.name_lcase = name().toLowerCase(); + + SQLIntervalUnit(String name) { + this.name = name; + this.name_lcase = name.toLowerCase(); + } + + SQLIntervalUnit() { + this.name = name(); + this.name_lcase = name.toLowerCase(); + } + + public static boolean add(Calendar calendar, int intervalInt, SQLIntervalUnit unit) { + switch (unit) { + case YEAR: + calendar.add(Calendar.YEAR, intervalInt); + return true; + case MONTH: + calendar.add(Calendar.MONTH, intervalInt); + return true; + case WEEK: + calendar.add(Calendar.WEEK_OF_MONTH, intervalInt); + return true; + case DAY: + calendar.add(Calendar.DAY_OF_MONTH, intervalInt); + return true; + case HOUR: + calendar.add(Calendar.HOUR_OF_DAY, intervalInt); + return true; + case MINUTE: + calendar.add(Calendar.MINUTE, intervalInt); + return true; + case SECOND: + calendar.add(Calendar.SECOND, intervalInt); + return true; + case MICROSECOND: + calendar.add(Calendar.MILLISECOND, intervalInt); + return true; + default: + return false; + } + } + + public boolean isDateTime() { + switch (this) { + case HOUR: + case MINUTE: + case SECOND: + case MICROSECOND: + return true; + default: + return false; + } } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSizeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSizeExpr.java new file mode 100644 index 0000000000..47c74aef10 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSizeExpr.java @@ -0,0 +1,114 @@ +/* + * Copyright 1999-2017 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.sql.ast.expr; + +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLExprImpl; +import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + +import java.math.BigDecimal; +import java.util.Collections; +import java.util.List; + +public class SQLSizeExpr + extends SQLExprImpl { + + private SQLExpr value; + private Unit unit; + + public SQLSizeExpr(){ + + } + + public SQLSizeExpr(String value, char unit){ + this.unit = Unit.valueOf(Character.toString(unit).toUpperCase()); + if (value.indexOf('.') == -1) { + this.value = new SQLIntegerExpr(Integer.parseInt(value)); + } else { + this.value = new SQLNumberExpr(new BigDecimal(value)); + } + } + + public SQLSizeExpr(SQLExpr value, Unit unit){ + super(); + this.value = value; + this.unit = unit; + } + + @Override + public void accept0(SQLASTVisitor visitor) { + if (visitor.visit(this)) { + if (this.value != null) { + this.value.accept(visitor); + } + } + visitor.endVisit(this); + } + + public List getChildren() { + return Collections.singletonList(value); + } + + public SQLExpr getValue() { + return value; + } + + public void setValue(SQLExpr value) { + this.value = value; + } + + public Unit getUnit() { + return unit; + } + + public void setUnit(Unit unit) { + this.unit = unit; + } + + public static enum Unit { + B, K, M, G, T, P, E + } + + public SQLSizeExpr clone() { + SQLSizeExpr x = new SQLSizeExpr(); + + if (value != null) { + x.setValue(value.clone()); + } + x.unit = unit; + + return x; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + SQLSizeExpr that = (SQLSizeExpr) o; + + if (value != null ? !value.equals(that.value) : that.value != null) return false; + return unit == that.unit; + } + + @Override + public int hashCode() { + int result = value != null ? value.hashCode() : 0; + result = 31 * result + (unit != null ? unit.hashCode() : 0); + return result; + } +} diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java index aec8b980cf..ca0fb7652c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 Alibaba Group Holding Ltd. + * Copyright 1999-2017 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. @@ -15,22 +15,18 @@ */ package com.alibaba.druid.sql.ast.statement; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLDataType; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObjectImpl; -import com.alibaba.druid.sql.ast.SQLObjectWithDataType; -import com.alibaba.druid.sql.ast.SQLReplaceable; +import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElement, SQLObjectWithDataType, SQLReplaceable { +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; + +public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElement, SQLObjectWithDataType, SQLReplaceable, SQLDbTypedObject { protected String dbType; protected SQLName name; @@ -46,14 +42,37 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen // for mysql protected boolean autoIncrement = false; protected SQLExpr onUpdate; + protected SQLExpr format; protected SQLExpr storage; protected SQLExpr charsetExpr; + protected SQLExpr collateExpr; protected SQLExpr asExpr; protected boolean stored = false; protected boolean virtual = false; + protected boolean visible = false; + protected AutoIncrementType sequenceType; + protected boolean preSort = false; // for ads + protected int preSortOrder = 0; // for ads protected Identity identity; + + // for ads protected SQLExpr generatedAlawsAs; + protected SQLExpr delimiter; // for ads + protected SQLExpr delimiterTokenizer; // for ads3.0 multivalue + protected SQLExpr nlpTokenizer; // for ads3.0 multivalue + protected SQLExpr valueType; // for ads3.0 multivalue + protected boolean disableIndex = false; //for ads + protected SQLExpr jsonIndexAttrsExpr; // for ads + private SQLExpr unitCount; + private SQLExpr unitIndex; + private SQLExpr step; + private SQLCharExpr encode; + private SQLCharExpr compression; + + // for aliyun data lake anlytics + private List mappedBy; + private List colProperties; public SQLColumnDefinition(){ @@ -64,22 +83,11 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen } // for sqlserver - public void setIdentity(Identity x) { - if (x != null) { - x.setParent(this); + public void setIdentity(Identity identity) { + if (identity != null) { + identity.setParent(this); } - this.identity = x; - } - - public SQLExpr getGeneratedAlawsAs() { - return generatedAlawsAs; - } - - public void setGeneratedAlawsAs(SQLExpr x) { - if (x != null) { - x.setParent(this); - } - this.generatedAlawsAs = x; + this.identity = identity; } public Boolean getEnable() { @@ -110,6 +118,14 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen return name; } + public String getColumnName() { + if (name == null) { + return null; + } + + return name.getSimpleName(); + } + public long nameHashCode64() { if (name == null) { return 0; @@ -137,6 +153,14 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen public SQLDataType getDataType() { return dataType; } +// +// public int jdbcType() { +// if (dataType == null) { +// return Types.OTHER; +// } +// +// return dataType.jdbcType(); +// } public void setDataType(SQLDataType dataType) { if (dataType != null) { @@ -159,7 +183,58 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen public List getConstraints() { return constraints; } - + + public boolean isPrimaryKey() { + for (SQLColumnConstraint constraint : constraints) { + if (constraint instanceof SQLColumnPrimaryKey) { + return true; + } + } + + if (parent instanceof SQLCreateTableStatement) { + return ((SQLCreateTableStatement) parent) + .isPrimaryColumn( + nameHashCode64()); + } + + return false; + } + + public boolean isOnlyPrimaryKey() { + for (SQLColumnConstraint constraint : constraints) { + if (constraint instanceof SQLColumnPrimaryKey) { + return true; + } + } + + if (parent instanceof SQLCreateTableStatement) { + return ((SQLCreateTableStatement) parent) + .isPrimaryColumn( + nameHashCode64()); + } + + return false; + } + + public boolean isPartitionBy() { + if (!(parent instanceof SQLCreateTableStatement)) { + return false; + } + + SQLCreateTableStatement stmt = (SQLCreateTableStatement) parent; + final SQLPartitionBy partitioning = stmt.getPartitioning(); + if (partitioning == null) { + return false; + } + + if (name == null) { + return false; + } + + return partitioning.isPartitionByColumn( + nameHashCode64()); + } + public void addConstraint(SQLColumnConstraint constraint) { if (constraint != null) { constraint.setParent(this); @@ -167,17 +242,6 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen this.constraints.add(constraint); } - @Override - public void output(StringBuffer buf) { - name.output(buf); - buf.append(' '); - this.dataType.output(buf); - if (defaultExpr != null) { - buf.append(" DEFAULT "); - this.defaultExpr.output(buf); - } - } - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { @@ -194,7 +258,13 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen } public void setComment(String comment) { - this.setComment(new SQLCharExpr(comment)); + SQLCharExpr expr; + if (comment == null) { + expr = null; + } else { + expr = new SQLCharExpr(comment); + } + this.setComment(expr); } public void setComment(SQLExpr comment) { @@ -231,6 +301,17 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen this.charsetExpr = charsetExpr; } + public SQLExpr getCollateExpr() { + return collateExpr; + } + + public void setCollateExpr(SQLExpr x) { + if (charsetExpr != null) { + charsetExpr.setParent(this); + } + this.collateExpr = x; + } + public SQLExpr getAsExpr() { return asExpr; } @@ -258,6 +339,14 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen this.onUpdate = onUpdate; } + public SQLExpr getFormat() { + return format; + } + + public void setFormat(SQLExpr format) { + this.format = format; + } + public SQLExpr getStorage() { return storage; } @@ -278,15 +367,31 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen return true; } + if (comment == expr) { + setComment(target); + return true; + } + return false; } + public void setUnitCount(SQLExpr unitCount) { + if (unitCount != null) { + unitCount.setParent(this); + } + this.unitCount = unitCount; + } + public static class Identity extends SQLObjectImpl { private Integer seed; private Integer increment; private boolean notForReplication; + private boolean cycle; + + private Integer minValue; + private Integer maxValue; public Identity(){ @@ -308,6 +413,30 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen this.increment = increment; } + public boolean isCycle() { + return cycle; + } + + public void setCycle(boolean cycle) { + this.cycle = cycle; + } + + public Integer getMinValue() { + return minValue; + } + + public void setMinValue(Integer minValue) { + this.minValue = minValue; + } + + public Integer getMaxValue() { + return maxValue; + } + + public void setMaxValue(Integer maxValue) { + this.maxValue = maxValue; + } + public boolean isNotForReplication() { return notForReplication; } @@ -326,6 +455,9 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen Identity x = new Identity(); x.seed = seed; x.increment = increment; + x.cycle = cycle; + x.minValue = minValue; + x.maxValue = maxValue; x.notForReplication = notForReplication; return x; } @@ -379,6 +511,10 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen x.setOnUpdate(onUpdate.clone()); } + if (format != null) { + x.setFormat(format.clone()); + } + if (storage != null) { x.setStorage(storage.clone()); } @@ -387,6 +523,10 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen x.setCharsetExpr(charsetExpr.clone()); } + if (collateExpr != null) { + x.setCollateExpr(collateExpr.clone()); + } + if (asExpr != null) { x.setAsExpr(asExpr.clone()); } @@ -398,6 +538,47 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen x.setIdentity(identity.clone()); } + if (delimiter != null) { + x.setDelimiter(delimiter.clone()); + } + + if (valueType != null) { + x.setValueType(valueType.clone()); + } + + if (nlpTokenizer != null) { + x.setNplTokenizer(nlpTokenizer.clone()); + } + + x.preSort = preSort; + x.preSortOrder = preSortOrder; + + if (jsonIndexAttrsExpr != null) { + x.setJsonIndexAttrsExpr(jsonIndexAttrsExpr.clone()); + } + + if (mappedBy != null) { + for (SQLAssignItem item : mappedBy) { + SQLAssignItem item2 = item.clone(); + item2.setParent(this); + if (x.mappedBy == null) { + x.mappedBy = new ArrayList(); + } + x.mappedBy.add(item2); + } + } + + if (colProperties != null) { + for (SQLAssignItem item : colProperties) { + SQLAssignItem item2 = item.clone(); + item2.setParent(this); + if (x.colProperties == null) { + x.colProperties = new ArrayList(); + } + x.colProperties.add(item2); + } + } + return x; } @@ -435,22 +616,180 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen return false; } - public boolean isPrimaryKey() { - for (SQLColumnConstraint constraint : constraints) { - if (constraint instanceof SQLColumnPrimaryKey) { - return true; - } - } + public SQLExpr getGeneratedAlawsAs() { + return generatedAlawsAs; + } - if (parent instanceof SQLCreateTableStatement) { - return ((SQLCreateTableStatement) parent) - .isPrimaryColumn(nameHashCode64()); + public void setGeneratedAlawsAs(SQLExpr x) { + if (x != null) { + x.setParent(this); } + this.generatedAlawsAs = x; + } - return false; + public boolean isVisible() { + return visible; + } + + public void setVisible(boolean visible) { + this.visible = visible; + } + + public SQLExpr getDelimiter() { + return delimiter; + } + + public boolean isDisableIndex() { + return disableIndex; + } + + public void setDisableIndex(boolean disableIndex) { + this.disableIndex = disableIndex; + } + + public void setDelimiter(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.delimiter = x; + } + + public SQLExpr getDelimiterTokenizer() { + return delimiterTokenizer; + } + + public void setDelimiterTokenizer(SQLExpr delimiterTokenizer) { + this.delimiterTokenizer = delimiterTokenizer; + } + + public SQLExpr getNlpTokenizer() { + return nlpTokenizer; + } + + public void setNlpTokenizer(SQLExpr nlpTokenizer) { + this.nlpTokenizer = nlpTokenizer; + } + + public SQLExpr getValueType() { + return valueType; + } + + public void setValueType(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.valueType = x; + } + + public boolean isPreSort() { + return preSort; + } + + public void setPreSort(boolean preSort) { + this.preSort = preSort; + } + + public int getPreSortOrder() { + return preSortOrder; + } + + public void setPreSortOrder(int preSortOrder) { + this.preSortOrder = preSortOrder; + } + + public SQLExpr getJsonIndexAttrsExpr() { + return jsonIndexAttrsExpr; + } + + public void setJsonIndexAttrsExpr(SQLExpr jsonIndexAttrsExpr) { + this.jsonIndexAttrsExpr = jsonIndexAttrsExpr; + } + + public AutoIncrementType getSequenceType() { + return sequenceType; + } + + public void setSequenceType(AutoIncrementType sequenceType) { + this.sequenceType = sequenceType; } public String toString() { return SQLUtils.toSQLString(this, dbType); } + + public SQLExpr getUnitCount() { + return unitCount; + } + + public SQLExpr getUnitIndex() { + return unitIndex; + } + + public void setUnitIndex(SQLExpr unitIndex) { + if (unitIndex != null) { + unitIndex.setParent(this); + } + this.unitIndex = unitIndex; + } + + public SQLExpr getNplTokenizer() { + return nlpTokenizer; + } + + public void setNplTokenizer(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.nlpTokenizer = x; + } + + public SQLExpr getStep() { + return step; + } + + public void setStep(SQLExpr step) { + if (step != null) { + step.setParent(this); + } + this.step = step; + } + + public List getMappedBy() { + if (mappedBy == null) { + mappedBy = new ArrayList(); + } + return mappedBy; + } + + public List getMappedByDirect() { + return mappedBy; + } + + public List getColProperties() { + if (colProperties == null) { + colProperties = new ArrayList(); + } + return colProperties; + } + + public SQLCharExpr getEncode() { + return encode; + } + + public void setEncode(SQLCharExpr encode) { + this.encode = encode; + } + + public SQLCharExpr getCompression() { + return compression; + } + + public void setCompression(SQLCharExpr compression) { + this.compression = compression; + } + + public List getColPropertiesDirect() { + return colProperties; + } + } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java index 5eadac2df8..1c8ec8bbf7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java @@ -72,7 +72,7 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS // for hive & odps protected SQLExternalRecordFormat rowFormat; protected final List partitionColumns = new ArrayList(2); - protected final List clusteredBy = new ArrayList(); + protected final List clusteredBy = new ArrayList(); protected final List sortedBy = new ArrayList(); protected int buckets; @@ -1074,7 +1074,7 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS this.onCommitPreserveRows = onCommitPreserveRows; } - public List getClusteredBy() { + public List getClusteredBy() { return clusteredBy; } @@ -1125,4 +1125,9 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS return pk.containsColumn(columnNameHash); } + + public void addClusteredByItem(SQLSelectOrderByItem item) { + item.setParent(this); + this.clusteredBy.add(item); + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java index e3cf92a66f..2562b37739 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java @@ -34,6 +34,7 @@ public class SQLExprTableSource extends SQLTableSourceImpl implements SQLReplace protected SQLExpr expr; private List partitions; + protected SQLTableSampling sampling; private SchemaObject schemaObject; protected List columns; @@ -66,6 +67,17 @@ public class SQLExprTableSource extends SQLTableSourceImpl implements SQLReplace this.setExpr(new SQLIdentifierExpr(name)); } + public SQLTableSampling getSampling() { + return sampling; + } + + public void setSampling(SQLTableSampling x) { + if (x != null) { + x.setParent(this); + } + this.sampling = x; + } + public SQLName getName() { if (expr instanceof SQLName) { return (SQLName) expr; @@ -145,17 +157,25 @@ public class SQLExprTableSource extends SQLTableSourceImpl implements SQLReplace public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; SQLExprTableSource that = (SQLExprTableSource) o; if (expr != null ? !expr.equals(that.expr) : that.expr != null) return false; - return partitions != null ? partitions.equals(that.partitions) : that.partitions == null; + if (partitions != null ? !partitions.equals(that.partitions) : that.partitions != null) return false; + if (sampling != null ? !sampling.equals(that.sampling) : that.sampling != null) return false; + if (schemaObject != null ? !schemaObject.equals(that.schemaObject) : that.schemaObject != null) return false; + return columns != null ? columns.equals(that.columns) : that.columns == null; } @Override public int hashCode() { - int result = expr != null ? expr.hashCode() : 0; + int result = super.hashCode(); + result = 31 * result + (expr != null ? expr.hashCode() : 0); result = 31 * result + (partitions != null ? partitions.hashCode() : 0); + result = 31 * result + (sampling != null ? sampling.hashCode() : 0); + result = 31 * result + (schemaObject != null ? schemaObject.hashCode() : 0); + result = 31 * result + (columns != null ? columns.hashCode() : 0); return result; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java index 92920f1781..815b348f5b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java @@ -1,33 +1,38 @@ -/* - * 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.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLObjectImpl; +import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLExternalRecordFormat extends SQLObjectImpl { private SQLExpr delimitedBy; private SQLExpr terminatedBy; + private SQLExpr escapedBy; + private SQLExpr collectionItemsTerminatedBy; + private SQLExpr mapKeysTerminatedBy; + private SQLExpr linesTerminatedBy; + private SQLExpr nullDefinedAs; + private SQLExpr serde; + + private Boolean logfile; + private Boolean badfile; + private boolean ltrim; + private boolean missingFieldValuesAreNull; + private boolean rejectRowsWithAllNullFields; @Override public void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, delimitedBy); acceptChild(visitor, terminatedBy); + acceptChild(visitor, escapedBy); + acceptChild(visitor, collectionItemsTerminatedBy); + acceptChild(visitor, mapKeysTerminatedBy); + acceptChild(visitor, linesTerminatedBy); + acceptChild(visitor, nullDefinedAs); + acceptChild(visitor, serde); } visitor.endVisit(this); } @@ -47,10 +52,156 @@ public class SQLExternalRecordFormat extends SQLObjectImpl { return terminatedBy; } - public void setTerminatedBy(SQLExpr terminatedBy) { - if (terminatedBy != null) { - terminatedBy.setParent(this); + public void setTerminatedBy(SQLExpr x) { + if (x != null) { + x.setParent(this); } - this.terminatedBy = terminatedBy; + this.terminatedBy = x; + } + + public SQLExpr getSerde() { + return serde; + } + + public void setSerde(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.serde = x; + } + + public SQLExpr getMapKeysTerminatedBy() { + return mapKeysTerminatedBy; + } + + public void setMapKeysTerminatedBy(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + mapKeysTerminatedBy = x; + } + + public SQLExpr getCollectionItemsTerminatedBy() { + return collectionItemsTerminatedBy; + } + + public void setCollectionItemsTerminatedBy(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.collectionItemsTerminatedBy = x; + } + + public SQLExpr getEscapedBy() { + return escapedBy; + } + + public void setEscapedBy(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.escapedBy = x; + } + + public SQLExpr getLinesTerminatedBy() { + return linesTerminatedBy; + } + + public void setLinesTerminatedBy(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.linesTerminatedBy = x; + } + + public SQLExpr getNullDefinedAs() { + return nullDefinedAs; + } + + public void setNullDefinedAs(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.nullDefinedAs = x; + } + + public Boolean getLogfile() { + return logfile; + } + + public void setLogfile(Boolean logfile) { + this.logfile = logfile; + } + + public Boolean getBadfile() { + return badfile; + } + + public void setBadfile(Boolean badfile) { + this.badfile = badfile; + } + + public boolean isLtrim() { + return ltrim; + } + + public void setLtrim(boolean ltrim) { + this.ltrim = ltrim; + } + + public boolean isRejectRowsWithAllNullFields() { + return rejectRowsWithAllNullFields; + } + + public void setRejectRowsWithAllNullFields(boolean rejectRowsWithAllNullFields) { + this.rejectRowsWithAllNullFields = rejectRowsWithAllNullFields; + } + + public boolean isMissingFieldValuesAreNull() { + return missingFieldValuesAreNull; + } + + public void setMissingFieldValuesAreNull(boolean missingFieldValuesAreNull) { + this.missingFieldValuesAreNull = missingFieldValuesAreNull; + } + + public SQLExternalRecordFormat clone() { + SQLExternalRecordFormat x = new SQLExternalRecordFormat(); + + if (delimitedBy != null) { + x.setDelimitedBy(delimitedBy.clone()); + } + + if (escapedBy != null) { + x.setEscapedBy(escapedBy.clone()); + } + + if (collectionItemsTerminatedBy != null) { + x.setCollectionItemsTerminatedBy(collectionItemsTerminatedBy.clone()); + } + + if (mapKeysTerminatedBy != null) { + x.setMapKeysTerminatedBy(mapKeysTerminatedBy.clone()); + } + + if (linesTerminatedBy != null) { + x.setLinesTerminatedBy(linesTerminatedBy.clone()); + } + + if (nullDefinedAs != null) { + x.setNullDefinedAs(nullDefinedAs.clone()); + } + + if (serde != null) { + x.setSerde(serde.clone()); + } + + x.logfile = logfile; + x.badfile = badfile; + x.ltrim = ltrim; + x.missingFieldValuesAreNull = missingFieldValuesAreNull; + x.rejectRowsWithAllNullFields = rejectRowsWithAllNullFields; + + return x; } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java index 5db19d5bd6..58f9621cfe 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java @@ -21,6 +21,8 @@ import com.alibaba.druid.sql.ast.SQLOrderingSpecification; import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.visitor.SQLASTVisitor; +import java.util.List; + public final class SQLSelectOrderByItem extends SQLObjectImpl implements SQLReplaceable { protected SQLExpr expr; @@ -155,4 +157,41 @@ public final class SQLSelectOrderByItem extends SQLObjectImpl implements SQLRepl public void setResolvedSelectItem(SQLSelectItem resolvedSelectItem) { this.resolvedSelectItem = resolvedSelectItem; } + + public boolean isClusterBy() { + if (parent instanceof SQLCreateTableStatement) { + List clusteredBy = ((SQLCreateTableStatement) parent).getClusteredBy(); + return clusteredBy.indexOf(this) != -1; + } + + if (parent instanceof SQLSelectQueryBlock) { + List clusterBy = ((SQLSelectQueryBlock) parent).getClusterByDirect(); + return clusterBy != null && clusterBy.indexOf(this) != -1; + } + + return false; + } + + public boolean isSortBy() { + if (parent instanceof SQLCreateTableStatement) { + List sortedBy = ((SQLCreateTableStatement) parent).getSortedBy(); + return sortedBy.indexOf(this) != -1; + } + + if (parent instanceof SQLSelectQueryBlock) { + List sortedBy = ((SQLSelectQueryBlock) parent).getSortByDirect(); + return sortedBy != null && sortedBy.indexOf(this) != -1; + } + + return false; + } + + public boolean isDistributeBy() { + if (parent instanceof SQLSelectQueryBlock) { + List distributeBy = ((SQLSelectQueryBlock) parent).getDistributeBy(); + return distributeBy.indexOf(this) != -1; + } + + return false; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSampling.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSampling.java new file mode 100644 index 0000000000..c10ceacd75 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSampling.java @@ -0,0 +1,174 @@ +package com.alibaba.druid.sql.ast.statement; + +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLObjectImpl; +import com.alibaba.druid.sql.ast.SQLReplaceable; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + +public class SQLTableSampling + extends SQLObjectImpl implements SQLReplaceable { + private SQLExpr bucket; + private SQLExpr outOf; + private SQLExpr on; + private SQLExpr percent; + private SQLExpr rows; + private SQLExpr byteLength; + + private boolean bernoulli; + private boolean system; + + public SQLTableSampling clone() { + SQLTableSampling x = new SQLTableSampling(); + + if (bucket != null) { + x.setBucket(bucket.clone()); + } + + if (outOf != null) { + x.setOutOf(outOf.clone()); + } + + if (on != null) { + x.setOn(on.clone()); + } + + if (percent != null) { + x.setPercent(percent.clone()); + } + + if (rows != null) { + x.setRows(rows.clone()); + } + + if (byteLength != null) { + x.setByteLength(byteLength.clone()); + } + + x.bernoulli = bernoulli; + x.system = system; + return x; + } + + public SQLExpr getBucket() { + return bucket; + } + + public void setBucket(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.bucket = x; + } + + public SQLExpr getOutOf() { + return outOf; + } + + public void setOutOf(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.outOf = x; + } + + public SQLExpr getOn() { + return on; + } + + public void setOn(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.on = x; + } + + public SQLExpr getPercent() { + return percent; + } + + public void setPercent(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.percent = x; + } + + @Override + protected void accept0(SQLASTVisitor v) { + if (v.visit(this)) { + acceptChild(v, bucket); + acceptChild(v, outOf); + acceptChild(v, on); + acceptChild(v, percent); + acceptChild(v, byteLength); + } + v.endVisit(this); + } + + @Override + public boolean replace(SQLExpr expr, SQLExpr target) { + if (bucket == expr) { + setBucket(target); + return true; + } + + if (outOf == expr) { + setOutOf(target); + return true; + } + + if (on == expr) { + setOn(target); + return true; + } + + if (percent == expr) { + setPercent(target); + return true; + } + + if (byteLength == expr) { + setByteLength(target); + return true; + } + return false; + } + + public SQLExpr getByteLength() { + return byteLength; + } + + public void setByteLength(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.byteLength = x; + } + + public SQLExpr getRows() { + return rows; + } + + public void setRows(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.rows = x; + } + + public boolean isBernoulli() { + return bernoulli; + } + + public void setBernoulli(boolean bernoulli) { + this.bernoulli = bernoulli; + } + + public boolean isSystem() { + return system; + } + + public void setSystem(boolean system) { + this.system = system; + } +} diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java index c4091e35b2..144578d2d4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java @@ -144,4 +144,24 @@ public abstract class SQLTableSourceImpl extends SQLObjectImpl implements SQLTab public SQLObject resolveColum(long columnNameHash) { return findColumn(columnNameHash); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + SQLTableSourceImpl that = (SQLTableSourceImpl) o; + + if (aliasHashCode64() != that.aliasHashCode64()) return false; + if (hints != null ? !hints.equals(that.hints) : that.hints != null) return false; + return flashback != null ? flashback.equals(that.flashback) : that.flashback == null; + } + + @Override + public int hashCode() { + int result = (hints != null ? hints.hashCode() : 0); + result = 31 * result + (flashback != null ? flashback.hashCode() : 0); + result = 31 * result + (int) (aliasHashCode64() ^ (aliasHashCode64() >>> 32)); + return result; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnnestTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnnestTableSource.java new file mode 100644 index 0000000000..c864f821c0 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnnestTableSource.java @@ -0,0 +1,74 @@ +package com.alibaba.druid.sql.ast.statement; + +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + +import java.util.ArrayList; +import java.util.List; + +public class SQLUnnestTableSource + extends SQLTableSourceImpl { + private final List items = new ArrayList(); + protected List columns = new ArrayList(); + private boolean ordinality = false; + + public SQLUnnestTableSource() { + + } + + @Override + protected void accept0(SQLASTVisitor v) { + if (v.visit(this)) { + acceptChild(v, items); + acceptChild(v, columns); + } + v.endVisit(this); + } + + public List getColumns() { + return columns; + } + + public void addColumn(SQLName column) { + column.setParent(this); + this.columns.add(column); + } + + public boolean isOrdinality() { + return ordinality; + } + + public void setOrdinality(boolean ordinality) { + this.ordinality = ordinality; + } + + public List getItems() { + return items; + } + + public void addItem(SQLExpr item) { + item.setParent(this); + this.items.add(item); + } + + public SQLUnnestTableSource clone() { + SQLUnnestTableSource x = new SQLUnnestTableSource(); + + for (SQLExpr item : items) { + SQLExpr item2 = item.clone(); + item2.setParent(x); + x.items.add(item2); + } + + for (SQLName column : columns) { + SQLName c2 = column.clone(); + c2.setParent(x); + x.columns.add(c2); + } + + x.alias = alias; + + return x; + } +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java index 02a8a03af1..a230566608 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java @@ -26,6 +26,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; import com.alibaba.druid.sql.ast.statement.SQLTableElement; import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; +import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.sql.parser.SQLCreateTableParser; import com.alibaba.druid.sql.parser.SQLExprParser; @@ -38,6 +39,10 @@ public class HiveCreateTableParser extends SQLCreateTableParser { super(exprParser); } + public HiveCreateTableParser(Lexer lexer) { + super(new HiveExprParser(lexer)); + } + public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { HiveCreateTableStatement stmt = newCreateStatement(); @@ -171,7 +176,15 @@ public class HiveCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); accept(Token.BY); accept(Token.LPAREN); - this.exprParser.names(stmt.getClusteredBy()); + for (; ; ) { + SQLSelectOrderByItem item = this.exprParser.parseSelectOrderByItem(); + stmt.addClusteredByItem(item); + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + continue; + } + break; + } accept(Token.RPAREN); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java index 8dcc6bd9a4..a35b349844 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 Alibaba Group Holding Ltd. + * Copyright 1999-2017 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. @@ -15,24 +15,25 @@ */ package com.alibaba.druid.sql.dialect.hive.parser; -import java.util.Arrays; - +import com.alibaba.druid.sql.ast.SQLCurrentTimeExpr; +import com.alibaba.druid.sql.ast.SQLCurrentUserExpr; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.expr.SQLArrayExpr; -import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -import com.alibaba.druid.sql.parser.Lexer; -import com.alibaba.druid.sql.parser.SQLExprParser; -import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.druid.sql.parser.Token; +import com.alibaba.druid.sql.ast.expr.*; +import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; +import com.alibaba.druid.sql.ast.statement.SQLExternalRecordFormat; +import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlOutFileExpr; +import com.alibaba.druid.sql.parser.*; import com.alibaba.druid.util.FnvHash; +import java.util.Arrays; + public class HiveExprParser extends SQLExprParser { private final static String[] AGGREGATE_FUNCTIONS; private final static long[] AGGREGATE_FUNCTIONS_CODES; static { String[] strings = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", - "ROWNUMBER" }; + "ROWNUMBER" }; AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true); AGGREGATE_FUNCTIONS = new String[AGGREGATE_FUNCTIONS_CODES.length]; @@ -60,19 +61,229 @@ public class HiveExprParser extends SQLExprParser { } public SQLExpr primaryRest(SQLExpr expr) { - if (lexer.token() == Token.COLONCOLON) { - lexer.nextToken(); - String propertyName = lexer.stringVal(); - lexer.nextToken(); - expr = new SQLPropertyExpr(expr, propertyName); - } else if (lexer.token() == Token.LBRACKET) { - SQLArrayExpr array = new SQLArrayExpr(); - array.setExpr(expr); - lexer.nextToken(); - this.exprList(array.getValues(), array); - accept(Token.RBRACKET); - expr = array; +// if(lexer.token() == Token.COLON) { +// lexer.nextToken(); +// expr = dotRest(expr); +// return expr; +// } + + switch (lexer.token()) { + case LBRACKET: + SQLArrayExpr array = new SQLArrayExpr(); + array.setExpr(expr); + lexer.nextToken(); + this.exprList(array.getValues(), array); + accept(Token.RBRACKET); + return primaryRest(array); + case LITERAL_CHARS: + if (expr instanceof SQLCharExpr) { + String text2 = ((SQLCharExpr) expr).getText(); + do { + String chars = lexer.stringVal(); + text2 += chars; + lexer.nextToken(); + } while (lexer.token() == Token.LITERAL_CHARS || lexer.token() == Token.LITERAL_ALIAS); + expr = new SQLCharExpr(text2); + } + break; + case IDENTIFIER: + if (lexer.identifierEquals(FnvHash.Constants.BD) && expr instanceof SQLNumericLiteralExpr) { + lexer.nextToken(); + Number num = ((SQLNumericLiteralExpr) expr).getNumber(); + expr = new SQLDecimalExpr(num.toString()); + } + break; + default: + break; } + return super.primaryRest(expr); } + + public SQLExpr primary() { + final Token tok = lexer.token(); + switch (tok) { + case IDENTIFIER: + final long hash_lower = lexer.hash_lower(); + if (hash_lower == FnvHash.Constants.OUTLINE) { + lexer.nextToken(); + SQLExpr file = primary(); + SQLExpr expr = new MySqlOutFileExpr(file); + + return primaryRest(expr); + } + + SQLCurrentTimeExpr currentTimeExpr = null; + if (hash_lower == FnvHash.Constants.CURRENT_TIMESTAMP) { + currentTimeExpr = new SQLCurrentTimeExpr(SQLCurrentTimeExpr.Type.CURRENT_TIMESTAMP); + } else if (hash_lower == FnvHash.Constants.CURRENT_DATE) { + currentTimeExpr = new SQLCurrentTimeExpr(SQLCurrentTimeExpr.Type.CURRENT_DATE); + } else if (hash_lower == FnvHash.Constants.CURRENT_USER && isEnabled(SQLParserFeature.EnableCurrentUserExpr)) { + lexer.nextToken(); + return primaryRest(new SQLCurrentUserExpr()); + } + + if (currentTimeExpr != null) { + String methodName = lexer.stringVal(); + lexer.nextToken(); + + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); + } else { + return primaryRest( + methodRest(new SQLIdentifierExpr(methodName), false) + ); + } + } + + return primaryRest(currentTimeExpr); + } + default: + break; + } + + return super.primary(); + } + + public SQLExternalRecordFormat parseRowFormat() { + lexer.nextToken(); + acceptIdentifier("FORMAT"); + + if (lexer.identifierEquals(FnvHash.Constants.DELIMITED)) { + lexer.nextToken(); + } + + SQLExternalRecordFormat format = new SQLExternalRecordFormat(); + + if (lexer.identifierEquals(FnvHash.Constants.FIELDS)) { + lexer.nextToken(); + acceptIdentifier("TERMINATED"); + accept(Token.BY); + + format.setTerminatedBy(this.expr()); + } else if (lexer.identifierEquals("FIELD")) { + throw new ParserException("syntax error, expect FIELDS, " + lexer.info()); + } + + if (lexer.token() == Token.ESCAPE || lexer.identifierEquals(FnvHash.Constants.ESCAPED)) { + lexer.nextToken(); + accept(Token.BY); + format.setEscapedBy(this.expr()); + } + + if (lexer.identifierEquals(FnvHash.Constants.LINES)) { + lexer.nextToken(); + acceptIdentifier("TERMINATED"); + accept(Token.BY); + + format.setLinesTerminatedBy(this.expr()); + } + + if (lexer.identifierEquals(FnvHash.Constants.COLLECTION)) { + lexer.nextToken(); + acceptIdentifier("ITEMS"); + acceptIdentifier("TERMINATED"); + accept(Token.BY); + format.setCollectionItemsTerminatedBy(this.expr()); + } + + if (lexer.identifierEquals(FnvHash.Constants.MAP)) { + lexer.nextToken(); + acceptIdentifier("KEYS"); + acceptIdentifier("TERMINATED"); + accept(Token.BY); + format.setMapKeysTerminatedBy(this.expr()); + } + + if (lexer.identifierEquals(FnvHash.Constants.SERDE)) { + lexer.nextToken(); + format.setSerde(this.expr()); + } + + return format; + } + + protected SQLExpr parseAliasExpr(String alias) { + String chars = alias.substring(1, alias.length() - 1); + + StringBuilder buf = null; + + for (int i = 0; i < chars.length(); ++i) { + char ch = chars.charAt(i); + if (ch == '\\' && i < chars.length() - 1) { + char next = chars.charAt(i + 1); + if (next == '\\') { + if (buf == null) { + buf = new StringBuilder(); + buf.append(chars.substring(0, i)); + } + buf.append('\\'); + ++i; + } else if (next == '\"') { + if (buf == null) { + buf = new StringBuilder(); + buf.append(chars.substring(0, i)); + } + buf.append('"'); + ++i; + } else { + if (buf != null) { + buf.append(ch); + } + } + } else { + if (buf != null) { + buf.append(ch); + } + } + } + + if (buf != null) { + chars = buf.toString(); + } + return new SQLCharExpr(chars); + } + + public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { + if (lexer.identifierEquals(FnvHash.Constants.MAPPED)) { + lexer.nextToken(); + accept(Token.BY); + this.parseAssignItem(column.getMappedBy(), column); + } + + if (lexer.identifierEquals(FnvHash.Constants.COLPROPERTIES)) { + lexer.nextToken(); + this.parseAssignItem(column.getColProperties(), column); + } + + + return super.parseColumnRest(column); + } + + protected SQLExpr parseInterval() { + accept(Token.INTERVAL); + SQLExpr value = expr(); + + if (lexer.token() != Token.IDENTIFIER) { + throw new ParserException("Syntax error. " + lexer.info()); + } + + String unit = lexer.stringVal(); + lexer.nextToken(); + + SQLIntervalExpr intervalExpr = new SQLIntervalExpr(); + intervalExpr.setValue(value); + SQLIntervalUnit intervalUnit = SQLIntervalUnit.valueOf(unit.toUpperCase()); + if (intervalUnit == SQLIntervalUnit.YEAR + && lexer.token() == Token.TO) { + lexer.nextToken(); + acceptIdentifier("MONTH"); + intervalUnit = SQLIntervalUnit.YEAR_TO_MONTH; + } + intervalExpr.setUnit(intervalUnit); + + return intervalExpr; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveSelectParser.java index dc075e0c84..8611b92a4d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveSelectParser.java @@ -17,12 +17,18 @@ package com.alibaba.druid.sql.dialect.hive.parser; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLOrderingSpecification; +import com.alibaba.druid.sql.ast.expr.SQLSizeExpr; +import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; +import com.alibaba.druid.sql.ast.statement.SQLTableSampling; +import com.alibaba.druid.sql.ast.statement.SQLTableSource; +import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.SQLExprParser; import com.alibaba.druid.sql.parser.SQLSelectListCache; import com.alibaba.druid.sql.parser.SQLSelectParser; import com.alibaba.druid.sql.parser.Token; +import com.alibaba.druid.util.FnvHash; public class HiveSelectParser extends SQLSelectParser { @@ -42,32 +48,82 @@ public class HiveSelectParser extends SQLSelectParser { return new HiveExprParser(lexer); } - protected void parseSortBy(SQLSelectQueryBlock queryBlock) { - if (lexer.token() == Token.SORT) { + protected SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { + if (lexer.identifierEquals(FnvHash.Constants.TABLESAMPLE) && tableSource instanceof SQLExprTableSource) { + Lexer.SavePoint mark = lexer.mark(); lexer.nextToken(); - accept(Token.BY); - for (;;) { - SQLExpr expr = this.expr(); + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); - SQLSelectOrderByItem sortByItem = new SQLSelectOrderByItem(expr); + SQLTableSampling sampling = new SQLTableSampling(); - if (lexer.token() == Token.ASC) { - sortByItem.setType(SQLOrderingSpecification.ASC); + if (lexer.identifierEquals(FnvHash.Constants.BUCKET)) { lexer.nextToken(); - } else if (lexer.token() == Token.DESC) { - sortByItem.setType(SQLOrderingSpecification.DESC); + SQLExpr bucket = this.exprParser.primary(); + sampling.setBucket(bucket); + + if (lexer.token() == Token.OUT) { + lexer.nextToken(); + accept(Token.OF); + SQLExpr outOf = this.exprParser.primary(); + sampling.setOutOf(outOf); + } + + if (lexer.token() == Token.ON) { + lexer.nextToken(); + SQLExpr on = this.exprParser.expr(); + sampling.setOn(on); + } + } + + if (lexer.token() == Token.LITERAL_INT || lexer.token() == Token.LITERAL_FLOAT) { + SQLExpr val = this.exprParser.primary(); + + if (lexer.identifierEquals(FnvHash.Constants.ROWS)) { + lexer.nextToken(); + sampling.setRows(val); + } else { + acceptIdentifier("PERCENT"); + sampling.setPercent(val); + } + } + + if (lexer.token() == Token.IDENTIFIER) { + String strVal = lexer.stringVal(); + char first = strVal.charAt(0); + char last = strVal.charAt(strVal.length() - 1); + if (last >= 'a' && last <= 'z') { + last -= 32; // to upper + } + + boolean match = false; + if ((first == '.' || (first >= '0' && first <= '9'))) { + switch (last) { + case 'B': + case 'K': + case 'M': + case 'G': + case 'T': + case 'P': + match = true; + break; + default: + break; + } + } + SQLSizeExpr size = new SQLSizeExpr(strVal.substring(0, strVal.length() - 2), last); + sampling.setByteLength(size); lexer.nextToken(); } - queryBlock.addSortBy(sortByItem); + final SQLExprTableSource table = (SQLExprTableSource) tableSource; + table.setSampling(sampling); - if (lexer.token() == Token.COMMA) { - lexer.nextToken(); - } else { - break; - } + accept(Token.RPAREN); + } else { + lexer.reset(mark); } } + return super.parseTableSourceRest(tableSource); } - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveOutputVisitor.java index 29b04ba11d..347b996383 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveOutputVisitor.java @@ -118,7 +118,7 @@ public class HiveOutputVisitor extends SQLASTOutputVisitor implements HiveASTVis print(')'); } - List clusteredBy = x.getClusteredBy(); + List clusteredBy = x.getClusteredBy(); if (clusteredBy.size() > 0) { println(); print0(ucase ? "CLUSTERED BY (" : "clustered by ("); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByKey.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByKey.java index fe38740740..3b68bb3f1a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByKey.java @@ -81,4 +81,13 @@ public class MySqlSubPartitionByKey extends SQLSubPartitionBy implements MySqlOb cloneTo(x); return x; } + + public boolean isPartitionByColumn(long columnNameHashCode64) { + for (SQLName column : columns) { + if (column.nameHashCode64() == columnNameHashCode64) { + return true; + } + } + return false; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsCreateTableParser.java index b63fc18e68..cc8a4d8ef9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsCreateTableParser.java @@ -144,7 +144,15 @@ public class OdpsCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); accept(Token.BY); accept(Token.LPAREN); - this.exprParser.names(stmt.getClusteredBy()); + for (; ; ) { + SQLSelectOrderByItem item = this.exprParser.parseSelectOrderByItem(); + stmt.addClusteredByItem(item); + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + continue; + } + break; + } accept(Token.RPAREN); } 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 0431bc1cdf..2cb03e662f 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 @@ -162,7 +162,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis print(')'); } - List clusteredBy = x.getClusteredBy(); + List clusteredBy = x.getClusteredBy(); if (clusteredBy.size() > 0) { println(); print0(ucase ? "CLUSTERED BY (" : "clustered by ("); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java index 8befe2a5a0..3bb6521834 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java @@ -829,7 +829,8 @@ public class OracleSelectParser extends SQLSelectParser { tableSource.setAlias(tableAlias(true)); } else if ((tableSource.getAlias() == null) || (tableSource.getAlias().length() == 0)) { if (lexer.token() != Token.LEFT && lexer.token() != Token.RIGHT && lexer.token() != Token.FULL) { - tableSource.setAlias(tableAlias()); + final String tableAlias = tableAlias(); + tableSource.setAlias(tableAlias); } } @@ -866,10 +867,19 @@ public class OracleSelectParser extends SQLSelectParser { joinType = SQLJoinTableSource.JoinType.FULL_OUTER_JOIN; } + boolean natural = lexer.identifierEquals(FnvHash.Constants.NATURAL); + if (natural) { + lexer.nextToken(); + } + if (lexer.token() == Token.INNER) { lexer.nextToken(); accept(Token.JOIN); - joinType = SQLJoinTableSource.JoinType.INNER_JOIN; + if (natural) { + joinType = SQLJoinTableSource.JoinType.NATURAL_INNER_JOIN; + } else { + joinType = SQLJoinTableSource.JoinType.INNER_JOIN; + } } if (lexer.token() == Token.CROSS) { lexer.nextToken(); @@ -879,7 +889,11 @@ public class OracleSelectParser extends SQLSelectParser { if (lexer.token() == Token.JOIN) { lexer.nextToken(); - joinType = SQLJoinTableSource.JoinType.JOIN; + if (natural) { + joinType = SQLJoinTableSource.JoinType.NATURAL_JOIN; + } else { + joinType = SQLJoinTableSource.JoinType.JOIN; + } } if (lexer.token() == (Token.COMMA)) { @@ -894,7 +908,8 @@ public class OracleSelectParser extends SQLSelectParser { SQLTableSource right; right = parseTableSourcePrimary(); - right.setAlias(this.tableAlias()); + String tableAlias = tableAlias(); + right.setAlias(tableAlias); join.setRight(right); if (lexer.token() == Token.ON) { @@ -918,6 +933,10 @@ public class OracleSelectParser extends SQLSelectParser { parsePivot(join); return parseTableSourceRest(join); + } else { + if (lexer.identifierEquals(FnvHash.Constants.PIVOT)) { + parsePivot(tableSource); + } } return tableSource; 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 eeaf604fa2..77c73d8a9e 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -3174,6 +3174,21 @@ public class SQLExprParser extends SQLParser { return unique; } + public void parseAssignItem(List outList, SQLObject parent) { + accept(Token.LPAREN); + for (;;) { + SQLAssignItem item = this.parseAssignItem(); + item.setParent(parent); + outList.add(item); + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + continue; + } + break; + } + accept(Token.RPAREN); + } + public SQLAssignItem parseAssignItem() { SQLAssignItem item = new SQLAssignItem(); diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java index ec372410e1..3aeb1d0697 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java @@ -17,6 +17,7 @@ package com.alibaba.druid.sql.parser; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.util.FnvHash; +import com.alibaba.druid.util.StringUtils; public class SQLParser { protected final Lexer lexer; @@ -79,16 +80,72 @@ public class SQLParser { } if (token == Token.IDENTIFIER) { + String ident = lexer.stringVal; long hash = lexer.hash_lower; + if (isEnabled(SQLParserFeature.IgnoreNameQuotes) && ident.length() > 1) { + ident = StringUtils.removeNameQuotes(ident); + } + if (hash == FnvHash.Constants.START || hash == FnvHash.Constants.CONNECT + || hash == FnvHash.Constants.NATURAL + || hash == FnvHash.Constants.CROSS || hash == FnvHash.Constants.OFFSET || hash == FnvHash.Constants.LIMIT) { if (must) { throw new ParserException("illegal alias. " + lexer.info()); } + + Lexer.SavePoint mark = lexer.mark(); + lexer.nextToken(); + switch (lexer.token) { + case EOF: + case COMMA: + case WHERE: + case INNER: + return ident; + default: + lexer.reset(mark); + break; + } + return null; } + + if (!must) { + if (hash == FnvHash.Constants.MODEL) { + Lexer.SavePoint mark = lexer.mark(); + lexer.nextToken(); + if (lexer.token == Token.PARTITION + || lexer.token == Token.UNION + || lexer.identifierEquals(FnvHash.Constants.DIMENSION) + || lexer.identifierEquals(FnvHash.Constants.IGNORE) + || lexer.identifierEquals(FnvHash.Constants.KEEP)) { + lexer.reset(mark); + return null; + } + return ident; + } else if (hash == FnvHash.Constants.WINDOW) { + Lexer.SavePoint mark = lexer.mark(); + lexer.nextToken(); + if (lexer.token == Token.IDENTIFIER) { + lexer.reset(mark); + return null; + } + return ident; + } else if (hash == FnvHash.Constants.DISTRIBUTE + || hash == FnvHash.Constants.SORT + || hash == FnvHash.Constants.CLUSTER + ) { + Lexer.SavePoint mark = lexer.mark(); + lexer.nextToken(); + if (lexer.token == Token.BY) { + lexer.reset(mark); + return null; + } + return ident; + } + } } return this.as(); diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java index 628f8fd382..37e650f699 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java @@ -27,6 +27,7 @@ public enum SQLParserFeature { StrictForWall, EnableMultiUnion, IgnoreNameQuotes, + EnableCurrentUserExpr, PipesAsConcat, // for mysql ; diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java index 9821be97e3..9c5a2421c4 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java @@ -715,7 +715,7 @@ public class SQLSelectParser extends SQLParser { } } - if (lexer.identifierEquals(FnvHash.Constants.SORT)) { + if (lexer.token == Token.SORT || lexer.identifierEquals(FnvHash.Constants.SORT)) { lexer.nextToken(); accept(Token.BY); @@ -896,7 +896,7 @@ public class SQLSelectParser extends SQLParser { groupBy.setWithRollUp(true); } - if (JdbcConstants.MYSQL.equals(dbType) + if(JdbcConstants.MYSQL.equals(dbType) && lexer.token == Token.DESC) { lexer.nextToken(); // skip } @@ -919,7 +919,7 @@ public class SQLSelectParser extends SQLParser { } SQLExpr item = this.exprParser.expr(); - if (JdbcConstants.MYSQL.equals(dbType)) { + if(JdbcConstants.MYSQL.equals(dbType)) { if (lexer.token == Token.DESC) { lexer.nextToken(); // skip item =new MySqlOrderingExpr(item, SQLOrderingSpecification.DESC); @@ -1250,7 +1250,45 @@ public class SQLSelectParser extends SQLParser { accept(Token.RPAREN); } } + } else if (lexer.token() == Token.TABLE) { + HiveCreateTableParser createTableParser = new HiveCreateTableParser(lexer); + HiveCreateTableStatement stmt = (HiveCreateTableStatement) createTableParser + .parseCreateTable(false); + rightTableSource = new SQLAdhocTableSource(stmt); + primaryTableSourceRest(rightTableSource); } else { + if (lexer.identifierEquals(FnvHash.Constants.UNNEST)) { + Lexer.SavePoint mark = lexer.mark(); + lexer.nextToken(); + + if (lexer.token() == Token.LPAREN){ + lexer.nextToken(); + SQLUnnestTableSource unnest = new SQLUnnestTableSource(); + this.exprParser.exprList(unnest.getItems(), unnest); + accept(Token.RPAREN); + + if (lexer.token() == Token.WITH) { + lexer.nextToken(); + acceptIdentifier("ORDINALITY"); + unnest.setOrdinality(true); + } + + String alias = this.tableAlias(); + unnest.setAlias(alias); + + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); + this.exprParser.names(unnest.getColumns(), unnest); + accept(Token.RPAREN); + } + + SQLTableSource tableSrc = parseTableSourceRest(unnest); + rightTableSource = tableSrc; + } else { + lexer.reset(mark); + } + } + if (rightTableSource == null) { boolean aliasToken = lexer.token == Token.LITERAL_ALIAS; SQLExpr expr = this.expr(); diff --git a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java index 2c71e33504..469d7efe82 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java +++ b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java @@ -2294,6 +2294,20 @@ class SchemaResolveVisitorFactory { } } + List distributeBy = x.getDistributeBy(); + if (distributeBy != null) { + for (SQLSelectOrderByItem item : distributeBy) { + item.accept(visitor); + } + } + + List sortBy = x.getSortBy(); + if (sortBy != null) { + for (SQLSelectOrderByItem item : sortBy) { + item.accept(visitor); + } + } + visitor.popContext(); } 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 ebf9c9733b..3cadd09394 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -36,9 +36,12 @@ import java.util.Map; import java.util.Set; import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLAdhocTableSource; import com.alibaba.druid.sql.ast.SQLArgument; import com.alibaba.druid.sql.ast.SQLArrayDataType; import com.alibaba.druid.sql.ast.SQLCommentHint; +import com.alibaba.druid.sql.ast.SQLCurrentTimeExpr; +import com.alibaba.druid.sql.ast.SQLCurrentUserExpr; import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLDeclareItem; import com.alibaba.druid.sql.ast.SQLExpr; @@ -84,6 +87,7 @@ import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.expr.SQLContainsExpr; import com.alibaba.druid.sql.ast.expr.SQLCurrentOfCursorExpr; import com.alibaba.druid.sql.ast.expr.SQLDateExpr; +import com.alibaba.druid.sql.ast.expr.SQLDecimalExpr; import com.alibaba.druid.sql.ast.expr.SQLDefaultExpr; import com.alibaba.druid.sql.ast.expr.SQLExistsExpr; import com.alibaba.druid.sql.ast.expr.SQLExprUtils; @@ -107,6 +111,7 @@ import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.ast.expr.SQLQueryExpr; import com.alibaba.druid.sql.ast.expr.SQLRealExpr; import com.alibaba.druid.sql.ast.expr.SQLSequenceExpr; +import com.alibaba.druid.sql.ast.expr.SQLSizeExpr; import com.alibaba.druid.sql.ast.expr.SQLSomeExpr; import com.alibaba.druid.sql.ast.expr.SQLTimestampExpr; import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr; @@ -1989,6 +1994,27 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet orderBy.accept(this); } + final List distributeBy = x.getDistributeByDirect(); + if (distributeBy != null && distributeBy.size() > 0) { + println(); + print0(ucase ? "DISTRIBUTE BY " : "distribute by "); + printAndAccept(distributeBy, ", "); + } + + List sortBy = x.getSortByDirect(); + if (sortBy != null && sortBy.size() > 0) { + println(); + print0(ucase ? "SORT BY " : "sort by "); + printAndAccept(sortBy, ", "); + } + + final List clusterBy = x.getClusterByDirect(); + if (clusterBy != null && clusterBy.size() > 0) { + println(); + print0(ucase ? "CLUSTER BY " : "cluster by "); + printAndAccept(clusterBy, ", "); + } + if (!informix) { printFetchFirst(x); } @@ -6774,4 +6800,130 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet print0(Float.toString(value)); } } + + public boolean visit(SQLTableSampling x) { + print0(ucase ? "TABLESAMPLE " : "tablesample "); + + if (x.isBernoulli()) { + print0(ucase ? "BERNOULLI " : "bernoulli "); + } else if (x.isSystem()) { + print0(ucase ? "SYSTEM " : "system "); + } + + print('('); + + final SQLExpr bucket = x.getBucket(); + if (bucket != null) { + print0(ucase ? "BUCKET " : "bucket "); + bucket.accept(this); + } + + final SQLExpr outOf = x.getOutOf(); + if (outOf != null) { + print0(ucase ? " OUT OF " : " out of "); + outOf.accept(this); + } + + final SQLExpr on = x.getOn(); + if (on != null) { + print0(ucase ? " ON " : " on "); + on.accept(this); + } + + final SQLExpr percent = x.getPercent(); + if (percent != null) { + percent.accept(this); + print0(ucase ? " PERCENT" : " percent"); + } + + final SQLExpr rows = x.getRows(); + if (rows != null) { + rows.accept(this); + + if (JdbcConstants.MYSQL.equals(dbType)) { + print0(ucase ? " ROWS" : " rows"); + } + } + + final SQLExpr size = x.getByteLength(); + if (size != null) { + size.accept(this); + } + + print(')'); + return false; + } + + @Override + public boolean visit(SQLUnnestTableSource x) { + print0(ucase ? "UNNEST(" : "unnest("); + List items = x.getItems(); + printAndAccept(items, ", "); + print(')'); + + final List columns = x.getColumns(); + final String alias = x.getAlias(); + if (alias != null) { + if (columns.size() > 0) { + print0(ucase ?" AS " : " as "); + } else { + print(' '); + } + print0(alias); + } + + if (columns.size() > 0) { + print0(" ("); + for (int i = 0; i < columns.size(); i++) { + if (i != 0) { + print0(", "); + } + printExpr(columns.get(i)); + } + print(')'); + } + + if (x.isOrdinality()) { + print0(ucase ? " WITH ORDINALITY" : " with ordinality"); + } + + return false; + } + + @Override + public boolean visit(SQLAdhocTableSource x) { + final SQLCreateTableStatement definition = x.getDefinition(); + definition.accept(this); + return false; + } + + @Override + public boolean visit(SQLCurrentTimeExpr x) { + final SQLCurrentTimeExpr.Type type = x.getType(); + print(ucase ? type.name : type.name_lower); + return false; + } + + @Override + public boolean visit(SQLCurrentUserExpr x) { + print(ucase ? "CURRENT_USER" : "current_user"); + return false; + } + + @Override + public boolean visit(SQLSizeExpr x) { + x.getValue().accept(this); + print0(x.getUnit().name()); + return false; + } + + @Override + public boolean visit(SQLDecimalExpr x) { + BigDecimal value = x.getValue(); + print0(ucase ? "DECIMAL '" : "decimal '"); + print(value.toString()); + print('\''); + + return false; + } } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java index 92a93e2eae..efb089e984 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java @@ -15,9 +15,12 @@ */ package com.alibaba.druid.sql.visitor; +import com.alibaba.druid.sql.ast.SQLAdhocTableSource; import com.alibaba.druid.sql.ast.SQLArgument; import com.alibaba.druid.sql.ast.SQLArrayDataType; import com.alibaba.druid.sql.ast.SQLCommentHint; +import com.alibaba.druid.sql.ast.SQLCurrentTimeExpr; +import com.alibaba.druid.sql.ast.SQLCurrentUserExpr; import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLDataTypeRefExpr; import com.alibaba.druid.sql.ast.SQLDeclareItem; @@ -56,6 +59,7 @@ import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.expr.SQLContainsExpr; import com.alibaba.druid.sql.ast.expr.SQLCurrentOfCursorExpr; import com.alibaba.druid.sql.ast.expr.SQLDateExpr; +import com.alibaba.druid.sql.ast.expr.SQLDecimalExpr; import com.alibaba.druid.sql.ast.expr.SQLDefaultExpr; import com.alibaba.druid.sql.ast.expr.SQLExistsExpr; import com.alibaba.druid.sql.ast.expr.SQLFlashbackExpr; @@ -76,6 +80,7 @@ import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.ast.expr.SQLQueryExpr; import com.alibaba.druid.sql.ast.expr.SQLRealExpr; import com.alibaba.druid.sql.ast.expr.SQLSequenceExpr; +import com.alibaba.druid.sql.ast.expr.SQLSizeExpr; import com.alibaba.druid.sql.ast.expr.SQLSomeExpr; import com.alibaba.druid.sql.ast.expr.SQLTimestampExpr; import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr; @@ -912,4 +917,24 @@ public interface SQLASTVisitor { boolean visit(SQLDataTypeRefExpr x); void endVisit(SQLDataTypeRefExpr x); + boolean visit(SQLTableSampling x); + void endVisit(SQLTableSampling x); + + boolean visit(SQLSizeExpr x); + void endVisit(SQLSizeExpr x); + + boolean visit(SQLUnnestTableSource x); + void endVisit(SQLUnnestTableSource x); + + boolean visit(SQLAdhocTableSource x); + void endVisit(SQLAdhocTableSource x); + + boolean visit(SQLCurrentTimeExpr x); + void endVisit(SQLCurrentTimeExpr x); + + boolean visit(SQLDecimalExpr x); + void endVisit(SQLDecimalExpr x); + + boolean visit(SQLCurrentUserExpr x); + void endVisit(SQLCurrentUserExpr x); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java index 3e81ee864c..82465d25a5 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java @@ -15,9 +15,12 @@ */ package com.alibaba.druid.sql.visitor; +import com.alibaba.druid.sql.ast.SQLAdhocTableSource; import com.alibaba.druid.sql.ast.SQLArgument; import com.alibaba.druid.sql.ast.SQLArrayDataType; import com.alibaba.druid.sql.ast.SQLCommentHint; +import com.alibaba.druid.sql.ast.SQLCurrentTimeExpr; +import com.alibaba.druid.sql.ast.SQLCurrentUserExpr; import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLDataTypeRefExpr; import com.alibaba.druid.sql.ast.SQLDeclareItem; @@ -56,6 +59,7 @@ import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.expr.SQLContainsExpr; import com.alibaba.druid.sql.ast.expr.SQLCurrentOfCursorExpr; import com.alibaba.druid.sql.ast.expr.SQLDateExpr; +import com.alibaba.druid.sql.ast.expr.SQLDecimalExpr; import com.alibaba.druid.sql.ast.expr.SQLDefaultExpr; import com.alibaba.druid.sql.ast.expr.SQLExistsExpr; import com.alibaba.druid.sql.ast.expr.SQLFlashbackExpr; @@ -76,6 +80,7 @@ import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.ast.expr.SQLQueryExpr; import com.alibaba.druid.sql.ast.expr.SQLRealExpr; import com.alibaba.druid.sql.ast.expr.SQLSequenceExpr; +import com.alibaba.druid.sql.ast.expr.SQLSizeExpr; import com.alibaba.druid.sql.ast.expr.SQLSomeExpr; import com.alibaba.druid.sql.ast.expr.SQLTimestampExpr; import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr; @@ -2139,6 +2144,76 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor { } + @Override + public void endVisit(SQLTableSampling x) { + + } + + @Override + public boolean visit(SQLTableSampling x) { + return true; + } + + @Override + public void endVisit(SQLSizeExpr x) { + + } + + @Override + public boolean visit(SQLSizeExpr x) { + return true; + } + + @Override + public void endVisit(SQLUnnestTableSource x) { + + } + + @Override + public boolean visit(SQLUnnestTableSource x) { + return true; + } + + @Override + public void endVisit(SQLAdhocTableSource x) { + + } + + @Override + public boolean visit(SQLCurrentTimeExpr x) { + return true; + } + + @Override + public void endVisit(SQLCurrentTimeExpr x) { + + } + + @Override + public boolean visit(SQLAdhocTableSource x) { + return true; + } + + @Override + public void endVisit(SQLDecimalExpr x) { + + } + + @Override + public boolean visit(SQLDecimalExpr x) { + return true; + } + + @Override + public void endVisit(SQLCurrentUserExpr x) { + + } + + @Override + public boolean visit(SQLCurrentUserExpr x) { + return true; + } + @Override public boolean visit(SQLDataTypeRefExpr x) { return true; diff --git a/src/main/java/com/alibaba/druid/util/FnvHash.java b/src/main/java/com/alibaba/druid/util/FnvHash.java index 0106038932..dad727791b 100644 --- a/src/main/java/com/alibaba/druid/util/FnvHash.java +++ b/src/main/java/com/alibaba/druid/util/FnvHash.java @@ -675,5 +675,24 @@ public final class FnvHash { long BIT_COUNT = fnv1a_64_lower("BIT_COUNT"); long WEIGHT_STRING = fnv1a_64_lower("WEIGHT_STRING"); long REVERSE = fnv1a_64_lower("REVERSE"); + long TABLESAMPLE = fnv1a_64_lower("TABLESAMPLE"); + long BUCKET = fnv1a_64_lower("BUCKET"); + long UNNEST = fnv1a_64_lower("UNNEST"); + long FIELDS = fnv1a_64_lower("FIELDS"); + long ESCAPED = fnv1a_64_lower("ESCAPED"); + long YEAR_TO_MONTH = fnv1a_64_lower("YEAR_TO_MONTH"); + long COLPROPERTIES = fnv1a_64_lower("COLPROPERTIES"); + long MAPPED = fnv1a_64_lower("MAPPED"); + long LINES = fnv1a_64_lower("LINES"); + long COLLECTION = fnv1a_64_lower("COLLECTION"); + long SERDE = fnv1a_64_lower("SERDE"); + long OUTLINE = fnv1a_64_lower("OUTLINE"); + long BD = fnv1a_64_lower("BD"); + long CURRENT_DATE = fnv1a_64_lower("CURRENT_DATE"); + long PARTITION = fnv1a_64_lower("PARTITION"); + long MODEL = fnv1a_64_lower("MODEL"); + long DIMENSION = fnv1a_64_lower("DIMENSION"); + long KEEP = fnv1a_64_lower("KEEP"); + long PIVOT = fnv1a_64_lower("PIVOT"); } } diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 20a895093e..bc8b70666b 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -85,7 +85,12 @@ public final class JdbcUtils implements JdbcConstants { if (x == null) { return; } + try { + if (x.isClosed()) { + return; + } + x.close(); } catch (Exception e) { LOG.debug("close connection error", e); diff --git a/src/main/resources/support/http/resources/datasource.html b/src/main/resources/support/http/resources/datasource.html index 4794ac5631..f1d6922fb0 100644 --- a/src/main/resources/support/http/resources/datasource.html +++ b/src/main/resources/support/http/resources/datasource.html @@ -263,6 +263,11 @@ {{=datasourceNow.LogicConnectErrorCount}} Total connect error times + + DiscardCount + {{=datasourceNow.DiscardCount}} + Discard connection count with validate fail + RecycleErrorCount {{=datasourceNow.RecycleErrorCount}} @@ -407,7 +412,6 @@ init : function() { druid.common.buildHead(1); this.ajaxRequestForBasicInfo(); - druid.lang.init(); }, ajaxRequestForBasicInfo : function() { $.ajax({ diff --git a/src/main/resources/support/http/resources/js/lang.js b/src/main/resources/support/http/resources/js/lang.js index 378a536fdd..71c13dfbef 100644 --- a/src/main/resources/support/http/resources/js/lang.js +++ b/src/main/resources/support/http/resources/js/lang.js @@ -63,6 +63,7 @@ druid.lang = function() { 'PhysicalConnectCount' : ['PhysicalConnectCount', '物理连接打开次数'], 'PhysicalCloseCount' : ['PhysicalCloseCount', '物理关闭数量'], 'PhysicalConnectErrorCount' : ['PhysicalConnectErrorCount', '物理连接错误次数'], + 'DiscardCount' : ['DiscardCount', '校验失败废弃连接数'], 'ExecuteCount' : ['ExecuteCount (Total)', '执行数(总共)'], 'ErrorCount' : ['ErrorCount', '错误数'], 'CommitCount' : ['CommitCount', '提交数'], @@ -114,6 +115,7 @@ druid.lang = function() { 'RecycleErrorCount' : ['Logic Connection Recycle Count', '逻辑连接回收重用次数'], 'PhysicalConnectCountDesc' : ['Create physical connnection count', '产生的物理连接建立总数'], 'PhysicalCloseCountDesc' : ['Close physical connnection count', '产生的物理关闭总数'], + 'DiscardCountDesc' : ['Discard connection count with validate fail', '校验连接失败丢弃连接次数'], 'PhysicalConnectErrorCountDesc' : ['Total physical connect error times', '产生的物理连接失败总数'], 'ExecuteCountDesc' : ['', ''], 'ErrorCountDesc' : ['', ''], diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_13_cluster_by.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_13_cluster_by.java new file mode 100644 index 0000000000..1f906112dc --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_13_cluster_by.java @@ -0,0 +1,72 @@ +/* + * Copyright 1999-2017 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.hive; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; + +public class HiveSelectTest_13_cluster_by + extends TestCase { + + public void test_0() throws Exception + { + String sql = "select buyer_id,seller_id ,order_id,div_pay_amt,t1.dim_seller.member_id,t1.dim_buyer.member_id from LD_aly.fct_pay_ord_cn_di t1 cluster by buyer_id,seller_id \n"; + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); + + assertEquals("SELECT buyer_id, seller_id, order_id, div_pay_amt, t1.dim_seller.member_id\n" + + "\t, t1.dim_buyer.member_id\n" + + "FROM LD_aly.fct_pay_ord_cn_di t1\n" + + "CLUSTER BY buyer_id, seller_id", stmt.toString()); + + assertEquals("SELECT buyer_id, seller_id, order_id, div_pay_amt, t1.dim_seller.member_id\n" + + "\t, t1.dim_buyer.member_id\n" + + "FROM LD_aly.fct_pay_ord_cn_di t1\n" + + "CLUSTER BY buyer_id, seller_id", SQLUtils.toSQLString(stmt)); + + assertEquals(1, statementList.size()); + + for (SQLSelectOrderByItem item : stmt.getSelect().getQueryBlock().getClusterBy()) { + assertFalse(item.isSortBy()); + assertFalse(item.isDistributeBy()); + assertTrue(item.isClusterBy()); + } + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); + 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()); + System.out.println("groupBy : " + visitor.getGroupByColumns()); + + assertEquals(1, visitor.getTables().size()); + assertEquals(5, visitor.getColumns().size()); + assertEquals(0, visitor.getConditions().size()); + assertEquals(0, visitor.getGroupByColumns().size()); + + assertTrue(visitor.containsColumn("LD_aly.fct_pay_ord_cn_di", "buyer_id")); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_3_array.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_3_array.java new file mode 100644 index 0000000000..e499770ae3 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_3_array.java @@ -0,0 +1,44 @@ +package com.alibaba.druid.bvt.sql.hive; + +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 java.util.List; + +public class HiveSelectTest_3_array + extends TestCase { + public void test_select() throws Exception + { + String sql = "select languages[0] from json_nested_test;";// + assertEquals("SELECT languages[0]\n" + + "FROM json_nested_test;", SQLUtils.formatHive(sql)); + assertEquals("select languages[0]\n" + + "from json_nested_test;", SQLUtils.formatHive(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); + SQLStatement stmt = statementList.get(0); + + assertEquals(1, statementList.size()); + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); + 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()); + + assertEquals(1, visitor.getTables().size()); + assertEquals(1, visitor.getColumns().size()); + assertEquals(0, visitor.getConditions().size()); + + assertTrue(visitor.containsColumn("json_nested_test", "languages")); +// assertTrue(visitor.containsColumn("customers", "isxx")); +// assertTrue(visitor.containsColumn("customers", "*")); + + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_4_array.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_4_array.java new file mode 100644 index 0000000000..6745eec901 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_4_array.java @@ -0,0 +1,44 @@ +package com.alibaba.druid.bvt.sql.hive; + +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 java.util.List; + +public class HiveSelectTest_4_array + extends TestCase { + public void test_select() throws Exception + { + String sql = "select religions['catholic'][0] from json_nested_test;";// + assertEquals("SELECT religions['catholic'][0]\n" + + "FROM json_nested_test;", SQLUtils.formatHive(sql)); + assertEquals("select religions['catholic'][0]\n" + + "from json_nested_test;", SQLUtils.formatHive(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); + SQLStatement stmt = statementList.get(0); + + assertEquals(1, statementList.size()); + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); + 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()); + + assertEquals(1, visitor.getTables().size()); + assertEquals(1, visitor.getColumns().size()); + assertEquals(0, visitor.getConditions().size()); + + assertTrue(visitor.containsColumn("json_nested_test", "religions")); +// assertTrue(visitor.containsColumn("customers", "isxx")); +// assertTrue(visitor.containsColumn("customers", "*")); + + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_cluster_by.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_cluster_by.java new file mode 100644 index 0000000000..33baf3ff45 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_cluster_by.java @@ -0,0 +1,62 @@ +/* + * Copyright 1999-2017 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.hive; + +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 java.util.List; + +public class HiveSelectTest_cluster_by + extends TestCase { + + public void test_0() throws Exception + { + String sql = "SELECT a from x cluster by a;"; + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); + SQLStatement stmt = statementList.get(0); + + assertEquals("SELECT a\n" + + "FROM x\n" + + "CLUSTER BY a;", stmt.toString()); + + assertEquals("SELECT a\n" + + "FROM x\n" + + "CLUSTER BY a;", SQLUtils.toSQLString(stmt)); + + assertEquals(1, statementList.size()); + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); + 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()); + System.out.println("groupBy : " + visitor.getGroupByColumns()); + + assertEquals(1, visitor.getTables().size()); + assertEquals(1, visitor.getColumns().size()); + assertEquals(0, visitor.getConditions().size()); + assertEquals(0, visitor.getGroupByColumns().size()); + + assertTrue(visitor.containsColumn("x", "a")); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_distribute.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_distribute.java new file mode 100644 index 0000000000..67074f0bc9 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_distribute.java @@ -0,0 +1,66 @@ +/* + * Copyright 1999-2017 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.hive; + +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 java.util.List; + +public class HiveSelectTest_distribute + extends TestCase { + + public void test_0() throws Exception + { + String sql = "select * from LD_aly.fct_pay_ord_cn_di t1 distribute by buyer_id sort by seller_id"; + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); + SQLStatement stmt = statementList.get(0); + + assertEquals("SELECT *\n" + + "FROM LD_aly.fct_pay_ord_cn_di t1\n" + + "DISTRIBUTE BY buyer_id\n" + + "SORT BY seller_id", stmt.toString()); + + assertEquals("SELECT *\n" + + "FROM LD_aly.fct_pay_ord_cn_di t1\n" + + "DISTRIBUTE BY buyer_id\n" + + "SORT BY seller_id", SQLUtils.toSQLString(stmt)); + + assertEquals(1, statementList.size()); + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); + 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()); + System.out.println("groupBy : " + visitor.getGroupByColumns()); + + assertEquals(1, visitor.getTables().size()); + assertEquals(3, visitor.getColumns().size()); + assertEquals(0, visitor.getConditions().size()); + assertEquals(0, visitor.getGroupByColumns().size()); + + assertTrue(visitor.containsColumn("LD_aly.fct_pay_ord_cn_di", "*")); + assertTrue(visitor.containsColumn("LD_aly.fct_pay_ord_cn_di", "buyer_id")); + assertTrue(visitor.containsColumn("LD_aly.fct_pay_ord_cn_di", "seller_id")); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_with_20433301.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_with_20433301.java new file mode 100644 index 0000000000..16b226eb72 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_with_20433301.java @@ -0,0 +1,106 @@ +/* + * Copyright 1999-2017 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.mysql.select; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; + + +public class MySqlSelectTest_with_20433301 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "WITH total AS(\n" + + "SELECT cinema_id, count(1) as scheduleCnt, sum(hall_seat_cnt) as hall_seat_cnt, sum(sold_seat_cnt) as sold_seat_cnt, sum(avg_ticket_price*sold_seat_cnt) as box_office\n" + + "  FROM gw_ads_schedule_rt\n" + + " WHERE show_date= 20190513\n" + + "   and stat_month= 201905\n" + + "   and stat_date= 20190508\n" + + "   and scd_is_valid= 1\n" + + "   and scd_status= 4\n" + + " GROUP BY cinema_id),\n" + + "         detail AS(\n" + + "SELECT show_id, cinema_id, count(1) as scheduleCnt, sum(hall_seat_cnt) as hall_seat_cnt, sum(sold_seat_cnt) as sold_seat_cnt, sum(avg_ticket_price*sold_seat_cnt) as box_office\n" + + "  FROM gw_ads_schedule_rt\n" + + " WHERE show_date= 20190513\n" + + "   and stat_month= 201905\n" + + "   and stat_date= 20190508\n" + + "   and scd_is_valid= 1\n" + + "   and scd_status= 4\n" + + "   AND show_id IN(1229077)\n" + + " GROUP BY show_id, cinema_id)\n" + + "SELECT detail.cinema_id,\n" + + "       detail.show_id,\n" + + "       detail.scheduleCnt,\n" + + "       detail.hall_seat_cnt,\n" + + "       detail.sold_seat_cnt,\n" + + "       detail.box_office,\n" + + "       total.scheduleCnt as totalScheduleCnt,\n" + + "       total.hall_seat_cnt as totalHallSeatCnt,\n" + + "       total.sold_seat_cnt as totalSoldSeatCnt,\n" + + "       total.box_office as totalBoxOffice,\n" + + "       fcst.scd_cnt_fcst as predictScheduleCnt\n" + + "  FROM detail join total on detail.cinema_id= total.cinema_id left join gw_ads_cinema_schedule_fcst fcst on fcst.cinema_id= detail.cinema_id\n" + + " where fcst.week_day= 1\n" + + " order by detail.scheduleCnt desc"; + + + SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, JdbcConstants.MYSQL); + + assertEquals("WITH total AS (\n" + + "\t\tSELECT cinema_id, count(1) AS scheduleCnt, sum(hall_seat_cnt) AS hall_seat_cnt\n" + + "\t\t\t, sum(sold_seat_cnt) AS sold_seat_cnt\n" + + "\t\t\t, sum(avg_ticket_price * sold_seat_cnt) AS box_office\n" + + "\t\tFROM gw_ads_schedule_rt\n" + + "\t\tWHERE show_date = 20190513\n" + + "\t\t\tAND stat_month = 201905\n" + + "\t\t\tAND stat_date = 20190508\n" + + "\t\t\tAND scd_is_valid = 1\n" + + "\t\t\tAND scd_status = 4\n" + + "\t\tGROUP BY cinema_id\n" + + "\t), \n" + + "\tdetail AS (\n" + + "\t\tSELECT show_id, cinema_id, count(1) AS scheduleCnt\n" + + "\t\t\t, sum(hall_seat_cnt) AS hall_seat_cnt, sum(sold_seat_cnt) AS sold_seat_cnt\n" + + "\t\t\t, sum(avg_ticket_price * sold_seat_cnt) AS box_office\n" + + "\t\tFROM gw_ads_schedule_rt\n" + + "\t\tWHERE show_date = 20190513\n" + + "\t\t\tAND stat_month = 201905\n" + + "\t\t\tAND stat_date = 20190508\n" + + "\t\t\tAND scd_is_valid = 1\n" + + "\t\t\tAND scd_status = 4\n" + + "\t\t\tAND show_id IN (1229077)\n" + + "\t\tGROUP BY show_id, cinema_id\n" + + "\t)\n" + + "SELECT detail.cinema_id, detail.show_id, detail.scheduleCnt, detail.hall_seat_cnt, detail.sold_seat_cnt\n" + + "\t, detail.box_office, total.scheduleCnt AS totalScheduleCnt, total.hall_seat_cnt AS totalHallSeatCnt, total.sold_seat_cnt AS totalSoldSeatCnt, total.box_office AS totalBoxOffice\n" + + "\t, fcst.scd_cnt_fcst AS predictScheduleCnt\n" + + "FROM detail\n" + + "\tJOIN total ON detail.cinema_id = total.cinema_id\n" + + "\tLEFT JOIN gw_ads_cinema_schedule_fcst fcst ON fcst.cinema_id = detail.cinema_id\n" + + "WHERE fcst.week_day = 1\n" + + "ORDER BY detail.scheduleCnt DESC", stmt.toString()); + + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + } + + + +} \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGUnionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGUnionTest.java new file mode 100644 index 0000000000..ca4310375b --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGUnionTest.java @@ -0,0 +1,113 @@ +package com.alibaba.druid.bvt.sql.postgresql.select; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; +import junit.framework.TestCase; +import org.junit.Assert; + +public class PGUnionTest + extends TestCase { + + public void testUnion(){ + String sql = "(select id,name from t1) union (select id,name from t2)"; + String targetSql = "(SELECT id, name\n" + + "FROM t1)\n" + + "UNION\n" + + "(SELECT id, name\n" + + "FROM t2)"; + + PGSQLStatementParser pgparser=new PGSQLStatementParser(sql); + SQLStatement pgstatement = pgparser.parseStatement(); + Assert.assertEquals(targetSql, pgstatement.toString()); + System.out.println(pgstatement.toString()); + } +// +// public void testUnion1(){ +// String sql = "select * from test_a where id=(select id from test_b where id = 1) union all select * from test_c"; +// String targetSql = "SELECT *\n" + +// "FROM test_a\n" + +// "WHERE id = (\n" + +// "\tSELECT id\n" + +// "\tFROM test_b\n" + +// "\tWHERE id = 1\n" + +// ")\n" + +// "UNION ALL\n" + +// "SELECT *\n" + +// "FROM test_c"; +// +// PGSQLStatementParser pgparser=new PGSQLStatementParser(sql); +// SQLStatement pgstatement = pgparser.parseStatement(); +// Assert.assertEquals(targetSql, pgstatement.toString()); +// System.out.println(pgstatement.toString()); +// } + + public void testUnion2(){ + String sql = "select \n" + + "( \n" + + " ( \n" + + " select 'y' from dual \n" + + " where exists ( select 1 from dual where 1 = 0 ) \n" + + " ) \n" + + " union \n" + + " ( \n" + + " select 'n' from dual \n" + + " where not exists ( select 1 from dual where 1 = 0 ) \n" + + " ) \n" + + ") \n" + + "as yes_no \n" + + "from dual"; + String targetSql = "SELECT (\n" + + "\t\tSELECT 'y'\n" + + "\t\tFROM dual\n" + + "\t\tWHERE EXISTS (\n" + + "\t\t\tSELECT 1\n" + + "\t\t\tFROM dual\n" + + "\t\t\tWHERE 1 = 0\n" + + "\t\t)\n" + + "\t\tUNION\n" + + "\t\t(SELECT 'n'\n" + + "\t\tFROM dual\n" + + "\t\tWHERE NOT EXISTS (\n" + + "\t\t\tSELECT 1\n" + + "\t\t\tFROM dual\n" + + "\t\t\tWHERE 1 = 0\n" + + "\t\t))\n" + + "\t) AS yes_no\n" + + "FROM dual"; + + PGSQLStatementParser pgparser=new PGSQLStatementParser(sql); + SQLStatement pgstatement = pgparser.parseStatement(); + Assert.assertEquals(targetSql, pgstatement.toString()); + System.out.println(pgstatement.toString()); + } + + public void testUnion3(){ + String sql = "select * from v.e\n" + + "where\n" + + "\tcid <> rid\n" + + "\tand rid not in\n" + + "\t(\n" + + "\t\t(select distinct rid from v.s )\n" + + "\t\tunion\n" + + "\t\t(select distinct rid from v.p )\n" + + "\t)\n" + + "\tand \"timestamp\" <= 1298505600000"; + String targetSql = "SELECT *\n" + + "FROM v.e\n" + + "WHERE cid <> rid\n" + + "\tAND rid NOT IN (\n" + + "\t\tSELECT DISTINCT rid\n" + + "\t\tFROM v.s\n" + + "\t\tUNION\n" + + "\t\t(SELECT DISTINCT rid\n" + + "\t\tFROM v.p)\n" + + "\t)\n" + + "\tAND 'timestamp' <= 1298505600000"; + + SQLStatement pgstatement = SQLUtils.parseSingleMysqlStatement(sql); + Assert.assertEquals(targetSql, pgstatement.toString()); + System.out.println(pgstatement.toString()); + } + +} \ No newline at end of file