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 1/2] [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 2/2] 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 {