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

修正Spring不能识别filters的问题

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@438 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-07-14 10:09:58 +00:00
parent 1b554be17d
commit 8f21688026
13 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java
+6 -6
View File
@@ -13,35 +13,35 @@ public class DruidDataSourceFilterTest extends TestCase {
public void test_filter() throws Exception {
DruidDataSource dataSource = new DruidDataSource();
Assert.assertEquals(0, dataSource.getFilters().size());
Assert.assertEquals(0, dataSource.getProxyFilters().size());
dataSource.setFilters("stat");
Assert.assertEquals(1, dataSource.getFilters().size());
Assert.assertEquals(1, dataSource.getProxyFilters().size());
}
public void test_filter_2() throws Exception {
DruidDataSource dataSource = new DruidDataSource();
Assert.assertEquals(0, dataSource.getFilters().size());
Assert.assertEquals(0, dataSource.getProxyFilters().size());
dataSource.setFilters("stat,trace");
Assert.assertEquals(2, dataSource.getFilters().size());
Assert.assertEquals(2, dataSource.getProxyFilters().size());
}
public void test_filter_3() throws Exception {
DruidDataSource dataSource = new DruidDataSource();
dataSource.setUrl("jdbc:mock:");
Assert.assertEquals(0, dataSource.getFilters().size());
Assert.assertEquals(0, dataSource.getProxyFilters().size());
dataSource.setFilters("stat");
JdbcStatManager.getInstance().reset();
Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionstat().getConnectCount());
Assert.assertEquals(1, dataSource.getFilters().size());
Assert.assertEquals(1, dataSource.getProxyFilters().size());
for (int i = 0; i < 2; ++i) {
Connection conn = dataSource.getConnection();
src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java
+5 -5
View File
@@ -14,14 +14,14 @@ public class ParamTest extends TestCase {
DruidDataSource dataSource = new DruidDataSource();
dataSource.setUrl("jdbc:mock:");
Assert.assertEquals(0, dataSource.getFilters().size());
Assert.assertEquals(0, dataSource.getProxyFilters().size());
dataSource.setFilters("stat");
JdbcStatManager.getInstance().reset();
Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionstat().getConnectCount());
Assert.assertEquals(1, dataSource.getFilters().size());
Assert.assertEquals(1, dataSource.getProxyFilters().size());
for (int i = 0; i < 2; ++i) {
Connection conn = dataSource.getConnection();
@@ -55,14 +55,14 @@ public class ParamTest extends TestCase {
dataSource.setMinIdle(0);
dataSource.setMaxIdle(0);
Assert.assertEquals(0, dataSource.getFilters().size());
Assert.assertEquals(0, dataSource.getProxyFilters().size());
dataSource.setFilters("stat");
JdbcStatManager.getInstance().reset();
Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionstat().getConnectCount());
Assert.assertEquals(1, dataSource.getFilters().size());
Assert.assertEquals(1, dataSource.getProxyFilters().size());
Exception error = null;
try {
@@ -82,7 +82,7 @@ public class ParamTest extends TestCase {
dataSource.setMaxIdle(10);
dataSource.setFilters("stat");
Assert.assertEquals(1, dataSource.getFilters().size());
Assert.assertEquals(1, dataSource.getProxyFilters().size());
JdbcStatManager.getInstance().reset();
src/test/java/com/alibaba/druid/bvt/proxy/DriverTest.java
+5 -5
View File
@@ -66,28 +66,28 @@ public class DriverTest extends TestCase {
Connection connection_1 = DriverManager.getConnection(url_1);
ConnectionProxy connection_wrapper_1 = connection_1.unwrap(ConnectionProxy.class);
DataSourceProxy dataSource_1 = connection_wrapper_1.getDirectDataSource();
Assert.assertEquals(1, dataSource_1.getFilters().size());
Assert.assertEquals(1, dataSource_1.getProxyFilters().size());
{
Connection connection_2 = DriverManager.getConnection(url_2);
ConnectionProxy connection_wrapper_2 = connection_2.unwrap(ConnectionProxy.class);
DataSourceProxy dataSource_2 = connection_wrapper_2.getDirectDataSource();
Assert.assertEquals(1, dataSource_2.getFilters().size());
Assert.assertEquals(1, dataSource_2.getProxyFilters().size());
}
{
Connection connection_3 = DriverManager.getConnection(url_3);
ConnectionProxy connection_wrapper_3 = connection_3.unwrap(ConnectionProxy.class);
DataSourceProxy dataSource_3 = connection_wrapper_3.getDirectDataSource();
Assert.assertEquals(1, dataSource_3.getFilters().size());
Assert.assertEquals(1, dataSource_3.getProxyFilters().size());
}
{
Connection connection_4 = DriverManager.getConnection(url_4);
ConnectionProxy connection_wrapper_4 = connection_4.unwrap(ConnectionProxy.class);
DataSourceProxy dataSource_4 = connection_wrapper_4.getDirectDataSource();
dataSource_4.getFilters().toString();
Assert.assertEquals(1, dataSource_4.getFilters().size());
dataSource_4.getProxyFilters().toString();
Assert.assertEquals(1, dataSource_4.getProxyFilters().size());
}
}
src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java
+7 -7
View File
@@ -140,37 +140,37 @@ public class DruidDriverTest extends TestCase {
{
ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:filters=:name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true",
new Properties());
Assert.assertEquals(0, conn.getDirectDataSource().getFilters().size());
Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size());
conn.close();
}
{
ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:filters=,:name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true",
new Properties());
Assert.assertEquals(0, conn.getDirectDataSource().getFilters().size());
Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size());
conn.close();
}
{
ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:filters=,:jdbc:derby:memory:driverWrapperTestDB;create=true",
new Properties());
Assert.assertEquals(0, conn.getDirectDataSource().getFilters().size());
Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size());
conn.close();
}
{
ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:filters=,:name=:jdbc:derby:memory:driverWrapperTestDB;create=true",
new Properties());
Assert.assertEquals(0, conn.getDirectDataSource().getFilters().size());
Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size());
conn.close();
}
{
ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:driver=:filters=,:name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true",
new Properties());
Assert.assertEquals(0, conn.getDirectDataSource().getFilters().size());
Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size());
conn.close();
}
{
ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true",
new Properties());
Assert.assertEquals(0, conn.getDirectDataSource().getFilters().size());
Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size());
conn.close();
}
{
@@ -178,7 +178,7 @@ public class DruidDriverTest extends TestCase {
+ PublicJdbcFilterAdapter.class.getName()
+ ":name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true",
new Properties());
Assert.assertEquals(1, conn.getDirectDataSource().getFilters().size());
Assert.assertEquals(1, conn.getDirectDataSource().getProxyFilters().size());
conn.close();
}
{
src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class WrapImplTest extends TestCase {
DataSourceProxyImpl dataSource = (DataSourceProxyImpl) connection.getDirectDataSource();
dataSource.getId();
Assert.assertEquals(4, dataSource.getFilters().size());
Assert.assertEquals(4, dataSource.getProxyFilters().size());
Assert.assertEquals(4, dataSource.getFilterClasses().length);
Assert.assertNotNull(dataSource.getCreatedTime());
Assert.assertTrue(dataSource.getCreatedTime().getTime() != 0);
src/test/java/com/alibaba/druid/pool/benckmark/Case3.java
+9 -11
View File
@@ -33,7 +33,7 @@ public class Case3 extends TestCase {
private String validationQuery = "SELECT 1"; // "SELECT 1";
private int threadCount = 10;
private int TEST_COUNT = 3;
final int LOOP_COUNT = 1000 * 100;
final int LOOP_COUNT = 1000 * 1000;
private boolean testOnBorrow = false;
private String connectionProperties = ""; // "bigStringTryClob=true;clientEncoding=GBK;defaultRowPrefetch=50;serverEncoding=ISO-8859-1";
private String sql = "SELECT 1";
@@ -41,16 +41,16 @@ public class Case3 extends TestCase {
private long minEvictableIdleTimeMillis = 60000;
protected void setUp() throws Exception {
// jdbcUrl = "jdbc:fake:dragoon_v25masterdb";
// user = "dragoon25";
// password = "dragoon25";
// driverClass = "com.alibaba.druid.mock.MockDriver";
jdbcUrl = "jdbc:fake:dragoon_v25masterdb";
user = "dragoon25";
password = "dragoon25";
driverClass = "com.alibaba.druid.mock.MockDriver";
// connectionProperties = "connectSleep=3;executeSleep=1";
jdbcUrl = "jdbc:mysql://10.20.153.104:3306/druid2";
user = "root";
password = "root";
driverClass = "com.mysql.jdbc.Driver";
// jdbcUrl = "jdbc:mysql://10.20.153.104:3306/druid2";
// user = "root";
// password = "root";
// driverClass = "com.mysql.jdbc.Driver";
}
public void test_perf() throws Exception {
@@ -165,8 +165,6 @@ public class Case3 extends TestCase {
rs.close();
stmt.close();
Thread.sleep(1);
conn.close();
count.incrementAndGet();
}