support maxEvictableIdleTimeMillis

src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest.java

@@ -0,0 +1,86 @@
+package com.alibaba.druid.bvt.pool.basic;
+
+import java.sql.Connection;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.pool.GetConnectionTimeoutException;
+import com.alibaba.druid.util.JdbcUtils;
+
+import junit.framework.TestCase;
+
+public class MaxEvictableIdleTimeMillisTest extends TestCase {
+
+    private DruidDataSource dataSource;
+
+    protected void setUp() throws Exception {
+        dataSource = new DruidDataSource();
+        dataSource.setUrl("jdbc:mock:xxx");
+        dataSource.setTestOnBorrow(false);
+        dataSource.setMaxActive(50);
+        dataSource.setMinIdle(5);
+        dataSource.setMinEvictableIdleTimeMillis(10);
+        dataSource.setMaxEvictableIdleTimeMillis(100);
+        dataSource.setMaxWait(20);
+        dataSource.init();
+    }
+
+    protected void tearDown() throws Exception {
+        dataSource.close();
+    }
+
+    public void test_error() throws Exception {
+        Exception error = null;
+        try {
+            dataSource.setMaxEvictableIdleTimeMillis(1);
+        } catch (Exception ex) {
+            error = ex;
+        }
+        Assert.assertNotNull(error);
+        Assert.assertEquals(100, dataSource.getMaxEvictableIdleTimeMillis());
+    }
+    
+    public void test_error2() throws Exception {
+        Exception error = null;
+        try {
+            dataSource.setMaxEvictableIdleTimeMillis(1);
+        } catch (Exception ex) {
+            error = ex;
+        }
+        Assert.assertNotNull(error);
+        Assert.assertEquals(100, dataSource.getMaxEvictableIdleTimeMillis());
+    }
+
+    public void test_max() throws Exception {
+        connect(10);
+
+        Assert.assertEquals(10, dataSource.getPoolingCount());
+        Thread.sleep(20);
+        dataSource.shrink(true);
+        Assert.assertEquals(5, dataSource.getPoolingCount());
+
+        Thread.sleep(100);
+        dataSource.shrink(true);
+        Assert.assertEquals(0, dataSource.getPoolingCount());
+    }
+
+    public int connect(int count) throws Exception {
+        int successCount = 0;
+        Connection[] connections = new Connection[count];
+        for (int i = 0; i < count; ++i) {
+            try {
+                connections[i] = dataSource.getConnection();
+                successCount++;
+            } catch (GetConnectionTimeoutException e) {
+                // skip
+            }
+        }
+
+        for (int i = 0; i < count; ++i) {
+            JdbcUtils.close(connections[i]);
+        }
+
+        return successCount;
+    }
+}

src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java

@@ -0,0 +1,49 @@
+package com.alibaba.druid.bvt.pool.basic;
+
+import java.sql.Connection;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.pool.GetConnectionTimeoutException;
+import com.alibaba.druid.util.JdbcUtils;
+
+import junit.framework.TestCase;
+
+public class MaxEvictableIdleTimeMillisTest2 extends TestCase {
+
+    private DruidDataSource dataSource;
+
+    protected void setUp() throws Exception {
+        dataSource = new DruidDataSource();
+        dataSource.setUrl("jdbc:mock:xxx");
+        dataSource.setTestOnBorrow(false);
+        dataSource.setMaxActive(50);
+        dataSource.setMinIdle(5);
+        
+
+    }
+
+    protected void tearDown() throws Exception {
+        dataSource.close();
+    }
+
+    public void test_error() throws Exception {
+        Exception error = null;
+        try {
+            dataSource.setMinEvictableIdleTimeMillis(20);
+            dataSource.setMaxEvictableIdleTimeMillis(30);
+            dataSource.setMinEvictableIdleTimeMillis(100);
+            dataSource.setMaxWait(20);
+            dataSource.init();
+        } catch (Exception ex) {
+            error = ex;
+            ex.printStackTrace();
+        }
+        Assert.assertNotNull(error);
+        Assert.assertTrue(dataSource.isInited());
+        Assert.assertEquals(30, dataSource.getMaxEvictableIdleTimeMillis());
+    }
+    
+   
+}

src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java

@@ -33,7 +33,7 @@ public class MaxActiveChangeTest extends TestCase {
         dataSource.setUrl("jdbc:mock:xxx");
         dataSource.setTestOnBorrow(false);
         dataSource.setMaxActive(3);
-        dataSource.setMinIdle(1);
+        dataSource.setMinIdle(2);
         dataSource.setMinEvictableIdleTimeMillis(1000 * 60 * 5);
         dataSource.setMaxWait(20);
         dataSource.init();
@@ -61,44 +61,45 @@ public class MaxActiveChangeTest extends TestCase {
             Assert.assertEquals(3, dataSource.getPoolingCount());
         }
 
-        dataSource.setMaxActive(4);
+        dataSource.setMaxActive(5);
 
         for (int i = 0; i < 10; ++i) {
-            Assert.assertEquals(4, connect(4));
-            Assert.assertEquals(4, dataSource.getPoolingCount());
+            Assert.assertEquals(5, connect(5));
+            Assert.assertEquals(5, dataSource.getPoolingCount());
         }
 
         dataSource.shrink();
-        Assert.assertEquals(1, dataSource.getPoolingCount());
+        Assert.assertEquals(2, dataSource.getPoolingCount());
 
         for (int i = 0; i < 10; ++i) {
-            Assert.assertEquals(4, connect(4));
-            Assert.assertEquals(4, dataSource.getPoolingCount());
+            Assert.assertEquals(5, connect(5));
+            Assert.assertEquals(5, dataSource.getPoolingCount());
         }
 
-        Assert.assertEquals(4, dataSource.getPoolingCount());
+        Assert.assertEquals(5, dataSource.getPoolingCount());
         dataSource.setMaxActive(3);
 
-        Assert.assertEquals(4, dataSource.getPoolingCount());
+        Assert.assertEquals(5, dataSource.getPoolingCount());
 
         dataSource.shrink();
-        Assert.assertEquals(1, dataSource.getPoolingCount());
+        Assert.assertEquals(2, dataSource.getPoolingCount());
 
         // 确保收缩之后不会再长上去
         for (int i = 0; i < 10; ++i) {
-            Assert.assertEquals(3, connect(4));
+            Assert.assertEquals(3, connect(5));
             Assert.assertEquals(3, dataSource.getPoolingCount());
         }
 
         dataSource.setMaxActive(2);
         dataSource.shrink();
-        Assert.assertEquals(1, dataSource.getPoolingCount());
+        Assert.assertEquals(2, dataSource.getPoolingCount());
 
         for (int i = 0; i < 10; ++i) {
             Assert.assertEquals(2, connect(3));
             Assert.assertEquals(2, dataSource.getPoolingCount());
         }
 
+        dataSource.setMinIdle(1);
         dataSource.setMaxActive(1);
         dataSource.shrink();
         Assert.assertEquals(1, dataSource.getPoolingCount());

src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest2.java

@@ -0,0 +1,33 @@
+package com.alibaba.druid.bvt.sql.schemaStat;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.parser.SQLParserUtils;
+import com.alibaba.druid.sql.parser.SQLStatementParser;
+import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
+import com.alibaba.druid.util.JdbcConstants;
+
+import junit.framework.TestCase;
+
+public class SchemaStatTest2 extends TestCase {
+    public void test_schemaStat() throws Exception {
+        String sql = "select "
+                + " create_time_dd          as  来电日期"
+                + " from alisec_app.adl_tb_wing_rubbish_laidian_new_reason_realname_fdt  "
+                + " order by   来电日期  desc  limit  30;";
+        
+        
+        String dbType = JdbcConstants.MYSQL;
+        SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType);
+        SQLStatement stmt = parser.parseStatementList().get(0);
+        
+        SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(dbType);
+        stmt.accept(statVisitor);
+        
+        System.out.println(statVisitor.getColumns());
+        
+        Assert.assertEquals(1, statVisitor.getColumns().size());
+    }
+}