diff --git a/src/main/java/com/alibaba/druid/VERSION.java b/src/main/java/com/alibaba/druid/VERSION.java index 04030f0286..3f28d15a69 100644 --- a/src/main/java/com/alibaba/druid/VERSION.java +++ b/src/main/java/com/alibaba/druid/VERSION.java @@ -18,6 +18,6 @@ package com.alibaba.druid; public interface VERSION { public final static int MajorVersion = 0; - public final static int MinorVersion = 1; - public final static int RevisionVersion = 19; + public final static int MinorVersion = 2; + public final static int RevisionVersion = 0; } diff --git a/src/test/java/com/alibaba/druid/pool/TestMockPerf.java b/src/test/java/com/alibaba/druid/pool/TestMockPerf.java index f2fb094151..e443c1d893 100644 --- a/src/test/java/com/alibaba/druid/pool/TestMockPerf.java +++ b/src/test/java/com/alibaba/druid/pool/TestMockPerf.java @@ -2,6 +2,7 @@ package com.alibaba.druid.pool; import java.sql.Connection; import java.sql.Statement; +import java.util.concurrent.CountDownLatch; import junit.framework.TestCase; @@ -16,24 +17,39 @@ public class TestMockPerf extends TestCase { dataSource.setMinIdle(3); dataSource.setMaxActive(20); dataSource.setDbType("mysql"); - dataSource.setFilters("wall"); + dataSource.setFilters("stat"); dataSource.init(); } public void test_perf() throws Exception { + final CountDownLatch latch = new CountDownLatch(10); for (int i = 0; i < 10; ++i) { - long startMillis = System.currentTimeMillis(); - perf(); - long millis = System.currentTimeMillis() - startMillis; - System.out.println("millis : " + millis); + Thread thread = new Thread() { + public void run() { + try { + long startMillis = System.currentTimeMillis(); + perf(); + long millis = System.currentTimeMillis() - startMillis; + System.out.println("millis : " + millis); + } catch (Exception e) { + e.printStackTrace(); + } finally { + latch.countDown(); + } + } + }; + thread.start(); + } + + latch.await(); } public void perf() throws Exception { for (int i = 0; i < 1000 * 1000; ++i) { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - stmt.execute("SELECT 1"); + stmt.execute("SELECT " + i % 1000); stmt.close(); conn.close(); }