From 52e3b36c5f53287ba5e2572385385fd51ef88441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Sun, 22 Sep 2019 21:11:14 +0800 Subject: [PATCH] remove proxool testcase --- pom.xml | 12 - .../alibaba/druid/benckmark/pool/Case0.java | 21 -- .../alibaba/druid/benckmark/pool/Case1.java | 21 -- .../alibaba/druid/benckmark/pool/Case4.java | 287 ------------------ .../alibaba/druid/pool/bonecp/TestLRU.java | 18 +- .../druid/pool/bonecp/TestPSCache.java | 16 - 6 files changed, 1 insertion(+), 374 deletions(-) delete mode 100644 src/test/java/com/alibaba/druid/benckmark/pool/Case4.java diff --git a/pom.xml b/pom.xml index 2306d81326..9015c977eb 100644 --- a/pom.xml +++ b/pom.xml @@ -617,18 +617,6 @@ 0.8.0.RELEASE test - - proxool - proxool - 0.9.1 - test - - - proxool - proxool-cglib - 0.9.1 - test - c3p0 diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java index 286386dd12..618b560655 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java @@ -25,7 +25,6 @@ import javax.sql.DataSource; import junit.framework.TestCase; import org.apache.commons.dbcp.BasicDataSource; -import org.logicalcobwebs.proxool.ProxoolDataSource; import com.alibaba.druid.TestUtil; import com.alibaba.druid.pool.DruidDataSource; @@ -147,27 +146,7 @@ public class Case0 extends TestCase { } System.out.println(); } - - public void f_test_proxool() throws Exception { - ProxoolDataSource dataSource = new ProxoolDataSource(); - // dataSource.(10); - // dataSource.setMaxActive(50); - dataSource.setMinimumConnectionCount(minIdle); - dataSource.setMaximumConnectionCount(maxIdle); - dataSource.setDriver(driverClass); - dataSource.setDriverUrl(jdbcUrl); - // dataSource.setPoolPreparedStatements(true); - // dataSource.setMaxOpenPreparedStatements(100); - dataSource.setUser(user); - dataSource.setPassword(password); - - for (int i = 0; i < LOOP_COUNT; ++i) { - p0(dataSource, "proxool"); - } - System.out.println(); - } - public void f_test_tomcat_jdbc() throws Exception { org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource(); // dataSource.(10); diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java index 64cc32ad37..0441d426cc 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java @@ -30,7 +30,6 @@ import javax.sql.DataSource; import junit.framework.TestCase; import org.apache.commons.dbcp.BasicDataSource; -import org.logicalcobwebs.proxool.ProxoolDataSource; import com.alibaba.druid.TestUtil; import com.alibaba.druid.mock.MockDriver; @@ -204,26 +203,6 @@ public class Case1 extends TestCase { System.out.println(); } - public void test_proxool() throws Exception { - ProxoolDataSource dataSource = new ProxoolDataSource(); - // dataSource.(10); - // dataSource.setMaxActive(50); - dataSource.setMinimumConnectionCount(minPoolSize); - dataSource.setMaximumConnectionCount(maxPoolSize); - - dataSource.setDriver(driverClass); - dataSource.setDriverUrl(jdbcUrl); - // dataSource.setPoolPreparedStatements(true); - // dataSource.setMaxOpenPreparedStatements(100); - dataSource.setUser(user); - dataSource.setPassword(password); - - for (int i = 0; i < loopCount; ++i) { - p0(dataSource, "proxool", threadCount); - } - System.out.println(); - } - public void test_tomcat_jdbc() throws Exception { org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource(); // dataSource.(10); diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case4.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case4.java deleted file mode 100644 index 6176a7ddc2..0000000000 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case4.java +++ /dev/null @@ -1,287 +0,0 @@ -/* - * Copyright 1999-2018 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.benckmark.pool; - -import java.lang.management.ManagementFactory; -import java.lang.management.ThreadInfo; -import java.text.NumberFormat; -import java.util.concurrent.CountDownLatch; - -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; -import org.logicalcobwebs.proxool.ProxoolDataSource; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.benckmark.pool.model.TableOperator; -import com.alibaba.druid.pool.DruidDataSource; -import com.jolbox.bonecp.BoneCPDataSource; -import com.mchange.v2.c3p0.ComboPooledDataSource; -import com.taobao.datasource.LocalTxDataSourceDO; -import com.taobao.datasource.TaobaoDataSourceFactory; -import com.taobao.datasource.resource.adapter.jdbc.local.LocalTxDataSource; - -/** - * 测试各个连接池在进行批量插入时操作的性能 - * - * @author yunnysunny[yunnysunny@gmail.com] 2013-3-18 下午01:11:40 - */ -public class Case4 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int initialSize = 10; - private int minPoolSize = 10; - private int maxPoolSize = 50; - private int maxActive = 50; - private String validationQuery = "SELECT 1"; - private int maxOpenPreparedStatements = 100; - private int threadCount = 5; - private int loopCount = 10; - final int LOOP_COUNT = 100 * 1 * 1 / threadCount; - - protected void setUp() throws Exception { - user = "root"; - password = "aaaaaaaa"; - - jdbcUrl = "jdbc:mysql://localhost:3306/dragoon_v25_masterdb"; - driverClass = "com.mysql.jdbc.Driver"; - } - - public void test_druid() throws Exception { - DruidDataSource dataSource = new DruidDataSource(); - - dataSource.setInitialSize(initialSize); - dataSource.setMaxActive(maxActive); - dataSource.setMinIdle(minPoolSize); - dataSource.setMaxIdle(maxPoolSize); - dataSource.setPoolPreparedStatements(true); - dataSource.setDriverClassName(driverClass); - dataSource.setUrl(jdbcUrl); - dataSource.setPoolPreparedStatements(true); - dataSource.setMaxOpenPreparedStatements(maxOpenPreparedStatements); - dataSource.setUsername(user); - dataSource.setPassword(password); - dataSource.setValidationQuery(validationQuery); - dataSource.setTestOnBorrow(false); - - for (int i = 0; i < loopCount; ++i) { - p0(dataSource, "druid", threadCount); - } - System.out.println(); - } - - public void test_jobss() throws Exception { - LocalTxDataSourceDO dataSourceDO = new LocalTxDataSourceDO(); - dataSourceDO.setBlockingTimeoutMillis(1000 * 60); - dataSourceDO.setMaxPoolSize(maxPoolSize); - dataSourceDO.setMinPoolSize(minPoolSize); - - dataSourceDO.setDriverClass(driverClass); - dataSourceDO.setConnectionURL(jdbcUrl); - dataSourceDO.setUserName(user); - dataSourceDO.setPassword(password); - - LocalTxDataSource tx = TaobaoDataSourceFactory.createLocalTxDataSource(dataSourceDO); - DataSource dataSource = tx.getDatasource(); - - for (int i = 0; i < loopCount; ++i) { - p0(dataSource, "jboss-datasource", threadCount); - } - System.out.println(); - } - - public void test_dbcp() throws Exception { - final BasicDataSource dataSource = new BasicDataSource(); - - dataSource.setInitialSize(initialSize); - dataSource.setMaxActive(maxActive); - dataSource.setMinIdle(minPoolSize); - dataSource.setMaxIdle(maxPoolSize); - dataSource.setPoolPreparedStatements(true); - dataSource.setDriverClassName(driverClass); - dataSource.setUrl(jdbcUrl); - dataSource.setPoolPreparedStatements(true); - dataSource.setMaxOpenPreparedStatements(maxOpenPreparedStatements); - dataSource.setUsername(user); - dataSource.setPassword(password); - dataSource.setValidationQuery("SELECT 1"); - dataSource.setTestOnBorrow(false); - - for (int i = 0; i < loopCount; ++i) { - p0(dataSource, "dbcp", threadCount); - } - System.out.println(); - } - - public void test_bonecp() throws Exception { - BoneCPDataSource dataSource = new BoneCPDataSource(); - // dataSource.(10); - // dataSource.setMaxActive(50); - dataSource.setMinConnectionsPerPartition(minPoolSize); - dataSource.setMaxConnectionsPerPartition(maxPoolSize); - - dataSource.setDriverClass(driverClass); - dataSource.setJdbcUrl(jdbcUrl); - dataSource.setStatementsCacheSize(maxOpenPreparedStatements); - dataSource.setServiceOrder("LIFO"); - // dataSource.setMaxOpenPreparedStatements(100); - dataSource.setUsername(user); - dataSource.setPassword(password); - // dataSource.setConnectionTestStatement("SELECT 1"); - dataSource.setPartitionCount(1); - dataSource.setAcquireIncrement(5); - dataSource.setIdleConnectionTestPeriod(0L); - // dataSource.setDisableConnectionTracking(true); - - for (int i = 0; i < loopCount; ++i) { - p0(dataSource, "boneCP", threadCount); - } - System.out.println(); - } - - public void test_c3p0() throws Exception { - ComboPooledDataSource dataSource = new ComboPooledDataSource(); - // dataSource.(10); - // dataSource.setMaxActive(50); - dataSource.setMinPoolSize(minPoolSize); - dataSource.setMaxPoolSize(maxPoolSize); - - dataSource.setDriverClass(driverClass); - dataSource.setJdbcUrl(jdbcUrl); - dataSource.setMaxStatements(maxOpenPreparedStatements); - - dataSource.setUser(user); - dataSource.setPassword(password); - - for (int i = 0; i < loopCount; ++i) { - p0(dataSource, "c3p0", threadCount); - } - System.out.println(); - } - - public void test_proxool() throws Exception { - ProxoolDataSource dataSource = new ProxoolDataSource(); - // dataSource.(10); - // dataSource.setMaxActive(50); - dataSource.setMinimumConnectionCount(minPoolSize); - dataSource.setMaximumConnectionCount(maxPoolSize); - - dataSource.setDriver(driverClass); - dataSource.setDriverUrl(jdbcUrl); - - dataSource.setUser(user); - dataSource.setPassword(password); - - for (int i = 0; i < loopCount; ++i) { - p0(dataSource, "proxool", threadCount); - } - System.out.println(); - } - - public void test_tomcat_jdbc() throws Exception { - org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource(); - // dataSource.(10); - dataSource.setMaxIdle(maxPoolSize); - dataSource.setMinIdle(minPoolSize); - dataSource.setMaxActive(maxPoolSize); - - dataSource.setDriverClassName(driverClass); - dataSource.setUrl(jdbcUrl); - // dataSource.setPoolPreparedStatements(true); - // dataSource.setMaxOpenPreparedStatements(100); - dataSource.setUsername(user); - dataSource.setPassword(password); - - for (int i = 0; i < loopCount; ++i) { - p0(dataSource, "tomcat-jdbc", threadCount); - } - System.out.println(); - } - - private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { - - final CountDownLatch startLatch = new CountDownLatch(1); - final CountDownLatch endLatch = new CountDownLatch(threadCount); - final CountDownLatch dumpLatch = new CountDownLatch(1); - - Thread[] threads = new Thread[threadCount]; - final TableOperator operator = new TableOperator(); - operator.setDataSource(dataSource); - operator.createTable(); - for (int i = 0; i < threadCount; ++i) { - Thread thread = new Thread() { - - public void run() { - try { - startLatch.await(); - - for (int i = 0; i < LOOP_COUNT; ++i) { - operator.insert(); - } - } catch (Exception ex) { - ex.printStackTrace(); - } - endLatch.countDown(); - - try { - dumpLatch.await(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - }; - threads[i] = thread; - thread.start(); - } - long startMillis = System.currentTimeMillis(); - long startYGC = TestUtil.getYoungGC(); - long startFullGC = TestUtil.getFullGC(); - startLatch.countDown(); - endLatch.await(); - - long[] threadIdArray = new long[threads.length]; - for (int i = 0; i < threads.length; ++i) { - threadIdArray[i] = threads[i].getId(); - } - ThreadInfo[] threadInfoArray = ManagementFactory.getThreadMXBean().getThreadInfo(threadIdArray); - - dumpLatch.countDown(); - operator.dropTable(); - - long blockedCount = 0; - long waitedCount = 0; - for (int i = 0; i < threadInfoArray.length; ++i) { - ThreadInfo threadInfo = threadInfoArray[i]; - blockedCount += threadInfo.getBlockedCount(); - waitedCount += threadInfo.getWaitedCount(); - } - - long millis = System.currentTimeMillis() - startMillis; - long ygc = TestUtil.getYoungGC() - startYGC; - long fullGC = TestUtil.getFullGC() - startFullGC; - - System.out.println("thread " + threadCount + " " + name + " millis : " - + NumberFormat.getInstance().format(millis) + "; YGC " + ygc + " FGC " + fullGC - + " blocked " + NumberFormat.getInstance().format(blockedCount) // - + " waited " + NumberFormat.getInstance().format(waitedCount)); - - } -} diff --git a/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java b/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java index a744c2dae5..3078717683 100644 --- a/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java +++ b/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java @@ -23,7 +23,6 @@ import javax.sql.DataSource; import junit.framework.TestCase; import org.apache.commons.dbcp.BasicDataSource; -import org.logicalcobwebs.proxool.ProxoolDataSource; import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; @@ -80,22 +79,7 @@ public class TestLRU extends TestCase { System.out.println("--------------------------------------------"); } } - - public void f_test_proxool() throws Exception { - ProxoolDataSource ds = new ProxoolDataSource(); - ds.setDriver("com.alibaba.druid.mock.MockDriver"); - ds.setDriverUrl("jdbc:mock:test"); - ds.setMaximumConnectionCount(10); - ds.setMinimumConnectionCount(0); - ds.setUser("user"); - ds.setPassword("password"); - - for (int i = 0; i < 10; ++i) { - f(ds, 5); - System.out.println("--------------------------------------------"); - } - } - + // public void test_jboss() throws Exception { // LocalTxDataSource ds = new LocalTxDataSource(); // ds.setDriverClass("com.alibaba.druid.mock.MockDriver"); diff --git a/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java b/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java index 7f22bb45e9..af75c2a6b7 100644 --- a/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java +++ b/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java @@ -24,7 +24,6 @@ import javax.sql.DataSource; import junit.framework.TestCase; import org.apache.commons.dbcp.BasicDataSource; -import org.logicalcobwebs.proxool.ProxoolDataSource; import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockPreparedStatement; @@ -88,21 +87,6 @@ public class TestPSCache extends TestCase { } } - public void f_test_proxool() throws Exception { - ProxoolDataSource ds = new ProxoolDataSource(); - ds.setDriver("com.alibaba.druid.mock.MockDriver"); - ds.setDriverUrl("jdbc:mock:test"); - ds.setMaximumConnectionCount(10); - ds.setMinimumConnectionCount(0); - ds.setUser("user"); - ds.setPassword("password"); - - for (int i = 0; i < 10; ++i) { - f(ds, 5); - System.out.println("--------------------------------------------"); - } - } - public static void f(DataSource ds, int count) throws Exception { Connection conn = ds.getConnection();