From a49446a22d2f540f977bb0060eecf002e2ee4f03 Mon Sep 17 00:00:00 2001 From: eryan Date: Fri, 8 Nov 2019 08:33:44 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3Spring=20Boot=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E4=B8=8BAOP=E4=BA=8C=E6=AC=A1=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boot/autoconfigure/stat/DruidSpringAopConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java index ee1697b05e..ad04ab620b 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java @@ -42,6 +42,7 @@ public class DruidSpringAopConfiguration { } @Bean + @ConditionalOnProperty(name = "spring.aop.auto",havingValue = "false") public DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator() { DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator(); advisorAutoProxyCreator.setProxyTargetClass(true); From c7089f7ea74d7ed530fc31d9cbb3cd4430ddc47e Mon Sep 17 00:00:00 2001 From: auntyellow Date: Mon, 16 Dec 2019 10:30:12 +0800 Subject: [PATCH 02/11] An JDBC ... => A JDBC ... --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d4db226ae..975492683e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ jar druid - An JDBC datasource implementation. + A JDBC datasource implementation. https://github.com/alibaba/druid 2013 From e39f09c3dca5e7cafac8165a12df8da268f72016 Mon Sep 17 00:00:00 2001 From: dengliming Date: Mon, 16 Dec 2019 22:35:06 +0800 Subject: [PATCH 03/11] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/druid/sql/parser/SQLExprParser.java | 6 +----- .../com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) 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 77c73d8a9e..ca6a2556d7 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -1585,11 +1585,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); } 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 3cadd09394..af8d022c5a 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -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++; From 6ee952e4c29aa5aa42201dfedde5aade4e16b8e9 Mon Sep 17 00:00:00 2001 From: codeimport <516673669@qq.com> Date: Mon, 30 Dec 2019 18:03:34 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=90=8E=E6=89=8D=E7=94=A8=E5=88=A4=E6=96=AD?= =?UTF-8?q?maxEvictableIdleTimeMillis=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/druid/pool/DruidAbstractDataSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index ae2daeddf5..da925b5e8a 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -795,7 +795,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements LOG.error("maxEvictableIdleTimeMillis should be greater than 30000"); } - if (maxEvictableIdleTimeMillis < minEvictableIdleTimeMillis) { + if (inited && maxEvictableIdleTimeMillis < minEvictableIdleTimeMillis) { throw new IllegalArgumentException("maxEvictableIdleTimeMillis must be grater than minEvictableIdleTimeMillis"); } From 38ec095e705c69bfcb0d1f96fb39b9e89266f046 Mon Sep 17 00:00:00 2001 From: zhaohuihua Date: Fri, 21 Feb 2020 00:02:55 +0800 Subject: [PATCH 05/11] Resolve the DB2 driver from JDBC URL --- .../com/alibaba/druid/util/JdbcConstants.java | 4 +++- .../java/com/alibaba/druid/util/JdbcUtils.java | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index 8b7757b334..7a00a4edfc 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -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"; diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index bc8b70666b..3f7f89c69d 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -436,7 +436,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:")) { From 82901a96adc6178e70c8a922368206c79e359afb Mon Sep 17 00:00:00 2001 From: zhaohuihua Date: Fri, 21 Feb 2020 00:08:58 +0800 Subject: [PATCH 06/11] extract method: resolveDriver --- .../alibaba/druid/pool/DruidDataSource.java | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index c2116ad0a7..8b02515410 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -883,24 +883,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 +1196,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; From b0cc835a40c45c4f6c3d2267e7d4b661da037bf4 Mon Sep 17 00:00:00 2001 From: ldming Date: Wed, 26 Feb 2020 14:28:09 +0800 Subject: [PATCH 07/11] Support polardb --- .../alibaba/druid/pool/DruidDataSource.java | 6 ++- .../java/com/alibaba/druid/sql/SQLUtils.java | 3 +- .../druid/sql/parser/SQLParserUtils.java | 9 ++-- .../visitor/ExportParameterVisitorUtils.java | 3 +- .../ParameterizedOutputVisitorUtils.java | 3 +- .../sql/visitor/SQLEvalVisitorUtils.java | 3 +- .../com/alibaba/druid/util/JdbcConstants.java | 6 +++ .../com/alibaba/druid/util/JdbcUtils.java | 8 ++- .../com/alibaba/druid/wall/WallFilter.java | 3 +- .../druid/polardb/PolarDBDataSourceTest.java | 51 +++++++++++++++++++ 10 files changed, 83 insertions(+), 12 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index c2116ad0a7..91256957cc 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1316,7 +1316,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(); } } @@ -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")) { diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java index 1fb6bbd08a..6637569d0c 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java @@ -899,7 +899,8 @@ public class SQLUtils { return name; } } else if (JdbcConstants.POSTGRESQL.equals(dbType) - || JdbcConstants.ENTERPRISEDB.equals(dbType)) { + || JdbcConstants.ENTERPRISEDB.equals(dbType) + || JdbcConstants.POLARDB.equals(dbType)) { if (PGUtils.isKeyword(normalizeName)) { return name; } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java index 3d94c6e040..73ec0beef0 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java @@ -82,7 +82,8 @@ public class SQLParserUtils { } if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType) + || JdbcUtils.POLARDB.equals(dbType)) { return new PGSQLStatementParser(sql); } @@ -129,7 +130,8 @@ public class SQLParserUtils { } if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType) + || JdbcUtils.POLARDB.equals(dbType)) { return new PGExprParser(sql); } @@ -164,7 +166,8 @@ public class SQLParserUtils { } if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType) + || JdbcUtils.POLARDB.equals(dbType)) { return new PGLexer(sql); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java index d2812cfce4..48e44ac003 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java @@ -66,7 +66,8 @@ public final class ExportParameterVisitorUtils { } if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType) + || JdbcUtils.POLARDB.equals(dbType)) { return new PGExportParameterVisitor(out); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java index 13f5ff3878..3712bb0984 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java @@ -276,7 +276,8 @@ public class ParameterizedOutputVisitorUtils { } if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType) + || JdbcUtils.POLARDB.equals(dbType)) { return new PGOutputVisitor(out, true); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java index 3e5c5421c8..5d574c511e 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java @@ -177,7 +177,8 @@ public class SQLEvalVisitorUtils { } if (JdbcConstants.POSTGRESQL.equals(dbType) - || JdbcConstants.ENTERPRISEDB.equals(dbType)) { + || JdbcConstants.ENTERPRISEDB.equals(dbType) + || JdbcConstants.POLARDB.equals(dbType)) { return new PGEvalVisitor(); } diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index 8b7757b334..85b6630b67 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -117,4 +117,10 @@ public interface JdbcConstants { String CLICKHOUSE = "clickhouse"; String CLICKHOUSE_DRIVER = "ru.yandex.clickhouse.ClickHouseDriver"; + + /** + * Aliyun PolarDB + */ + String POLARDB = "polardb"; + String POLARDB_DRIVER = "com.aliyun.polardb.Driver"; } diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index bc8b70666b..a647819023 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -493,7 +493,9 @@ 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:polardb")) { + return JdbcConstants.POLARDB_DRIVER; + } else { throw new SQLException("unknown jdbc driver : " + rawUrl); } } @@ -586,8 +588,10 @@ 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:polardb")) { + return POLARDB; } else { return null; } diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java index 0d0b91d532..37e92c1cfd 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFilter.java +++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java @@ -151,7 +151,8 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { provider = new SQLServerWallProvider(config); } else if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType) + || JdbcUtils.POLARDB.equals(dbType)) { if (config == null) { config = new WallConfig(PGWallProvider.DEFAULT_CONFIG_DIR); } diff --git a/src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java b/src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java new file mode 100644 index 0000000000..a8c7977383 --- /dev/null +++ b/src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java @@ -0,0 +1,51 @@ +package com.alibaba.druid.polardb; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import junit.framework.TestCase; + +import org.junit.Assert; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.util.JdbcUtils; + +public class PolarDBDataSourceTest extends TestCase { + + private String jdbcUrl; + private DruidDataSource dataSource; + + protected void setUp() throws Exception { + jdbcUrl = "jdbc:polardb://a.b.c.d:5432/polardb"; + dataSource = new DruidDataSource(); + dataSource.setUrl(jdbcUrl); + dataSource.setUsername("polardb"); + dataSource.setPassword("polardb"); + dataSource.setValidationQuery("select 1"); + dataSource.setFilters("stat"); + } + + protected void tearDown() throws Exception { + dataSource.close(); + } + + public void testDataSource() throws SQLException { + dataSource.init(); + + Assert.assertTrue(JdbcConstants.POLARDB.equals(dataSource.getDbType())); + Assert.assertTrue(JdbcConstants.POLARDB_DRIVER.equals(dataSource.getDriverClassName())); + + Connection conn = dataSource.getConnection(); + PreparedStatement stmt = conn.prepareStatement("SELECT 1"); + ResultSet rs = stmt.executeQuery(); + while(rs.next()) { + + } + JdbcUtils.close(rs); + JdbcUtils.close(stmt); + JdbcUtils.close(conn); + } +} From 9e3a71f4277511f54c8ae31e96a04d9744271f53 Mon Sep 17 00:00:00 2001 From: "wang.mengbj" <278696298@qq.com> Date: Thu, 19 Mar 2020 13:50:14 +0800 Subject: [PATCH 08/11] [edit]add inspur K-DB database support --- src/main/java/com/alibaba/druid/util/JdbcConstants.java | 3 +++ src/main/java/com/alibaba/druid/util/JdbcUtils.java | 8 +++++++- .../java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index 8b7757b334..9362a88eb4 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -117,4 +117,7 @@ public interface JdbcConstants { String CLICKHOUSE = "clickhouse"; String CLICKHOUSE_DRIVER = "ru.yandex.clickhouse.ClickHouseDriver"; + + String KDB = "kdb"; + String KDB_DRIVER = "com.inspur.jdbc.KdDriver"; } diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index bc8b70666b..54988a7fc2 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -493,6 +493,10 @@ public final class JdbcUtils implements JdbcConstants { return JdbcConstants.CLICKHOUSE_DRIVER; } else if(rawUrl.startsWith("jdbc:presto:")) { return JdbcConstants.PRESTO_DRIVER; + }else if(rawUrl.startsWith("jdbc:presto:")) { + return JdbcConstants.PRESTO_DRIVER; + }else if (rawUrl.startsWith("jdbc:inspur:")) { + return JdbcConstants.KDB_DRIVER; }else { throw new SQLException("unknown jdbc driver : " + rawUrl); } @@ -588,7 +592,9 @@ public final class JdbcUtils implements JdbcConstants { return CLICKHOUSE; }else if (rawUrl.startsWith("jdbc:presto:")) { return PRESTO; - } else { + }else if (rawUrl.startsWith("jdbc:inspur:")) { + return JdbcConstants.KDB; + }else { return null; } } diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java index d2038bed74..e8b0edc216 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java @@ -28,4 +28,8 @@ public class JdbcUtilsTest2 extends TestCase { public void test_xugu_driver() throws Exception { assertEquals(JdbcConstants.XUGU_DRIVER, JdbcUtils.getDriverClassName("jdbc:xugu:")); } + + public void test_kdb() throws Exception { + assertEquals(JdbcConstants.KDB_DRIVER, JdbcUtils.getDriverClassName("jdbc:inspur:")); + } } From 81e4a6215ab8226bb204386fb5d40ca22dbf1a7d Mon Sep 17 00:00:00 2001 From: "wang.mengbj" <278696298@qq.com> Date: Thu, 19 Mar 2020 14:22:43 +0800 Subject: [PATCH 09/11] Add inspur K-DB database support --- src/main/java/com/alibaba/druid/util/JdbcUtils.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 54988a7fc2..a546b30a1e 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -493,8 +493,6 @@ public final class JdbcUtils implements JdbcConstants { return JdbcConstants.CLICKHOUSE_DRIVER; } else if(rawUrl.startsWith("jdbc:presto:")) { return JdbcConstants.PRESTO_DRIVER; - }else if(rawUrl.startsWith("jdbc:presto:")) { - return JdbcConstants.PRESTO_DRIVER; }else if (rawUrl.startsWith("jdbc:inspur:")) { return JdbcConstants.KDB_DRIVER; }else { From 14ad7a78095a5b0cc9607795677dd62831a6461f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Mon, 6 Apr 2020 19:43:07 +0800 Subject: [PATCH 10/11] fixed test failed --- .../bvt/pool/DruidDataSourceTest_exceptionSorter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java index 15a905ad5a..835ee3dc24 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java @@ -72,8 +72,9 @@ public class DruidDataSourceTest_exceptionSorter extends TestCase { conn.close(); } - Assert.assertEquals(2, dataSource.getCreateCount()); - Assert.assertEquals(1, dataSource.getDiscardCount()); - Assert.assertEquals(1, dataSource.getPoolingCount()); + long createCount = dataSource.getCreateCount(); + assertTrue(createCount == 2 || createCount == 3); + assertEquals(createCount - 1, dataSource.getDiscardCount()); + assertEquals(1, dataSource.getPoolingCount()); } } From 315e96dd6c09eeeaeb2c0e06c9535f24013df253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Mon, 6 Apr 2020 19:44:19 +0800 Subject: [PATCH 11/11] bug fixed for isUseUnfairLock --- .../java/com/alibaba/druid/pool/DruidAbstractDataSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index da925b5e8a..8e76d8a970 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -340,7 +340,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements } public boolean isUseUnfairLock() { - return lock.isFair(); + return !lock.isFair(); } public void setUseUnfairLock(boolean useUnfairLock) {