Merge remote-tracking branch 'upstream/master'

This commit is contained in:
DigitalSonic
2020-09-24 16:42:19 +08:00
55 changed files with 932 additions and 323 deletions
+1 -1
View File
@@ -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 = 21;
public final static int RevisionVersion = 24;
public static String getVersionNumber() {
return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion;
@@ -340,11 +340,11 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
}
public boolean isUseUnfairLock() {
return lock.isFair();
return !lock.isFair();
}
public void setUseUnfairLock(boolean useUnfairLock) {
if (lock.isFair() == !useUnfairLock) {
if (lock.isFair() == !useUnfairLock && this.useUnfairLock != null) {
return;
}
@@ -67,18 +67,7 @@ import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.filter.FilterChainImpl;
import com.alibaba.druid.mock.MockDriver;
import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey;
import com.alibaba.druid.pool.vendor.DB2ExceptionSorter;
import com.alibaba.druid.pool.vendor.InformixExceptionSorter;
import com.alibaba.druid.pool.vendor.MSSQLValidConnectionChecker;
import com.alibaba.druid.pool.vendor.MockExceptionSorter;
import com.alibaba.druid.pool.vendor.MySqlExceptionSorter;
import com.alibaba.druid.pool.vendor.MySqlValidConnectionChecker;
import com.alibaba.druid.pool.vendor.NullExceptionSorter;
import com.alibaba.druid.pool.vendor.OracleExceptionSorter;
import com.alibaba.druid.pool.vendor.OracleValidConnectionChecker;
import com.alibaba.druid.pool.vendor.PGExceptionSorter;
import com.alibaba.druid.pool.vendor.PGValidConnectionChecker;
import com.alibaba.druid.pool.vendor.SybaseExceptionSorter;
import com.alibaba.druid.pool.vendor.*;
import com.alibaba.druid.proxy.DruidDriver;
import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
import com.alibaba.druid.proxy.jdbc.TransactionInfo;
@@ -845,6 +834,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (JdbcConstants.MYSQL.equals(this.dbType)
|| JdbcConstants.MARIADB.equals(this.dbType)
|| JdbcConstants.OCEANBASE.equals(this.dbType)
|| JdbcConstants.ALIYUN_ADS.equals(this.dbType)) {
boolean cacheServerConfigurationSet = false;
if (this.connectProperties.containsKey("cacheServerConfiguration")) {
@@ -883,24 +873,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
initFromSPIServiceLoader();
if (this.driver == null) {
if (this.driverClass == null || this.driverClass.isEmpty()) {
this.driverClass = JdbcUtils.getDriverClassName(this.jdbcUrl);
}
if (MockDriver.class.getName().equals(driverClass)) {
driver = MockDriver.instance;
} else {
if (jdbcUrl == null && (driverClass == null || driverClass.length() == 0)) {
throw new SQLException("url not set");
}
driver = JdbcUtils.createDriver(driverClassLoader, driverClass);
}
} else {
if (this.driverClass == null) {
this.driverClass = driver.getClass().getName();
}
}
resolveDriver();
initCheck();
@@ -1213,6 +1186,27 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
LOG.error(errorMessage + "validationQuery not set");
}
protected void resolveDriver() throws SQLException {
if (this.driver == null) {
if (this.driverClass == null || this.driverClass.isEmpty()) {
this.driverClass = JdbcUtils.getDriverClassName(this.jdbcUrl);
}
if (MockDriver.class.getName().equals(driverClass)) {
driver = MockDriver.instance;
} else {
if (jdbcUrl == null && (driverClass == null || driverClass.length() == 0)) {
throw new SQLException("url not set");
}
driver = JdbcUtils.createDriver(driverClassLoader, driverClass);
}
} else {
if (this.driverClass == null) {
this.driverClass = driver.getClass().getName();
}
}
}
protected void initCheck() throws SQLException {
if (JdbcUtils.ORACLE.equals(this.dbType)) {
isOracle = true;
@@ -1316,7 +1310,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
this.validConnectionChecker = new MSSQLValidConnectionChecker();
} else if (realDriverClassName.equals(JdbcConstants.POSTGRESQL_DRIVER)
|| realDriverClassName.equals(JdbcConstants.ENTERPRISEDB_DRIVER)) {
|| realDriverClassName.equals(JdbcConstants.ENTERPRISEDB_DRIVER)
|| realDriverClassName.equals(JdbcConstants.POLARDB_DRIVER)) {
this.validConnectionChecker = new PGValidConnectionChecker();
}
}
@@ -1340,6 +1335,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
} else if (realDriverClassName.equals(JdbcConstants.ORACLE_DRIVER)
|| realDriverClassName.equals(JdbcConstants.ORACLE_DRIVER2)) {
this.exceptionSorter = new OracleExceptionSorter();
} else if (realDriverClassName.equals(JdbcConstants.OCEANBASE_DRIVER)) { // 写一个真实的 TestCase
if (JdbcUtils.OCEANBASE_ORACLE.equalsIgnoreCase(dbType)) {
this.exceptionSorter = new OceanBaseOracleExceptionSorter();
} else {
this.exceptionSorter = new MySqlExceptionSorter();
}
} else if (realDriverClassName.equals("com.informix.jdbc.IfxDriver")) {
this.exceptionSorter = new InformixExceptionSorter();
@@ -1347,7 +1348,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
this.exceptionSorter = new SybaseExceptionSorter();
} else if (realDriverClassName.equals(JdbcConstants.POSTGRESQL_DRIVER)
|| realDriverClassName.equals(JdbcConstants.ENTERPRISEDB_DRIVER)) {
|| realDriverClassName.equals(JdbcConstants.ENTERPRISEDB_DRIVER)
|| realDriverClassName.equals(JdbcConstants.POLARDB_DRIVER)) {
this.exceptionSorter = new PGExceptionSorter();
} else if (realDriverClassName.equals("com.alibaba.druid.mock.MockDriver")) {
@@ -2487,6 +2489,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
lock.lock();
try {
if (poolingCount >= maxActive) {
if (createScheduler != null) {
clearCreateTask(createTaskId);
}
return false;
}
connections[poolingCount] = holder;
@@ -0,0 +1,143 @@
package com.alibaba.druid.pool.vendor;
import java.io.Serializable;
import java.sql.SQLException;
import java.sql.SQLRecoverableException;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
import com.alibaba.druid.pool.ExceptionSorter;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
public class OceanBaseOracleExceptionSorter extends OracleExceptionSorter {
private final static Log LOG = LogFactory.getLog(OracleExceptionSorter.class);
private static final long serialVersionUID = -9146226891418913174L;
private Set<Integer> fatalErrorCodes = new HashSet<Integer>();
public OceanBaseOracleExceptionSorter() {
configFromProperties(System.getProperties());
}
public void configFromProperties(Properties properties) {
String property = properties.getProperty("druid.oracle.fatalErrorCodes");
if (property != null) {
String[] items = property.split("\\,");
for (String item : items) {
if (item != null && item.length() > 0) {
try {
int code = Integer.parseInt(item);
fatalErrorCodes.add(code);
} catch (NumberFormatException e) {
LOG.error("parse druid.oracle.fatalErrorCodes error", e);
}
}
}
}
}
public Set<Integer> getFatalErrorCodes() {
return fatalErrorCodes;
}
public void setFatalErrorCodes(Set<Integer> fatalErrorCodes) {
this.fatalErrorCodes = fatalErrorCodes;
}
@Override
public boolean isExceptionFatal(SQLException e) {
if (e instanceof SQLRecoverableException) {
return true;
}
final String sqlState = e.getSQLState();
final int error_code = Math.abs(e.getErrorCode()); // I can't remember if the errors are negative or positive.
if (sqlState != null && sqlState.startsWith("08")) {
return true;
}
switch (error_code) {
case 28: // your session has been killed
case 600: // Internal oracle error
case 1012: // not logged on
case 1014: // Oracle shutdown in progress
case 1033: // Oracle initialization or shutdown in progress
case 1034: // Oracle not available
case 1035: // ORACLE only available to users with RESTRICTED SESSION privilege
case 1089: // immediate shutdown in progress - no operations are permitted
case 1090: // shutdown in progress - connection is not permitted
case 1092: // ORACLE instance terminated. Disconnection forced
case 1094: // ALTER DATABASE CLOSE in progress. Connections not permitted
case 2396: // exceeded maximum idle time, please connect again
case 3106: // fatal two-task communication protocol error
case 3111: // break received on communication channel
case 3113: // end-of-file on communication channel
case 3114: // not connected to ORACLE
case 3134: // Connections to this server version are no longer supported.
case 3135: // connection lost contact
case 3136: // inbound connection timed out
case 3138: // Connection terminated due to security policy violation
case 3142: // Connection was lost for the specified session and serial number. This is either due to session
// being killed or network problems.
case 3143: // Connection was lost for the specified process ID and thread ID. This is either due to session
// being killed or network problems.
case 3144: // Connection was lost for the specified process ID. This is either due to session being killed
// or network problems.
case 3145: // I/O streaming direction error
case 3149: // Invalid Oracle error code, Cause: An invalid Oracle error code was received by the server.
case 6801: // TLI Driver: listen for SPX server reconnect failed
case 6802: // TLI Driver: could not open the /etc/netware/yellowpages file
case 6805: // TLI Driver: could not send datagram SAP packet for SPX
case 9918: // Unable to get user privileges from SQL*Net
case 9920: // Unable to get sensitivity label from connection
case 9921: // Unable to get information label from connection
// TTC(Two-Task Common) ERROR CODE
case 17001: // Internal Error
case 17002: // Io exception
case 17008: // Closed Connection
case 17009: // Closed Statement
case 17024: // No data read
case 17089: // internal error
case 17409: // invalid buffer length
case 17401: // Protocol violation
case 17410: // No more data to read from socket
case 17416: // FATAl
case 17438: // Internal - Unexpected value
case 17442: // Refcursor value is invalid
case 25407: // connection terminated
case 25408: // can not safely replay call
case 25409: // failover happened during the network operation,cannot continue
case 25425: // connection lost during rollback
case 29276: // transfer timeout
case 30676: // socket read or write failed
return true;
default:
if (error_code >= 12100 && error_code <= 12299) { // TNS issues
return true;
}
break;
}
final String error_text = (e.getMessage()).toUpperCase();
// Exclude oracle user defined error codes (20000 through 20999) from consideration when looking for
// certain strings.
if ((error_code < 20000 || error_code >= 21000)) {
if ((error_text.contains("SOCKET")) // for control socket error
|| (error_text.contains("套接字")) // for control socket error
|| (error_text.contains("CONNECTION HAS ALREADY BEEN CLOSED")) //
|| (error_text.contains("BROKEN PIPE")) //
|| (error_text.contains("管道已结束")) //
) {
return true;
}
}
if (error_text.indexOf("COMMUNICATIONS LINK FAILURE") > -1
|| error_text.indexOf("COULD NOT CREATE CONNECTION") > -1
|| error_text.indexOf("ACCESS DENIED FOR USER") > -1
|| error_text.indexOf("NO DATASOURCE") > -1
|| error_text.indexOf("NO ALIVE DATASOURCE") > -1) {// errorCode忽略并且异常信息为连接出错
return true;
}
return fatalErrorCodes.contains(error_code);
}
}
@@ -102,18 +102,18 @@ public class PagerUtils {
}
public static boolean limit(SQLSelect select, String dbType, int offset, int count, boolean check) {
if (JdbcConstants.ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return limitOracle(select, dbType, offset, count, check);
}
if (JdbcUtils.isSqlserverDbType(dbType)) {
return limitSQLServer(select, dbType, offset, count, check);
}
if (JdbcConstants.DB2.equals(dbType)) {
return limitDB2(select, dbType, offset, count, check);
}
if (JdbcConstants.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
return limitSQLServer(select, dbType, offset, count, check);
}
return limitQueryBlock(select, dbType, offset, count, check);
}
@@ -125,13 +125,11 @@ public class PagerUtils {
}
SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) query;
if (JdbcConstants.MYSQL.equals(dbType) || //
JdbcConstants.MARIADB.equals(dbType) || //
JdbcConstants.H2.equals(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType)) {
return limitMySqlQueryBlock(queryBlock, dbType, offset, count, check);
}
if (JdbcConstants.POSTGRESQL.equals(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)) {
return limitPostgreSQLQueryBlock((PGSelectQueryBlock) queryBlock, dbType, offset, count, check);
}
throw new UnsupportedOperationException();
@@ -521,29 +519,19 @@ public class PagerUtils {
}
private static SQLSelectQueryBlock createQueryBlock(String dbType) {
if (JdbcConstants.MYSQL.equals(dbType)
|| JdbcConstants.MARIADB.equals(dbType)
|| JdbcConstants.ALIYUN_ADS.equals(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new MySqlSelectQueryBlock();
}
if (JdbcConstants.MARIADB.equals(dbType)) {
return new MySqlSelectQueryBlock();
}
if (JdbcConstants.H2.equals(dbType)) {
return new MySqlSelectQueryBlock();
}
if (JdbcConstants.ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleSelectQueryBlock();
}
if (JdbcConstants.POSTGRESQL.equals(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGSelectQueryBlock();
}
if (JdbcConstants.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new SQLServerSelectQueryBlock();
}
@@ -640,7 +628,7 @@ public class PagerUtils {
public static boolean hasUnorderedLimit(String sql, String dbType) {
List<SQLStatement> stmtList = SQLUtils.parseStatements(sql, dbType);
if (JdbcConstants.MYSQL.equals(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType)) {
MySqlUnorderedLimitDetectVisitor visitor = new MySqlUnorderedLimitDetectVisitor();
@@ -651,7 +639,7 @@ public class PagerUtils {
return visitor.unorderedLimitCount > 0;
}
if (JdbcConstants.ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
OracleUnorderedLimitDetectVisitor visitor = new OracleUnorderedLimitDetectVisitor();
@@ -69,13 +69,7 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
import com.alibaba.druid.sql.visitor.VisitorFeature;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.FnvHash;
import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.MySqlUtils;
import com.alibaba.druid.util.OracleUtils;
import com.alibaba.druid.util.PGUtils;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.*;
public class SQLUtils {
private final static SQLParserFeature[] FORMAT_DEFAULT_FEATURES = {
@@ -400,7 +394,7 @@ public class SQLUtils {
public static SQLASTOutputVisitor createFormatOutputVisitor(Appendable out, //
List<SQLStatement> statementList, //
String dbType) {
if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.ALI_ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
if (statementList == null || statementList.size() == 1) {
return new OracleOutputVisitor(out, false);
} else {
@@ -408,16 +402,19 @@ public class SQLUtils {
}
}
if (JdbcConstants.MYSQL.equals(dbType) //
|| JdbcConstants.MARIADB.equals(dbType)) {
if (JdbcConstants.H2.equals(dbType)) {
return new H2OutputVisitor(out);
}
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlOutputVisitor(out);
}
if (JdbcConstants.POSTGRESQL.equals(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGOutputVisitor(out);
}
if (JdbcConstants.SQL_SERVER.equals(dbType) || JdbcConstants.JTDS.equals(dbType)) {
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new SQLServerOutputVisitor(out);
}
@@ -429,10 +426,6 @@ public class SQLUtils {
return new OdpsOutputVisitor(out);
}
if (JdbcConstants.H2.equals(dbType)) {
return new H2OutputVisitor(out);
}
if (JdbcConstants.HIVE.equals(dbType)) {
return new HiveOutputVisitor(out);
}
@@ -450,20 +443,23 @@ public class SQLUtils {
}
public static SchemaStatVisitor createSchemaStatVisitor(String dbType) {
if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.ALI_ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleSchemaStatVisitor();
}
if (JdbcConstants.MYSQL.equals(dbType) || //
JdbcConstants.MARIADB.equals(dbType)) {
if (JdbcConstants.H2.equals(dbType)) {
return new H2SchemaStatVisitor();
}
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlSchemaStatVisitor();
}
if (JdbcConstants.POSTGRESQL.equals(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGSchemaStatVisitor();
}
if (JdbcConstants.SQL_SERVER.equals(dbType) || JdbcConstants.JTDS.equals(dbType)) {
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new SQLServerSchemaStatVisitor();
}
@@ -475,9 +471,6 @@ public class SQLUtils {
return new OdpsSchemaStatVisitor();
}
if (JdbcConstants.H2.equals(dbType)) {
return new H2SchemaStatVisitor();
}
if (JdbcConstants.HIVE.equals(dbType)) {
return new HiveSchemaStatVisitor();
@@ -543,10 +536,10 @@ public class SQLUtils {
if (StringUtils.isEmpty(columnName)) return "";
if (StringUtils.isEmpty(dbType)) dbType = JdbcConstants.MYSQL;
String formatMethod = "";
if (JdbcConstants.MYSQL.equalsIgnoreCase(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType)) {
formatMethod = "STR_TO_DATE";
if (StringUtils.isEmpty(pattern)) pattern = "%Y-%m-%d %H:%i:%s";
} else if (JdbcConstants.ORACLE.equalsIgnoreCase(dbType)) {
} else if (JdbcUtils.isOracleDbType(dbType)) {
formatMethod = "TO_DATE";
if (StringUtils.isEmpty(pattern)) pattern = "yyyy-mm-dd hh24:mi:ss";
} else {
@@ -890,16 +883,15 @@ public class SQLUtils {
normalizeName = normalizeName.replaceAll("`\\.`", ".");
}
if (JdbcConstants.ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
if (OracleUtils.isKeyword(normalizeName)) {
return name;
}
} else if (JdbcConstants.MYSQL.equals(dbType)) {
} else if (JdbcUtils.isMysqlDbType(dbType)) {
if (MySqlUtils.isKeyword(normalizeName)) {
return name;
}
} else if (JdbcConstants.POSTGRESQL.equals(dbType)
|| JdbcConstants.ENTERPRISEDB.equals(dbType)) {
} else if (JdbcUtils.isPgsqlDbType(dbType)) {
if (PGUtils.isKeyword(normalizeName)) {
return name;
}
@@ -271,7 +271,7 @@ public class SQLJoinTableSource extends SQLTableSourceImpl implements SQLReplace
}
if(condition != null){
x.setCondition(condition);
x.setCondition(condition.clone());
}
for (SQLExpr item : using) {
@@ -247,9 +247,7 @@ public class SQLSelect extends SQLObjectImpl {
}
if (this.hints != null) {
for (SQLHint hint : this.hints) {
x.hints.add(hint);
}
x.hints.addAll(this.hints);
}
x.forBrowse = forBrowse;
@@ -166,9 +166,7 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery
SQLInListExpr inListItem = (SQLInListExpr) item;
if (inListExpr.getExpr().equals(inListItem.getExpr())) {
TreeSet<SQLExpr> set = new TreeSet<SQLExpr>();
for (SQLExpr itemItem : inListItem.getTargetList()) {
set.add(itemItem);
}
set.addAll(inListItem.getTargetList());
List<SQLExpr> andList = new ArrayList<SQLExpr>();
for (SQLExpr exprItem : inListExpr.getTargetList()) {
@@ -18,6 +18,7 @@ package com.alibaba.druid.sql.builder;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.JdbcUtils;
/**
* Created by wenshao on 09/07/2017.
@@ -65,7 +66,7 @@ public class FunctionBuilder {
return new SQLMethodInvokeExpr("coalesce", null, expr1, expr2);
}
if (JdbcConstants.ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new SQLMethodInvokeExpr("nvl", null, expr1, expr2);
}
@@ -47,5 +47,6 @@ public interface SQLSelectBuilder {
SQLSelectBuilder whereOr(String sql);
@Override
String toString();
}
@@ -29,6 +29,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlDeleteStatement;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleDeleteStatement;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGDeleteStatement;
import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.JdbcUtils;
public class SQLDeleteBuilderImpl implements SQLDeleteBuilder {
@@ -123,21 +124,22 @@ public class SQLDeleteBuilderImpl implements SQLDeleteBuilder {
}
public SQLDeleteStatement createSQLDeleteStatement() {
if (JdbcConstants.ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleDeleteStatement();
}
if (JdbcConstants.MYSQL.equals(dbType)) {
return new MySqlDeleteStatement();
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlDeleteStatement();
}
if (JdbcConstants.POSTGRESQL.equals(dbType)) {
return new PGDeleteStatement();
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGDeleteStatement();
}
return new SQLDeleteStatement();
}
@Override
public String toString() {
return SQLUtils.toSQLString(stmt, dbType);
}
@@ -37,6 +37,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock;
import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock;
import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.JdbcUtils;
public class SQLSelectBuilderImpl implements SQLSelectBuilder {
@@ -80,6 +81,7 @@ public class SQLSelectBuilderImpl implements SQLSelectBuilder {
return stmt;
}
@Override
public SQLSelectBuilderImpl select(String... columns) {
SQLSelectQueryBlock queryBlock = getQueryBlock();
@@ -239,19 +241,19 @@ public class SQLSelectBuilderImpl implements SQLSelectBuilder {
}
protected SQLSelectQuery createSelectQueryBlock() {
if (JdbcConstants.MYSQL.equals(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlSelectQueryBlock();
}
if (JdbcConstants.POSTGRESQL.equals(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGSelectQueryBlock();
}
if (JdbcConstants.SQL_SERVER.equals(dbType)) {
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new SQLServerSelectQueryBlock();
}
if (JdbcConstants.ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleSelectQueryBlock();
}
@@ -266,6 +268,7 @@ public class SQLSelectBuilderImpl implements SQLSelectBuilder {
return new SQLSelectGroupByClause();
}
@Override
public String toString() {
return SQLUtils.toSQLString(stmt, dbType);
}
@@ -32,6 +32,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleUpdateStatement;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGUpdateStatement;
import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerUpdateStatement;
import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.JdbcUtils;
public class SQLUpdateBuilderImpl extends SQLBuilderImpl implements SQLUpdateBuilder {
@@ -118,6 +119,7 @@ public class SQLUpdateBuilderImpl extends SQLBuilderImpl implements SQLUpdateBui
return this;
}
@Override
public SQLUpdateBuilderImpl set(String... items) {
SQLUpdateStatement update = getSQLUpdateStatement();
for (String item : items) {
@@ -158,25 +160,26 @@ public class SQLUpdateBuilderImpl extends SQLBuilderImpl implements SQLUpdateBui
}
public SQLUpdateStatement createSQLUpdateStatement() {
if (JdbcConstants.MYSQL.equals(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlUpdateStatement();
}
if (JdbcConstants.ORACLE.equals(dbType)) {
return new OracleUpdateStatement();
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleUpdateStatement();
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGUpdateStatement();
}
if (JdbcConstants.POSTGRESQL.equals(dbType)) {
return new PGUpdateStatement();
}
if (JdbcConstants.SQL_SERVER.equals(dbType)) {
return new SQLServerUpdateStatement();
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new SQLServerUpdateStatement();
}
return new SQLUpdateStatement();
}
@Override
public String toString() {
return SQLUtils.toSQLString(stmt, dbType);
}
@@ -191,6 +191,7 @@ import com.alibaba.druid.sql.visitor.ExportParameterVisitorUtils;
import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
import com.alibaba.druid.sql.visitor.VisitorFeature;
import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.JdbcUtils;
public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTVisitor {
@@ -3143,7 +3144,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
@Override
public boolean visit(SQLSetStatement x) {
boolean printSet = x.getAttribute("parser.set") == Boolean.TRUE || !JdbcConstants.ORACLE.equals(dbType);
boolean printSet = x.getAttribute("parser.set") == Boolean.TRUE || !JdbcUtils.isOracleDbType(dbType);
if (printSet) {
print0(ucase ? "SET " : "set ");
}
@@ -73,6 +73,9 @@ public class PGLexer extends Lexer {
map.put("TYPE", Token.TYPE);
map.put("ILIKE", Token.ILIKE);
map.put("MERGE", Token.MERGE);
map.put("MATCHED", Token.MATCHED);
DEFAULT_PG_KEYWORDS = new Keywords(map);
}
@@ -52,6 +52,7 @@ public class Keywords {
map.put("BY", Token.BY);
map.put("CASE", Token.CASE);
map.put("CAST", Token.CAST);
map.put("TRY_CAST", Token.TRY_CAST);
map.put("CHECK", Token.CHECK);
map.put("CONSTRAINT", Token.CONSTRAINT);
@@ -672,6 +672,7 @@ public class SQLExprParser extends SQLParser {
sqlExpr = queryExpr;
break;
case CAST:
case TRY_CAST:
lexer.nextToken();
accept(Token.LPAREN);
SQLCastExpr cast = new SQLCastExpr();
@@ -1585,11 +1586,7 @@ public class SQLExprParser extends SQLParser {
throw new ParserException("error, " + lexer.info());
}
if (lexer.token == Token.LITERAL_ALIAS) {
name = new SQLPropertyExpr(name, lexer.stringVal());
} else {
name = new SQLPropertyExpr(name, lexer.stringVal());
}
name = new SQLPropertyExpr(name, lexer.stringVal());
lexer.nextToken();
name = nameRest(name);
}
@@ -2741,6 +2738,32 @@ public class SQLExprParser extends SQLParser {
return charType;
}
if ("national".equalsIgnoreCase(typeName) &&
(lexer.identifierEquals(FnvHash.Constants.CHAR)
|| lexer.identifierEquals(FnvHash.Constants.VARCHAR))) {
typeName += ' ' + lexer.stringVal();
lexer.nextToken();
SQLCharacterDataType charType = new SQLCharacterDataType(typeName);
if (lexer.token == Token.LPAREN) {
lexer.nextToken();
SQLExpr arg = this.expr();
arg.setParent(charType);
charType.addArgument(arg);
accept(Token.RPAREN);
}
charType = (SQLCharacterDataType) parseCharTypeRest(charType);
if (lexer.token == Token.HINT) {
List<SQLCommentHint> hints = this.parseHints();
charType.setHints(hints);
}
return charType;
}
if ("character".equalsIgnoreCase(typeName) && "varying".equalsIgnoreCase(lexer.stringVal())) {
typeName += ' ' + lexer.stringVal();
lexer.nextToken();
@@ -26,6 +26,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlLexer;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock;
import com.alibaba.druid.sql.dialect.odps.parser.OdpsExprParser;
import com.alibaba.druid.sql.dialect.odps.parser.OdpsLexer;
import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser;
@@ -36,9 +37,11 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
import com.alibaba.druid.sql.dialect.phoenix.parser.PhoenixExprParser;
import com.alibaba.druid.sql.dialect.phoenix.parser.PhoenixLexer;
import com.alibaba.druid.sql.dialect.phoenix.parser.PhoenixStatementParser;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock;
import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser;
import com.alibaba.druid.sql.dialect.postgresql.parser.PGLexer;
import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser;
import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock;
import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerExprParser;
import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerLexer;
import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser;
@@ -69,31 +72,26 @@ public class SQLParserUtils {
}
public static SQLStatementParser createSQLStatementParser(String sql, String dbType, SQLParserFeature... features) {
if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleStatementParser(sql);
}
if (JdbcUtils.MYSQL.equals(dbType) || JdbcUtils.ALIYUN_DRDS.equals(dbType)) {
return new MySqlStatementParser(sql, features);
}
if (JdbcUtils.MARIADB.equals(dbType)) {
return new MySqlStatementParser(sql, features);
}
if (JdbcUtils.POSTGRESQL.equals(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)) {
return new PGSQLStatementParser(sql);
}
if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
return new SQLServerStatementParser(sql);
}
if (JdbcUtils.H2.equals(dbType)) {
return new H2StatementParser(sql);
}
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlStatementParser(sql, features);
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGSQLStatementParser(sql);
}
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new SQLServerStatementParser(sql);
}
if (JdbcUtils.DB2.equals(dbType)) {
return new DB2StatementParser(sql);
}
@@ -118,22 +116,19 @@ public class SQLParserUtils {
}
public static SQLExprParser createExprParser(String sql, String dbType) {
if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleExprParser(sql);
}
if (JdbcUtils.MYSQL.equals(dbType) || //
JdbcUtils.MARIADB.equals(dbType) || //
JdbcUtils.H2.equals(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlExprParser(sql);
}
if (JdbcUtils.POSTGRESQL.equals(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGExprParser(sql);
}
if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new SQLServerExprParser(sql);
}
@@ -153,22 +148,19 @@ public class SQLParserUtils {
}
public static Lexer createLexer(String sql, String dbType) {
if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleLexer(sql);
}
if (JdbcUtils.MYSQL.equals(dbType) || //
JdbcUtils.MARIADB.equals(dbType) || //
JdbcUtils.H2.equals(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlLexer(sql);
}
if (JdbcUtils.POSTGRESQL.equals(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGLexer(sql);
}
if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new SQLServerLexer(sql);
}
@@ -188,28 +180,28 @@ public class SQLParserUtils {
}
public static SQLSelectQueryBlock createSelectQueryBlock(String dbType) {
if (JdbcConstants.MYSQL.equals(dbType)) {
return new MySqlSelectQueryBlock();
}
if (JdbcConstants.ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleSelectQueryBlock();
}
if (JdbcConstants.DB2.equals(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlSelectQueryBlock();
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGSelectQueryBlock();
}
if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
return new SQLServerSelectQueryBlock();
}
if (JdbcUtils.DB2.equals(dbType)) {
return new DB2SelectQueryBlock();
}
if (JdbcConstants.POSTGRESQL.equals(dbType)) {
return new DB2SelectQueryBlock();
}
if (JdbcConstants.ODPS.equals(dbType)) {
return new DB2SelectQueryBlock();
}
if (JdbcConstants.SQL_SERVER.equals(dbType)) {
return new DB2SelectQueryBlock();
if (JdbcUtils.ODPS.equals(dbType)) {
return new OdpsSelectQueryBlock();
}
return new SQLSelectQueryBlock();
@@ -84,6 +84,7 @@ public enum Token {
ON("ON"),
SCHEMA("SCHEMA"),
CAST("CAST"),
TRY_CAST("TRY_CAST"),
COLUMN("COLUMN"),
USE("USE"),
DATABASE("DATABASE"),
@@ -61,6 +61,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.JdbcUtils;
/**
* Created by wenshao on 03/06/2017.
@@ -78,9 +79,9 @@ public class SchemaRepository {
public SchemaRepository(String dbType) {
this.dbType = dbType;
if (JdbcConstants.MYSQL.equals(dbType)) {
if (JdbcConstants.MYSQL.equals(dbType) || JdbcConstants.OCEANBASE.equals(dbType)) {
consoleVisitor = new MySqlConsoleSchemaVisitor();
} else if (JdbcConstants.ORACLE.equals(dbType)) {
} else if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.OCEANBASE_ORACLE.equals(dbType)) {
consoleVisitor = new OracleConsoleSchemaVisitor();
} else {
consoleVisitor = new DefaultConsoleSchemaVisitor();
@@ -281,21 +282,20 @@ public class SchemaRepository {
int optionsValue = SchemaResolveVisitor.Option.of(options);
SchemaResolveVisitor resolveVisitor;
if (JdbcConstants.MYSQL.equals(dbType)
|| JdbcConstants.SQLITE.equals(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType) || JdbcConstants.SQLITE.equals(dbType)) {
resolveVisitor = new SchemaResolveVisitorFactory.MySqlResolveVisitor(this, optionsValue);
} else if (JdbcConstants.ORACLE.equals(dbType)) {
} else if (JdbcUtils.isOracleDbType(dbType)) {
resolveVisitor = new SchemaResolveVisitorFactory.OracleResolveVisitor(this, optionsValue);
} else if (JdbcUtils.isPgsqlDbType(dbType)) {
resolveVisitor = new SchemaResolveVisitorFactory.PGResolveVisitor(this, optionsValue);
} else if (JdbcUtils.isSqlserverDbType(dbType)) {
resolveVisitor = new SchemaResolveVisitorFactory.SQLServerResolveVisitor(this, optionsValue);
} else if (JdbcConstants.DB2.equals(dbType)) {
resolveVisitor = new SchemaResolveVisitorFactory.DB2ResolveVisitor(this, optionsValue);
} else if (JdbcConstants.ODPS.equals(dbType)) {
resolveVisitor = new SchemaResolveVisitorFactory.OdpsResolveVisitor(this, optionsValue);
} else if (JdbcConstants.HIVE.equals(dbType)) {
resolveVisitor = new SchemaResolveVisitorFactory.HiveResolveVisitor(this, optionsValue);
} else if (JdbcConstants.POSTGRESQL.equals(dbType)) {
resolveVisitor = new SchemaResolveVisitorFactory.PGResolveVisitor(this, optionsValue);
} else if (JdbcConstants.SQL_SERVER.equals(dbType)) {
resolveVisitor = new SchemaResolveVisitorFactory.SQLServerResolveVisitor(this, optionsValue);
} else {
resolveVisitor = new SchemaResolveVisitorFactory.SQLResolveVisitor(this, optionsValue);
}
@@ -47,12 +47,22 @@ public final class ExportParameterVisitorUtils {
public static ExportParameterVisitor createExportParameterVisitor(final Appendable out ,final String dbType) {
if (JdbcUtils.MYSQL.equals(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlExportParameterVisitor(out);
}
if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleExportParameterVisitor(out);
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGExportParameterVisitor(out);
}
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new MSSQLServerExportParameterVisitor(out);
}
if (JdbcUtils.DB2.equals(dbType)) {
return new DB2ExportParameterVisitor(out);
}
@@ -65,8 +75,7 @@ public final class ExportParameterVisitorUtils {
return new MySqlExportParameterVisitor(out);
}
if (JdbcUtils.POSTGRESQL.equals(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)) {
if (JdbcUtils.POSTGRESQL.equals(dbType)) {
return new PGExportParameterVisitor(out);
}
@@ -265,22 +265,20 @@ public class ParameterizedOutputVisitorUtils {
}
public static ParameterizedVisitor createParameterizedOutputVisitor(Appendable out, String dbType) {
if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleParameterizedOutputVisitor(out);
}
if (JdbcUtils.MYSQL.equals(dbType)
|| JdbcUtils.MARIADB.equals(dbType)
|| JdbcUtils.H2.equals(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlOutputVisitor(out, true);
}
if (JdbcUtils.POSTGRESQL.equals(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGOutputVisitor(out, true);
}
if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new SQLServerOutputVisitor(out, true);
}
@@ -2552,7 +2552,6 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
boolean newLine = item instanceof SQLForeignKeyConstraint //
|| item instanceof SQLPrimaryKey //
|| item instanceof SQLColumnCheck //
|| item instanceof SQLColumnCheck //
|| item.getName() != null;
if (newLine) {
this.indentCount++;
@@ -160,28 +160,19 @@ public class SQLEvalVisitorUtils {
}
public static SQLEvalVisitor createEvalVisitor(String dbType) {
if (JdbcUtils.MYSQL.equals(dbType)) {
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlEvalVisitorImpl();
}
if (JdbcUtils.MARIADB.equals(dbType)) {
return new MySqlEvalVisitorImpl();
}
if (JdbcUtils.H2.equals(dbType)) {
return new MySqlEvalVisitorImpl();
}
if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) {
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleEvalVisitor();
}
if (JdbcConstants.POSTGRESQL.equals(dbType)
|| JdbcConstants.ENTERPRISEDB.equals(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGEvalVisitor();
}
if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new SQLServerEvalVisitor();
}
@@ -539,11 +539,11 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
protected SQLASTVisitor createOrderByVisitor(SQLOrderBy x) {
final SQLASTVisitor orderByVisitor;
if (JdbcConstants.MYSQL.equals(dbType)) {
if (JdbcConstants.MYSQL.equals(dbType) || JdbcConstants.OCEANBASE.equals(dbType)) {
orderByVisitor = new MySqlOrderByStatVisitor(x);
} else if (JdbcConstants.POSTGRESQL.equals(dbType)) {
orderByVisitor = new PGOrderByStatVisitor(x);
} else if (JdbcConstants.ORACLE.equals(dbType)) {
} else if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.OCEANBASE_ORACLE.equals(dbType)) {
orderByVisitor = new OracleOrderByStatVisitor(x);
} else {
orderByVisitor = new OrderByStatVisitor(x);
@@ -186,7 +186,7 @@ public final class DruidStatManagerFacade {
for (Object datasource : dataSources) {
Map<String, Object> wallStat = DruidDataSourceUtils.getWallStatMap(datasource);
map = mergWallStat(map, wallStat);
map = mergeWallStat(map, wallStat);
}
return map;
@@ -204,8 +204,16 @@ public final class DruidStatManagerFacade {
//
}
@SuppressWarnings({ "rawtypes", "unchecked" })
/**
* @deprecated
* @return
*/
public static Map mergWallStat(Map mapA, Map mapB) {
return mergeWallStat(mapA, mapB);
}
@SuppressWarnings({ "rawtypes", "unchecked" })
public static Map mergeWallStat(Map mapA, Map mapB) {
if (mapA == null || mapA.size() == 0) {
return mapB;
}
@@ -236,7 +244,7 @@ public final class DruidStatManagerFacade {
String sql = (String) blackItem.get("sql");
Map<String, Object> oldItem = newSet.get(sql);
newSet.put(sql, mergWallStat(oldItem, blackItem));
newSet.put(sql, mergeWallStat(oldItem, blackItem));
}
Collection<Map<String, Object>> collectionB = (Collection<Map<String, Object>>) valueB;
@@ -247,12 +255,12 @@ public final class DruidStatManagerFacade {
String sql = (String) blackItem.get("sql");
Map<String, Object> oldItem = newSet.get(sql);
newSet.put(sql, mergWallStat(oldItem, blackItem));
newSet.put(sql, mergeWallStat(oldItem, blackItem));
}
newMap.put(key, newSet.values());
} else {
if (valueA instanceof Map && valueB instanceof Map) {
Object newValue = mergWallStat((Map) valueA, (Map) valueB);
Object newValue = mergeWallStat((Map) valueA, (Map) valueB);
newMap.put(key, newValue);
} else if (valueA instanceof Set && valueB instanceof Set) {
Set<Object> set = new HashSet<Object>();
@@ -305,7 +313,7 @@ public final class DruidStatManagerFacade {
String name = (String) mapB.get("name");
Map<String, Object> mapA = mapped.get(name);
Map<String, Object> mergedMap = mergWallStat(mapA, mapB);
Map<String, Object> mergedMap = mergeWallStat(mapA, mapB);
mergedList.add(mergedMap);
}
@@ -20,20 +20,34 @@ import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
public class StatViewFilter implements Filter {
@Override
public void init(FilterConfig filterConfig) throws ServletException {
public final static String PARAM_NAME_PATH = "path";
private String path = "/druid";
@Override
public void init(FilterConfig config) throws ServletException {
String path = config.getInitParameter(PARAM_NAME_PATH);
if (path != null && !path.isEmpty()) {
this.path = path;
}
}
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
request.getRequestDispatcher(((HttpServletRequest) request).getServletPath()).forward(request, response);
HttpServletRequest httpReq = (HttpServletRequest) request;
String uri = httpReq.getRequestURI();
if (uri.startsWith(path)) {
RequestDispatcher dispatcher = request.getRequestDispatcher(httpReq.getServletPath());
dispatcher.forward(request, response);
} else {
chain.doFilter(request, response);
}
}
@Override
@@ -335,7 +335,7 @@ public class WebAppStat {
long fullCount = uriSessionMapFullCount.getAndIncrement();
if (fullCount == 0) {
LOG.error("sessionStatMap is full");
LOG.warn("sessionStatMap is full");
}
}
@@ -415,6 +415,7 @@ public final class FnvHash {
long GROUP_CONCAT = fnv1a_64_lower("GROUP_CONCAT");
long DEDUPLICATION = fnv1a_64_lower("DEDUPLICATION");
long CONVERT = fnv1a_64_lower("CONVERT");
long NATIONAL = fnv1a_64_lower("NATIONAL");
long CHAR = fnv1a_64_lower("CHAR");
long VARCHAR = fnv1a_64_lower("VARCHAR");
long VARCHAR2 = fnv1a_64_lower("VARCHAR2");
@@ -25,7 +25,9 @@ public interface JdbcConstants {
String DB2 = "db2";
String DB2_DRIVER = "com.ibm.db2.jcc.DB2Driver";
String DB2_DRIVER = "com.ibm.db2.jcc.DB2Driver"; // Type4
String DB2_DRIVER2 = "COM.ibm.db2.jdbc.app.DB2Driver"; // Type2
String DB2_DRIVER3 = "COM.ibm.db2.jdbc.net.DB2Driver"; // Type3
String POSTGRESQL = "postgresql";
String POSTGRESQL_DRIVER = "org.postgresql.Driver";
@@ -75,7 +77,9 @@ public interface JdbcConstants {
String XUGU_DRIVER = "com.xugu.cloudjdbc.Driver";
String OCEANBASE = "oceanbase";
String OCEANBASE_DRIVER = "com.mysql.jdbc.Driver";
String OCEANBASE_ORACLE = "oceanbase_oracle";
String OCEANBASE_DRIVER = "com.alipay.oceanbase.jdbc.Driver";
String INFORMIX = "informix";
/**
@@ -117,4 +121,13 @@ public interface JdbcConstants {
String CLICKHOUSE = "clickhouse";
String CLICKHOUSE_DRIVER = "ru.yandex.clickhouse.ClickHouseDriver";
String KDB = "kdb";
String KDB_DRIVER = "com.inspur.jdbc.KdDriver";
/**
* Aliyun PolarDB
*/
String POLARDB = "polardb";
String POLARDB_DRIVER = "com.aliyun.polardb.Driver";
}
@@ -417,6 +417,8 @@ public final class JdbcUtils implements JdbcConstants {
return ORACLE_DRIVER;
} else if (rawUrl.startsWith("jdbc:alibaba:oracle:")) {
return ALI_ORACLE_DRIVER;
} else if (rawUrl.startsWith("jdbc:oceanbase:")) {
return OCEANBASE_DRIVER;
} else if (rawUrl.startsWith("jdbc:microsoft:")) {
return "com.microsoft.jdbc.sqlserver.SQLServerDriver";
} else if (rawUrl.startsWith("jdbc:sqlserver:")) {
@@ -436,7 +438,21 @@ public final class JdbcUtils implements JdbcConstants {
} else if (rawUrl.startsWith("jdbc:hsqldb:")) {
return "org.hsqldb.jdbcDriver";
} else if (rawUrl.startsWith("jdbc:db2:")) {
return DB2_DRIVER;
// Resolve the DB2 driver from JDBC URL
// Type2 COM.ibm.db2.jdbc.app.DB2Driver, url = jdbc:db2:databasename
// Type3 COM.ibm.db2.jdbc.net.DB2Driver, url = jdbc:db2:ServerIP:6789:databasename
// Type4 8.1+ com.ibm.db2.jcc.DB2Driver, url = jdbc:db2://ServerIP:50000/databasename
String prefix = "jdbc:db2:";
if (rawUrl.startsWith(prefix + "//")) { // Type4
return DB2_DRIVER; // "com.ibm.db2.jcc.DB2Driver";
} else {
String suffix = rawUrl.substring(prefix.length());
if (suffix.indexOf(':') > 0) { // Type3
return DB2_DRIVER3; // COM.ibm.db2.jdbc.net.DB2Driver
} else { // Type2
return DB2_DRIVER2; // COM.ibm.db2.jdbc.app.DB2Driver
}
}
} else if (rawUrl.startsWith("jdbc:sqlite:")) {
return SQLITE_DRIVER;
} else if (rawUrl.startsWith("jdbc:ingres:")) {
@@ -493,7 +509,11 @@ public final class JdbcUtils implements JdbcConstants {
return JdbcConstants.CLICKHOUSE_DRIVER;
} else if(rawUrl.startsWith("jdbc:presto:")) {
return JdbcConstants.PRESTO_DRIVER;
}else {
} else if (rawUrl.startsWith("jdbc:inspur:")) {
return JdbcConstants.KDB_DRIVER;
} else if (rawUrl.startsWith("jdbc:polardb")) {
return JdbcConstants.POLARDB_DRIVER;
} else {
throw new SQLException("unknown jdbc driver : " + rawUrl);
}
}
@@ -514,6 +534,10 @@ public final class JdbcUtils implements JdbcConstants {
return ORACLE;
} else if (rawUrl.startsWith("jdbc:alibaba:oracle:")) {
return ALI_ORACLE;
} else if (rawUrl.startsWith("jdbc:oceanbase:")) {
return OCEANBASE;
} else if (rawUrl.startsWith("jdbc:oceanbase:oracle:")) {
return OCEANBASE_ORACLE;
} else if (rawUrl.startsWith("jdbc:microsoft:") || rawUrl.startsWith("jdbc:log4jdbc:microsoft:")) {
return SQL_SERVER;
} else if (rawUrl.startsWith("jdbc:sqlserver:") || rawUrl.startsWith("jdbc:log4jdbc:sqlserver:")) {
@@ -586,8 +610,12 @@ public final class JdbcUtils implements JdbcConstants {
return ELASTIC_SEARCH;
} else if (rawUrl.startsWith("jdbc:clickhouse:")) {
return CLICKHOUSE;
}else if (rawUrl.startsWith("jdbc:presto:")) {
} else if (rawUrl.startsWith("jdbc:presto:")) {
return PRESTO;
} else if (rawUrl.startsWith("jdbc:inspur:")) {
return JdbcConstants.KDB;
} else if (rawUrl.startsWith("jdbc:polardb")) {
return POLARDB;
} else {
return null;
}
@@ -826,11 +854,11 @@ public final class JdbcUtils implements JdbcConstants {
}
public static List<String> showTables(Connection conn, String dbType) throws SQLException {
if (JdbcConstants.MYSQL.equals(dbType)) {
if (JdbcConstants.MYSQL.equals(dbType) || JdbcConstants.OCEANBASE.equals(dbType)) {
return MySqlUtils.showTables(conn);
}
if (JdbcConstants.ORACLE.equals(dbType)) {
if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.OCEANBASE_ORACLE.equals(dbType)) {
return OracleUtils.showTables(conn);
}
@@ -845,11 +873,11 @@ public final class JdbcUtils implements JdbcConstants {
}
public static String getCreateTableScript(Connection conn, String dbType, boolean sorted, boolean simplify) throws SQLException {
if (JdbcConstants.MYSQL.equals(dbType)) {
if (JdbcConstants.MYSQL.equals(dbType) || JdbcConstants.OCEANBASE.equals(dbType)) {
return MySqlUtils.getCreateTableScript(conn, sorted, simplify);
}
if (JdbcConstants.ORACLE.equals(dbType)) {
if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.OCEANBASE_ORACLE.equals(dbType)) {
return OracleUtils.getCreateTableScript(conn, sorted, simplify);
}
@@ -861,4 +889,30 @@ public final class JdbcUtils implements JdbcConstants {
|| driverClassName.equals(JdbcConstants.MYSQL_DRIVER_6)
|| driverClassName.equals(JdbcConstants.MYSQL_DRIVER_REPLICATE);
}
public static boolean isOracleDbType(String dbType) {
return JdbcUtils.ORACLE.equals(dbType) || //
JdbcUtils.OCEANBASE_ORACLE.equals(dbType) || //
JdbcUtils.ALI_ORACLE.equals(dbType);
}
public static boolean isMysqlDbType(String dbType) {
return JdbcUtils.MYSQL.equals(dbType) || //
JdbcUtils.OCEANBASE.equals(dbType) || //
JdbcUtils.ALIYUN_DRDS.equals(dbType) || //
JdbcUtils.MARIADB.equals(dbType) ||
JdbcUtils.H2.equals(dbType); // H2 SchemaStatVisitor & SQLASTOutputVisitor should specify
}
public static boolean isPgsqlDbType(String dbType) {
return JdbcUtils.POSTGRESQL.equals(dbType) || //
JdbcUtils.ENTERPRISEDB.equals(dbType) || //
JdbcUtils.POLARDB.equals(dbType);
}
public static boolean isSqlserverDbType(String dbType) {
return JdbcUtils.SQL_SERVER.equals(dbType) || //
JdbcUtils.JTDS.equals(dbType);
}
}
@@ -15,25 +15,19 @@
*/
package com.alibaba.druid.util;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
import javax.sql.XAConnection;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.sql.Statement;
import java.sql.*;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.sql.XAConnection;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
public class MySqlUtils {
static Class<?> utilClass;
static boolean utilClassError = false;
@@ -331,6 +325,11 @@ public class MySqlUtils {
private static transient Method method_getLastPacketReceivedTimeMs = null;
private static transient boolean method_getLastPacketReceivedTimeMs_error = false;
private volatile static boolean mysqlJdbcVersion6 = false;
private static transient Class classJdbc = null;
private static transient Method getIdleFor = null;
private static transient boolean getIdleForError = false;
public static Long getId(Object conn) {
if (conn == null) {
return null;
@@ -370,7 +369,13 @@ public class MySqlUtils {
if (class_connectionImpl == null && !class_connectionImpl_Error) {
try {
class_connectionImpl = Utils.loadClass("com.mysql.jdbc.MySQLConnection");
} catch (Throwable error){
if (class_connectionImpl == null) {
class_connectionImpl = Utils.loadClass("com.mysql.cj.MysqlConnection");
if (class_connectionImpl != null) {
mysqlJdbcVersion6 = true;
}
}
} catch (Throwable error) {
class_connectionImpl_Error = true;
}
}
@@ -379,59 +384,91 @@ public class MySqlUtils {
return -1;
}
if (method_getIO == null && !method_getIO_error) {
try {
method_getIO = class_connectionImpl.getMethod("getIO");
} catch (Throwable error){
method_getIO_error = true;
if(mysqlJdbcVersion6){
if (classJdbc == null) {
classJdbc = Utils.loadClass("com.mysql.cj.jdbc.JdbcConnection");
}
}
if (method_getIO == null) {
return -1;
}
if (class_MysqlIO == null && !class_MysqlIO_Error) {
try {
class_MysqlIO = Utils.loadClass("com.mysql.jdbc.MysqlIO");
} catch (Throwable error){
class_MysqlIO_Error = true;
}
}
if (class_MysqlIO == null) {
return -1;
}
if (method_getLastPacketReceivedTimeMs == null && !method_getLastPacketReceivedTimeMs_error) {
try {
Method method = class_MysqlIO.getDeclaredMethod("getLastPacketReceivedTimeMs");
method.setAccessible(true);
method_getLastPacketReceivedTimeMs = method;
} catch (Throwable error){
method_getLastPacketReceivedTimeMs_error = true;
}
}
if (method_getLastPacketReceivedTimeMs == null) {
return -1;
}
try {
Object connImpl = conn.unwrap(class_connectionImpl);
if (connImpl == null) {
if (classJdbc == null) {
return -1;
}
Object mysqlio = method_getIO.invoke(connImpl);
Long ms = (Long) method_getLastPacketReceivedTimeMs.invoke(mysqlio);
return ms.longValue();
} catch (IllegalArgumentException e) {
throw new SQLException("getLastPacketReceivedTimeMs error", e);
} catch (IllegalAccessException e) {
throw new SQLException("getLastPacketReceivedTimeMs error", e);
} catch (InvocationTargetException e) {
throw new SQLException("getLastPacketReceivedTimeMs error", e);
if (getIdleFor == null && !getIdleForError) {
try {
getIdleFor = classJdbc.getMethod("getIdleFor");
getIdleFor.setAccessible(true);
} catch (Throwable error) {
getIdleForError = true;
}
}
if (getIdleFor == null) {
return -1;
}
try {
Object connImpl = conn.unwrap(class_connectionImpl);
if (connImpl == null) {
return -1;
}
return System.currentTimeMillis()
- ((Long)
getIdleFor.invoke(connImpl))
.longValue();
} catch (Exception e) {
throw new SQLException("getIdleFor error", e);
}
} else {
if (method_getIO == null && !method_getIO_error) {
try {
method_getIO = class_connectionImpl.getMethod("getIO");
} catch (Throwable error) {
method_getIO_error = true;
}
}
if (method_getIO == null) {
return -1;
}
if (class_MysqlIO == null && !class_MysqlIO_Error) {
try {
class_MysqlIO = Utils.loadClass("com.mysql.jdbc.MysqlIO");
} catch (Throwable error) {
class_MysqlIO_Error = true;
}
}
if (class_MysqlIO == null) {
return -1;
}
if (method_getLastPacketReceivedTimeMs == null && !method_getLastPacketReceivedTimeMs_error) {
try {
Method method = class_MysqlIO.getDeclaredMethod("getLastPacketReceivedTimeMs");
method.setAccessible(true);
method_getLastPacketReceivedTimeMs = method;
} catch (Throwable error) {
method_getLastPacketReceivedTimeMs_error = true;
}
}
if (method_getLastPacketReceivedTimeMs == null) {
return -1;
}
try {
Object connImpl = conn.unwrap(class_connectionImpl);
if (connImpl == null) {
return -1;
}
Object mysqlio = method_getIO.invoke(connImpl);
return (Long) method_getLastPacketReceivedTimeMs.invoke(mysqlio);
} catch (Exception e) {
throw new SQLException("getLastPacketReceivedTimeMs error", e);
}
}
}
@@ -38,6 +38,7 @@ import com.alibaba.druid.support.logging.LogFactory;
import oracle.jdbc.OracleConnection;
import oracle.jdbc.OracleResultSet;
import oracle.jdbc.OracleStatement;
import oracle.jdbc.driver.T4CXAConnection;
import oracle.jdbc.internal.OraclePreparedStatement;
import oracle.jdbc.xa.client.OracleXAConnection;
import oracle.sql.ROWID;
@@ -47,7 +48,12 @@ public class OracleUtils {
private final static Log LOG = LogFactory.getLog(OracleUtils.class);
public static XAConnection OracleXAConnection(Connection oracleConnection) throws XAException {
return new OracleXAConnection(oracleConnection);
String oracleConnectionClassName = oracleConnection.getClass().getName();
if ("oracle.jdbc.driver.T4CConnection".equals(oracleConnectionClassName)) {
return new T4CXAConnection(oracleConnection);
} else {
return new OracleXAConnection(oracleConnection);
}
}
public static int getRowPrefetch(PreparedStatement stmt) throws SQLException {
@@ -129,29 +129,26 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean {
dbType = JdbcUtils.getDbType(dataSource.getUrl(), null);
}
if (JdbcUtils.MYSQL.equals(dbType) || //
JdbcUtils.MARIADB.equals(dbType) || //
JdbcUtils.H2.equals(dbType)||
if (JdbcUtils.isMysqlDbType(dbType) || //
JdbcUtils.PRESTO.equals(dbType)) {
if (config == null) {
config = new WallConfig(MySqlWallProvider.DEFAULT_CONFIG_DIR);
}
provider = new MySqlWallProvider(config);
} else if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) {
} else if (JdbcUtils.isOracleDbType(dbType)) {
if (config == null) {
config = new WallConfig(OracleWallProvider.DEFAULT_CONFIG_DIR);
}
provider = new OracleWallProvider(config);
} else if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
} else if (JdbcUtils.isSqlserverDbType(dbType)) {
if (config == null) {
config = new WallConfig(SQLServerWallProvider.DEFAULT_CONFIG_DIR);
}
provider = new SQLServerWallProvider(config);
} else if (JdbcUtils.POSTGRESQL.equals(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)) {
} else if (JdbcUtils.isPgsqlDbType(dbType)) {
if (config == null) {
config = new WallConfig(PGWallProvider.DEFAULT_CONFIG_DIR);
}