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

bug fixed for useGloalDataSourceStat

Browse Source
This commit is contained in:
wenshao
2013-05-10 02:44:56 +08:00
parent dc45b9d57e
commit bbb5e6f983
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+3 -3
View File
@@ -473,13 +473,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (isUseGloalDataSourceStat()) {
dataSourceStat = JdbcDataSourceStat.getGlobal();
if (dataSourceStat.getDbType() == null) {
dataSourceStat.setDbType(this.getDbType());
}
if (dataSourceStat == null) {
dataSourceStat = new JdbcDataSourceStat("Global", "Global", this.dbType);
JdbcDataSourceStat.setGlobal(dataSourceStat);
}
if (dataSourceStat.getDbType() == null) {
dataSourceStat.setDbType(this.getDbType());
}
} else {
dataSourceStat = new JdbcDataSourceStat(this.name, this.jdbcUrl, this.dbType);
}
src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java
+2 -2
View File
@@ -71,8 +71,8 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean {
private final AtomicLong blobOpenCount = new AtomicLong();
private static JdbcDataSourceStat global = new JdbcDataSourceStat(
"global",
"global");
"Global",
"Global");
public static JdbcDataSourceStat getGlobal() {
return global;
src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java
+1
View File
@@ -77,6 +77,7 @@ public class GlobalStatTest0 extends TestCase {
String json = JSONUtils.toJSONString(JdbcStatManager.getInstance().getSqlList());
List<Map<String, Object>> sqlList = (List<Map<String, Object>>) JSONUtils.parse(json);
Map<String, Object> sqlInfo = sqlList.get(0);
Assert.assertNotNull(sqlInfo);
Assert.assertEquals(JdbcConstants.MOCK, sqlInfo.get("DbType"));
Assert.assertEquals(2, sqlInfo.get("ExecuteCount"));
Assert.assertEquals(2, sqlInfo.get("FetchRowCount"));