Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity
6,430 Commits 16 Branches 87 Tags
ff12b2fe6b3694deab8fe75f20e45aa93ad526c2
Commit Graph
6430 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
高铁 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
DigitalSonic 2466ac220f some small refactors 
1. refactor RandomDataSourceSelector related classes
2. fix some testcases
 2020-02-07 15:17:50 +08:00
DigitalSonic a48c2fd493 Merge remote-tracking branch 'upstream/master' 2020-02-06 21:11:20 +08:00
DigitalSonic 5e0dc32798 refactor RandomDataSourceValidateThread 
1. add cleanup action at the end of every check
2. change the key of errorCounts from "foo" to "foo-xxxxx"(DruidDataSource.getName())
 2020-02-06 21:10:17 +08:00
DigitalSonic 3ebdc2ce4c small refactor 2020-02-06 15:13:47 +08:00
DigitalSonic 34aa0c8cd1 some small refactors & add tests 2020-02-06 13:53:28 +08:00
DigitalSonic eb90260afe rename some fields, add one complex test for FileNodeListener 2020-02-05 20:38:47 +08:00
DigitalSonic 12848f1b95 add a ZK node listener for HA 2020-02-05 16:41:00 +08:00
DigitalSonic ac170d5e97 some small refactors 2020-02-05 16:40:40 +08:00
DigitalSonic 7f43c62cb6 add a NodeRegister to register Node to ZK 2020-02-04 17:01:39 +08:00
DigitalSonic 6b884941fb Some small refactor 2020-02-03 16:48:22 +08:00
温绍锦 18606b51c7 Merge pull request #3558 from eryanwcp/master 
解决Spring Boot环境下AOP二次代理问题
 2020-01-29 23:40:12 +08:00
温绍锦 5c14f97809 Merge pull request #3659 from codeimport/master-fix-maxEvictableIdleTimeMillis 
数据源初始化后才用判断maxEvictableIdleTimeMillis大小
 2020-01-29 14:38:26 +08:00
温绍锦 736cd292f1 Merge pull request #3624 from auntyellow/master 
fix article word use in pom description
 2020-01-29 14:34:28 +08:00
DigitalSonic 8c57759eaa PoolUpdater can set Schedule Period now 2020-01-28 20:14:16 +08:00
hongweiyi 8ef52029f2 support oceanbase dbtype 
Signed-off-by: hongwei yi hongweiyi@hotmail.com
1. add oceanbase/oceanbase_oracle dbtype
2. update some dbtype recognition usages
 2020-01-28 12:03:24 +08:00
DigitalSonic cff870e80e Refactor Pool creation logic 
1. Refactor the create logic to use NodeListener instead of DataSourceCreator.createMap
2. Add destroy methods to NodeListener and PoolUpdater
3. Add a lock to prevent Node update concurrently
 2020-01-22 18:46:20 +08:00
DigitalSonic e03511cdaa rename the NodeEventType to NodeEventTypeEnum 2020-01-22 16:51:16 +08:00
DigitalSonic 82adaad442 add NodeListener mechanism 2020-01-22 16:48:16 +08:00
DigitalSonic dd2b469414 add a isInBlackList() method 2020-01-22 14:37:32 +08:00