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

Merge pull request #1148 from wenshao/master

Browse Source 
bug fixed for exeptionSorter auto detection
This commit is contained in:
wenshao
2016-03-29 16:46:12 +08:00
parent 8c135fad14 d2a397de89
commit e499d9b9cf
4 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+6 -1
View File
@@ -67,6 +67,7 @@ import com.alibaba.druid.pool.vendor.MSSQLValidConnectionChecker;
import com.alibaba.druid.pool.vendor.MockExceptionSorter;
import com.alibaba.druid.pool.vendor.MySqlExceptionSorter;
import com.alibaba.druid.pool.vendor.MySqlValidConnectionChecker;
import com.alibaba.druid.pool.vendor.NullExceptionSorter;
import com.alibaba.druid.pool.vendor.OracleExceptionSorter;
import com.alibaba.druid.pool.vendor.OracleValidConnectionChecker;
import com.alibaba.druid.pool.vendor.PGExceptionSorter;
@@ -952,7 +953,11 @@ public class DruidDataSource extends DruidAbstractDataSource
}
private void initExceptionSorter() {
if (this.exceptionSorter != null) {
if (exceptionSorter instanceof NullExceptionSorter) {
if (driver instanceof MockDriver) {
return;
}
} else if (this.exceptionSorter != null) {
return;
}
src/test/java/com/alibaba/druid/bvt/pool/AsyncCloseTest1.java
+25 -9
View File
@@ -1,5 +1,6 @@
package com.alibaba.druid.bvt.pool;
import java.lang.reflect.Field;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.concurrent.CountDownLatch;
@@ -7,15 +8,16 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.TestCase;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Assert;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.Log4jImpl;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.support.logging.NoLoggingImpl;
import junit.framework.TestCase;
public class AsyncCloseTest1 extends TestCase {
@@ -25,13 +27,23 @@ public class AsyncCloseTest1 extends TestCase {
final AtomicInteger errorCount = new AtomicInteger();
private Logger log;
private Level oldLevel;
private Logger log4jLog;
private Level log4jOldLevel;
private NoLoggingImpl noLoggingImpl;
protected void setUp() throws Exception {
log = ((Log4jImpl) LogFactory.getLog(DruidDataSource.class)).getLog();
oldLevel = log.getLevel();
log.setLevel(Level.FATAL);
Field logField = DruidDataSource.class.getDeclaredField("LOG");
logField.setAccessible(true);
Log dataSourceLog = (Log) logField.get(null);
if (dataSourceLog instanceof Log4jImpl) {
this.log4jLog = ((Log4jImpl) dataSourceLog).getLog();
this.log4jOldLevel = this.log4jLog.getLevel();
this.log4jLog.setLevel(Level.FATAL);
} else if (dataSourceLog instanceof NoLoggingImpl) {
noLoggingImpl = (NoLoggingImpl) dataSourceLog;
noLoggingImpl.setErrorEnabled(false);
}
dataSource = new DruidDataSource();
dataSource.setUrl("jdbc:mock:");
@@ -46,7 +58,11 @@ public class AsyncCloseTest1 extends TestCase {
protected void tearDown() throws Exception {
dataSource.close();
log.setLevel(oldLevel);
if (log4jLog != null) {
log4jLog.setLevel(log4jOldLevel);
} else if (noLoggingImpl != null) {
noLoggingImpl.setErrorEnabled(true);
}
}
public void test_0() throws Exception {
src/test/java/com/alibaba/druid/bvt/pool/AsyncCloseTest2.java
+27 -10
View File
@@ -1,5 +1,6 @@
package com.alibaba.druid.bvt.pool;
import java.lang.reflect.Field;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
@@ -8,8 +9,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.TestCase;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Assert;
@@ -19,8 +18,11 @@ import com.alibaba.druid.filter.FilterChain;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.pool.vendor.MockExceptionSorter;
import com.alibaba.druid.proxy.jdbc.StatementProxy;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.Log4jImpl;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.support.logging.NoLoggingImpl;
import junit.framework.TestCase;
public class AsyncCloseTest2 extends TestCase {
@@ -30,14 +32,25 @@ public class AsyncCloseTest2 extends TestCase {
final AtomicInteger errorCount = new AtomicInteger();
private Logger log;
private Level oldLevel;
private Logger log4jLog;
private Level log4jOldLevel;
private NoLoggingImpl noLoggingImpl;
protected void setUp() throws Exception {
log = ((Log4jImpl) LogFactory.getLog(DruidDataSource.class)).getLog();
oldLevel = log.getLevel();
log.setLevel(Level.FATAL);
Field logField = DruidDataSource.class.getDeclaredField("LOG");
logField.setAccessible(true);
Log dataSourceLog = (Log) logField.get(null);
if (dataSourceLog instanceof Log4jImpl) {
this.log4jLog = ((Log4jImpl) dataSourceLog).getLog();
this.log4jOldLevel = this.log4jLog.getLevel();
this.log4jLog.setLevel(Level.FATAL);
} else if (dataSourceLog instanceof NoLoggingImpl) {
noLoggingImpl = (NoLoggingImpl) dataSourceLog;
noLoggingImpl.setErrorEnabled(false);
}
dataSource = new DruidDataSource();
dataSource.setUrl("jdbc:mock:");
dataSource.setAsyncCloseConnectionEnable(true);
@@ -63,7 +76,11 @@ public class AsyncCloseTest2 extends TestCase {
protected void tearDown() throws Exception {
dataSource.close();
log.setLevel(oldLevel);
if (log4jLog != null) {
log4jLog.setLevel(log4jOldLevel);
} else if (noLoggingImpl != null) {
noLoggingImpl.setErrorEnabled(true);
}
}
public void test_0() throws Exception {
src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java
+4 -2
View File
@@ -32,12 +32,14 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager;
public class ClobTest extends TestCase {
protected int dataSourceListSize;
protected void setUp() throws Exception {
Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
dataSourceListSize = DruidDataSourceStatManager.getInstance().getDataSourceList().size();
}
protected void tearDown() throws Exception {
Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
Assert.assertEquals(dataSourceListSize, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
}
public void test_clob() throws Exception {