bug fixed sql runningCount & add statLog support

src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java

@@ -5,9 +5,10 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Iterator;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 import com.alibaba.druid.stat.JdbcSqlStat;
@@ -24,6 +25,7 @@ public class TestOnBorrowFileAndNameTest extends TestCase {
         dataSource.setName("com.alibaba.dragoon.monitor");
         dataSource.setMinIdle(0);
         dataSource.setPoolPreparedStatements(false);
+        dataSource.setTestOnBorrow(true);
         dataSource.setValidationQuery("SELECT 1");
         dataSource.setFilters("stat");
 

src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest.java

@@ -0,0 +1,30 @@
+package com.alibaba.druid.bvt.pool;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.util.JdbcUtils;
+
+public class TimeBetweenLogStatsMillisTest extends TestCase {
+
+    private DruidDataSource dataSource;
+
+    protected void setUp() throws Exception {
+        dataSource = new DruidDataSource();
+
+        dataSource.setUrl("jdbc:mock:xxx");
+        dataSource.setTimeBetweenLogStatsMillis(1000);
+        // dataSource.setFilters("log4j");
+    }
+
+    protected void tearDown() throws Exception {
+        JdbcUtils.close(dataSource);
+    }
+
+    public void test_0() throws Exception {
+        dataSource.init();
+        Assert.assertEquals(1000, dataSource.getTimeBetweenLogStatsMillis());
+    }
+}

src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_2.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.proxy.filter;
+
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.Set;
+
+import javax.management.openmbean.TabularData;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.stat.DruidDataSourceStatManager;
+import com.alibaba.druid.stat.JdbcStatManager;
+import com.alibaba.druid.support.json.JSONUtils;
+import com.alibaba.druid.util.JdbcUtils;
+
+public class MergeStatFilterTest_tddl_2 extends TestCase {
+
+    private DruidDataSource dataSource;
+
+    protected void setUp() throws Exception {
+        TabularData sqlList = JdbcStatManager.getInstance().getSqlList();
+        if (sqlList.size() > 0) {
+            for (Object item : JdbcStatManager.getInstance().getSqlList().values()) {
+                String text = JSONUtils.toJSONString(item);
+                System.out.println(text);
+            }
+        }
+        
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+
+        dataSource = new DruidDataSource();
+        dataSource.setUrl("jdbc:mock:xx");
+        dataSource.setFilters("mergeStat");
+        dataSource.setDbType("mysql");
+    }
+
+    protected void tearDown() throws Exception {
+        JdbcUtils.close(dataSource);
+
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+
+    public void test_merge() throws Exception {
+        for (int i = 1000; i < 2000; ++i) {
+            String tableName = "t" + i;
+            String sql = "insert into " + tableName + " (fid, fname) values (?, ?)";
+            Connection conn = dataSource.getConnection();
+
+            Statement stmt = conn.createStatement();
+            stmt.execute(sql);
+            stmt.close();
+
+            conn.close();
+        }
+
+        Assert.assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap().size());
+
+    }
+
+}