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
DigitalSonic 830640a11d add a blacklist in HighAvailableDataSource 2020-01-21 15:40:46 +08:00
DigitalSonic 75a094c41e add a blacklist in HighAvailableDataSource 
Filter the DataSourceMap with the blacklist before returning
 2020-01-21 14:58:19 +08:00
DigitalSonic 781fd69ce6 extract some Properties related method into Utils 2020-01-20 17:29:05 +08:00
DigitalSonic 1617528f77 Merge remote-tracking branch 'upstream/master' 2020-01-16 23:21:41 +08:00
wangzhijun 0d839edbf4 fix typo: merg -> merge 2020-01-16 14:05:32 +08:00
codeimport 6ee952e4c2 数据库初始化后才用判断maxEvictableIdleTimeMillis大小 2019-12-30 18:03:34 +08:00
dengliming e39f09c3dc refactor: 删除重复代码逻辑 2019-12-16 22:35:06 +08:00
auntyellow c7089f7ea7 An JDBC ... => A JDBC ... 2019-12-16 10:30:12 +08:00
Patrick a32fa1e621 modify Message "sessionStatMap is full" log-level form error to warn 2019-12-12 13:59:51 +08:00
alwaysForTop aabed61d92 Update DruidAbstractDataSource.java 2019-12-06 10:25:26 +08:00
高铁 b73e55f498 Merge remote-tracking branch 'origin/master' 2019-11-25 22:46:09 +08:00
高铁 206ef1dbe0 add method : parseStatements(String sql, String dbType, SQLParserFeature... features); 2019-11-25 22:45:38 +08:00
高铁 ef2d83f74a bug fixed for concurrent close & discard connection 2019-11-25 22:45:15 +08:00
温绍锦 ea284b43cb Merge pull request #3574 from desertsurge/desertsurge-patch-2 
refactor: 数据源页面多语言翻译了两次，去掉此页面多余的翻译
 2019-11-24 18:32:57 +08:00
desertsurge c114036044 Update datasource.html 
refactor: 数据源页面多语言翻译了两次，去掉此页面多余的翻译
 2019-11-20 15:06:48 +08:00
desertsurge 5cb935104a Update datasource.html 
fix: 解决多数据源只能显示其中一个的问题
 2019-11-20 14:59:14 +08:00
WaylanPunch e3e04cb41b add @Override annotation 2019-11-17 14:59:45 +08:00
温绍锦 9d8db34214 Update README.md 2019-11-17 10:56:56 +08:00
WaylanPunch bbfbb34af8 Collection.addAll() 2019-11-15 23:47:09 +08:00
eryan a49446a22d 解决Spring Boot环境下AOP二次代理问题 2019-11-08 08:33:44 +08:00
eryan 0a081d5a3f Merge pull request #1 from alibaba/master 
sync
 2019-11-08 08:23:27 +08:00
DigitalSonic 4f45e7f8dc add Testcases 2019-11-05 18:01:08 +08:00
DigitalSonic ea16b58cc0 Update RandomDataSourceSelector.java 
if threads are running, interrupt them first, and then start new threads
 2019-11-05 18:00:48 +08:00
DigitalSonic b6e6812d9d Update RandomDataSourceValidateThread.java 
add some logs
 2019-11-05 18:00:00 +08:00
高铁 bd8e80bdd8 improved oracle sql parser 1.1.21 2019-11-03 21:12:49 +08:00
高铁 1cdd3f28eb improved hive sql parser 2019-11-02 22:46:16 +08:00
高铁 481a0c8380 fix : get connection does not execute sql and return, add config 'checkExecuteTime', use 'lastExecTimeMillis' instead of 'lastActiveTimeMillis' 2019-11-02 20:21:37 +08:00
高铁 cb72382549 add method : DruidDataSource.discardConnection(ConnectionHolder) 2019-10-29 15:34:32 +08:00
高铁 1a4aea6c6e improved hive sql parser 2019-10-29 01:15:14 +08:00
高铁 1e8cc71c50 fix : get connection does not execute sql and return, add config 'checkExecuteTime', use 'lastExecTimeMillis' instead of 'lastActiveTimeMillis' 2019-10-27 17:19:30 +08:00
高铁 07b14e88de compiler version JDK 1.6 2019-10-27 10:52:59 +08:00
温绍锦 3ad2168e77 Merge pull request #3466 from yidasanqian/master 
Fix typo
 2019-10-26 21:30:29 +08:00
温绍锦 21899197b2 Merge pull request #3384 from Nonlone/master 
feat:增加统计页面展示废弃连接数
 2019-10-24 20:30:20 +08:00
高铁 e5e83312de support JDK 1.7 features 2019-10-20 12:21:48 +08:00
高铁 b3fd7d563b support JDK 1.7 features 2019-10-20 12:20:10 +08:00
高铁 b2f914bd15 support JDK 1.7 features 2019-10-19 19:30:46 +08:00
DigitalSonic 89c36661cb Optimize the Validation logic of RandomDataSource 
treating normal SQL execution in the pool as validation, so we can skip some validation operations
 2019-10-13 16:22:21 +08:00
DigitalSonic bc29864be6 close DataSource if creation failed 
close the DataSource if creation failed, otherwise the create-thread will try to create Connection and log ERROR in an endless loop
 2019-10-12 16:16:42 +08:00
DigitalSonic dff9a0040a Merge remote-tracking branch 'upstream/master' 2019-10-09 22:58:04 +08:00
温绍锦 e91f383fed Merge pull request #3232 from pauljoo/master 
fix for JdbcSqlStat.getValue lost name/file. issue #1685
 2019-10-05 14:18:31 +08:00
高铁 c72aae5496 fix testcase 2019-10-05 14:17:34 +08:00
温绍锦 38efdf375f Merge pull request #3475 from Duncan-tree-zhou/pg_upsert_fix_duncan 
修复PGOutputVisitor 输出PGInsertStatementParser的时候on Conflict Update语法的输出错误
 2019-10-05 14:08:57 +08:00
高铁 f970286f67 revert #3484 2019-10-05 13:34:32 +08:00
温绍锦 200c138726 Merge pull request #3484 from TonyYan666/master 
解决 SQLExprParser.primary方法 union all 前面直接包含子查询 解析异常问题
 2019-10-05 08:41:05 +08:00
高铁 a262865c9b backport sql parser improved from fastsql 2019-10-05 08:19:19 +08:00
高铁 da8d80b934 backport sql parser improved from fastsql 2019-10-05 08:18:31 +08:00
高铁 b79edab45f backport sql parser improved from fastsql 2019-10-05 01:50:37 +08:00
Nonlone dcf9103586 Merge branch 'master' into master 2019-09-26 17:20:23 +08:00
TonyYan666 8a93ff9843 解决 SQLExprParser.SQLParser union all 前面直接包含子查询 解析异常 2019-09-25 17:50:17 +08:00
高铁 20801d01ce remove tbdatasource & proxool testcase 2019-09-22 21:22:42 +08:00