Commit Graph
6149 Commits
Author SHA1 Message Date
高铁 ed56b0f607 add oldMethod for compatible 2020-06-27 22:40:25 +08:00
温绍锦 2d096feee3 Merge pull request #3685 from joshuayash/master
fix typo: merg -> merge
2020-06-27 22:39:07 +08:00
温绍锦 faf924cf7f Merge pull request #3694 from digitalsonic/master
针对 HighAvailableDataSource 的多项优化
2020-06-27 22:33:39 +08:00
高铁 edd41e678b code format 2020-06-27 22:31:52 +08:00
温绍锦 2fd7f9fef0 Merge pull request #3829 from beiwangnull/fix_testWhileIdle_where_use_jdbc8
在使用mysql-connector 8.X时,修复检测连接有效性无对应的class,导致获取连接线程BLOCKED
2020-06-27 22:17:48 +08:00
高铁 fb396ac8e9 update guava dependency 2020-06-27 22:16:33 +08:00
温绍锦 bc1a6a6165 Merge pull request #3809 from wcc526/patch-1
Update fastjson version
2020-06-27 19:32:24 +08:00
yuqicao ef2f87b6c8 在使用mysql-connector 8.X时,修复检测连接有效性无对应的class 2020-06-12 12:13:43 +08:00
chi-chi weng b3c90e247c Update fastjson version
Update fastjson version
2020-05-20 19:11:03 +08:00
温绍锦 f95f1c6436 Merge pull request #3777 from TerCZ/patch-1
Fix clone() bug in SQLJoinTableSource
2020-05-10 23:06:37 +08:00
温绍锦 259ad40fbd Merge pull request #3779 from hongweiyi/add_oceanbase_exception_sorter
Add oceanbase exception sorter
2020-05-10 23:05:00 +08:00
DigitalSonic 99270819ee Keep at least one DataSource in the pool when update by events. 2020-05-05 22:21:00 +08:00
hongweiyi abbc46a4b0 support OceanBase ExceptionSorter
Signed-off-by: hongwei yi hongweiyi@hotmail.com
2020-04-14 21:16:31 +08:00
Chuzhe 68c9c73677 Fix clone() bug in SQLJoinTableSource
Before this fix, the join condition is not properly cloned but is rather being referenced, so when an AST is cloned, source and target ASTs will share the same join condition node.
2020-04-13 21:29:18 +08:00
hongweiyi 2358830aa4 support OceanBase ExceptionSorter
Signed-off-by: hongwei yi hongweiyi@hotmail.com
2020-04-08 23:11:24 +08:00
高铁 52fee1017c update version 1.1.22 1.1.22 2020-04-06 23:00:35 +08:00
高铁 1b287e3595 add StatViewFilter initial code (not complete) 2020-04-06 22:55:48 +08:00
高铁 be42289d53 code format 2020-04-06 22:54:25 +08:00
高铁 224db8df7e update version 2020-04-06 22:54:09 +08:00
高铁 a5e3258177 Merge branch 'master' of https://github.com/alibaba/druid 2020-04-06 22:26:16 +08:00
温绍锦 1dd9e23a28 Merge pull request #3606 from alwaysForTop/master
Update DruidAbstractDataSource.java
2020-04-06 22:26:04 +08:00
高铁 1f0411413b Merge branch 'master' of https://github.com/alibaba/druid 2020-04-06 22:25:37 +08:00
温绍锦 82330871cb Merge pull request #3620 from Patrick0308/sessionStateMap-full-log-level
modify Message "sessionStatMap is full" log-level form error to warn
2020-04-06 22:24:32 +08:00
高铁 7f62431d40 1.1.22 2020-04-06 22:11:33 +08:00
高铁 f0534c66f8 Merge branch 'master' of https://github.com/alibaba/druid 2020-04-06 22:07:57 +08:00
高铁 accd8a9a43 update postgresql driver version 2020-04-06 22:07:47 +08:00
温绍锦 7e25f4639a Merge pull request #3573 from desertsurge/desertsurge-patch-1
fix: 解决多数据源只能显示其中一个的问题
2020-04-06 22:06:45 +08:00
温绍锦 57c545de32 Merge pull request #3569 from WaylanPunch/master
Collection.addAll() and @Override annotation
2020-04-06 22:06:02 +08:00
温绍锦 6767d4e73f Merge pull request #3710 from sharajava/master
fix https://github.com/alibaba/druid/issues/3707
2020-04-06 22:05:05 +08:00
温绍锦 2075c46e12 Merge pull request #3749 from cici2048/master
Update dependency version of fastjson
2020-04-06 22:04:14 +08:00
温绍锦 c28c6aad52 Merge pull request #3693 from hongweiyi/support_oceanbase_dbtype
support oceanbase dbtype
2020-04-06 21:59:24 +08:00
hongweiyi 07e02b3c7f fix merge conflicts problem
Signed-off-by: hongwei yi hongweiyi@hotmail.com
2020-04-06 21:57:30 +08:00
Hongwei Yi 53735bc67d Merge branch 'master' into support_oceanbase_dbtype 2020-04-06 21:44:21 +08:00
温绍锦 dd83f25f9c Merge pull request #3627 from dengliming/master
refactor: 删除重复代码逻辑
2020-04-06 20:45:42 +08:00
温绍锦 a56c1956a7 Merge pull request #3698 from zhaohuihua/master
优化DB2 Driver的推断逻辑
2020-04-06 20:23:38 +08:00
温绍锦 b780a602b5 Merge pull request #3744 from luffy2020/dev
Add inspur K-DB database support
2020-04-06 20:22:06 +08:00
高铁 315e96dd6c bug fixed for isUseUnfairLock 2020-04-06 19:44:19 +08:00
高铁 de36c94b90 Merge remote-tracking branch 'origin/master' 2020-04-06 19:43:29 +08:00
高铁 14ad7a7809 fixed test failed 2020-04-06 19:43:07 +08:00
DigitalSonic 75391df4ad add some logs to RandomDataSourceSelector 2020-04-05 21:29:34 +08:00
luffy2020 7f6562cc3d Merge branch 'master' into dev 2020-03-26 09:30:11 +08:00
chen chen 3bfd96bf80 Update dependency version of fastjson 2020-03-25 22:04:28 +08:00
温绍锦 ff81af779a Merge pull request #3704 from ldming/master
Support polardb
2020-03-24 14:49:51 +08:00
wang.mengbj 81e4a6215a Add inspur K-DB database support 2020-03-19 14:22:43 +08:00
wang.mengbj 9e3a71f427 [edit]add inspur K-DB database support 2020-03-19 13:50:14 +08:00
xuanyi 94e2a384b4 fix https://github.com/alibaba/druid/issues/3707 2020-03-02 14:59:59 +08:00
ldming b0cc835a40 Support polardb 2020-03-01 12:50:57 +08:00
zhaohuihua 82901a96ad extract method: resolveDriver 2020-02-21 00:08:58 +08:00
zhaohuihua 38ec095e70 Resolve the DB2 driver from JDBC URL 2020-02-21 00:02:55 +08:00
DigitalSonic f40638db28 some small refactors 2020-02-07 19:11:35 +08:00