From c83b8da859f573c7dc2443cf6dd5a38da1f030f5 Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 13 Jul 2011 02:40:44 +0000 Subject: [PATCH] git-svn-id: http://code.alibabatech.com/svn/druid/trunk@394 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../alibaba/druid/pool/DruidAbstractDataSource.java | 3 ++- .../java/com/alibaba/druid/pool/benckmark/Case3.java | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 5e79f4dd68..a1b784b087 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -545,7 +545,8 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource } if (connectionProperties == null) { - throw new NullPointerException("connectionProperties is null"); + this.connectionProperties.clear(); + return; } String[] entries = connectionProperties.split(";"); diff --git a/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java b/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java index c64019fb78..e0a0a5dd4f 100644 --- a/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java +++ b/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java @@ -25,11 +25,12 @@ public class Case3 extends TestCase { private int maxActive = 50; private int maxWait = -1; private String validationQuery = null; // "SELECT 1"; - private int threadCount = 5; + private int threadCount = 40; private int TEST_COUNT = 3; - final int LOOP_COUNT = 1000 * 1000; + final int LOOP_COUNT = 1000 * 10; private boolean testOnBorrow = false; - private String connectionProperties = "bigStringTryClob=true;clientEncoding=GBK;defaultRowPrefetch=50;serverEncoding=ISO-8859-1"; + private String connectionProperties = ""; //"bigStringTryClob=true;clientEncoding=GBK;defaultRowPrefetch=50;serverEncoding=ISO-8859-1"; + private String sql = "SELECT 1"; protected void setUp() throws Exception { // jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; @@ -45,7 +46,7 @@ public class Case3 extends TestCase { public void test_perf() throws Exception { for (int i = 0; i < 10; ++i) { druid(); - // dbcp(); + dbcp(); } } @@ -109,7 +110,7 @@ public class Case3 extends TestCase { for (int i = 0; i < LOOP_COUNT; ++i) { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery("SELECT 1"); + ResultSet rs = stmt.executeQuery(sql); while (rs.next()) { rs.getInt(1); }