You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ps...@apache.org on 2011/06/01 08:33:46 UTC
svn commit: r1130014 - in /commons/sandbox/performance/trunk: pom.xml
src/dbcp/build.properties.sample src/dbcp/build.xml src/dbcp/config-dbcp.xml
Author: psteitz
Date: Wed Jun 1 06:33:46 2011
New Revision: 1130014
URL: http://svn.apache.org/viewvc?rev=1130014&view=rev
Log:
Added support for dbcp2 and tomcat-jdbc-pool.
Modified:
commons/sandbox/performance/trunk/pom.xml
commons/sandbox/performance/trunk/src/dbcp/build.properties.sample
commons/sandbox/performance/trunk/src/dbcp/build.xml
commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml
Modified: commons/sandbox/performance/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/pom.xml?rev=1130014&r1=1130013&r2=1130014&view=diff
==============================================================================
--- commons/sandbox/performance/trunk/pom.xml (original)
+++ commons/sandbox/performance/trunk/pom.xml Wed Jun 1 06:33:46 2011
@@ -65,11 +65,6 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
<version>2.2</version>
</dependency>
@@ -84,6 +79,23 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+
+ <!-- Unpublished snapshot dependencies - must be built and installed locally -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jdbc-pool</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
Modified: commons/sandbox/performance/trunk/src/dbcp/build.properties.sample
URL: http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/dbcp/build.properties.sample?rev=1130014&r1=1130013&r2=1130014&view=diff
==============================================================================
--- commons/sandbox/performance/trunk/src/dbcp/build.properties.sample (original)
+++ commons/sandbox/performance/trunk/src/dbcp/build.properties.sample Wed Jun 1 06:33:46 2011
@@ -16,13 +16,24 @@
# limitations under the License.
###############################################################################
-# Remote maven repository
+# Remote maven repository (used to download dependencies not provided below)
mavenRepo=http://repo1.maven.org/maven2
+# Local maven repo (not needed if full paths are provided below)
+localMavenRepo=${user.home}/.m2/repository
+
# JDBC driver
-jdbc-jar=../../mysql/mysql-connector-java-5.0.2.jar
+# Uncomment to use a real mysql database
+#jdbc-jar=${localMavenRepo}/mysql/mysql-connector-java/5.0.2/mysql-connector-java-5.0.2.jar
+# DBCP mocks - no real database access or latency. Build from source using "ant mock-jar" from DBCP trunk.
+jdbc-jar=./commons-dbcp2-2.0-SNAPSHOT-mocks.jar
+
# Replace with full path to versions of pool, dbcp jars you want to test with
-pool-jar=../../.m2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar
-dbcp-jar=../../.m2/repository/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar
+pool-jar=${localMavenRepo}/commons-pool/commons-pool/1.5.6/commons-pool-1.5.6.jar
+dbcp-jar=${localMavenRepo}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar
+pool2-jar=${localMavenRepo}/org/apache/commons/commons-pool2/2.0-SNAPSHOT/commons-pool2-2.0-SNAPSHOT.jar
+dbcp2-jar=${localMavenRepo}/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-2.0-SNAPSHOT.jar
+tomcat-jdbc-jar=${localMavenRepo}/org/apache/tomcat/jdbc-pool/1.2-SNAPSHOT/jdbc-pool-1.2-SNAPSHOT.jar
+tomcat-juli-jar=${localMavenRepo}/org/apache/tomcat/juli/6.0.32/juli-6.0.32.jar
Modified: commons/sandbox/performance/trunk/src/dbcp/build.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/dbcp/build.xml?rev=1130014&r1=1130013&r2=1130014&view=diff
==============================================================================
--- commons/sandbox/performance/trunk/src/dbcp/build.xml (original)
+++ commons/sandbox/performance/trunk/src/dbcp/build.xml Wed Jun 1 06:33:46 2011
@@ -32,6 +32,8 @@
<pathelement location="${jdbc-jar}"/>
<pathelement location="${pool-jar}"/>
<pathelement location="${dbcp-jar}"/>
+ <pathelement location="${pool2-jar}"/>
+ <pathelement location="${dbcp2-jar}"/>
<pathelement location="${tomcat-jdbc-jar}"/>
<pathelement location="${tomcat-juli-jar}"/>
<fileset dir="${lib}">
Modified: commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml?rev=1130014&r1=1130013&r2=1130014&view=diff
==============================================================================
--- commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml (original)
+++ commons/sandbox/performance/trunk/src/dbcp/config-dbcp.xml Wed Jun 1 06:33:46 2011
@@ -21,16 +21,16 @@
<configuration>
<database>
- <driver>com.mysql.jdbc.Driver</driver>
- <url>jdbc:mysql:///test</url>
- <username></username>
- <password></password>
+ <driver>org.apache.commons.dbcp2.TesterDriver</driver>
+ <url>jdbc:apache:commons:testdriver</url>
+ <username>username</username>
+ <password>password</password>
<!-- no-op, integerIndexed, integerScan, or textScan -->
<query-type>integerIndexed</query-type>
</database>
- <!-- BasicDataSource or PoolingDataSource -->
- <datasource-type>PoolingDataSource</datasource-type>
+ <!-- BasicDataSource, BasicDataSource2, PoolingDataSource or tomcat-jdbc-pool -->
+ <datasource-type>BasicDataSource2</datasource-type>
<connection-factory>
<!-- DriverManager or Driver -->
@@ -38,7 +38,7 @@
<auto-commit>true</auto-commit>
<read-only>false</read-only>
<!-- Validation query to use when testOnBorrow or testOnReturn is true -->
- <validation-query>SELECT 1</validation-query>
+ <validation-query>SELECT DUMMY FROM DUAL</validation-query>
</connection-factory>
<poolable-connection-factory>
@@ -73,9 +73,9 @@
</abandoned-config>
<run>
- <iterations>10000</iterations>
- <clients>800</clients>
- <delay-min>200</delay-min>
+ <iterations>1000</iterations>
+ <clients>50</clients>
+ <delay-min>50</delay-min>
<delay-max>1000</delay-max>
<delay-sigma>50</delay-sigma>
<!-- constant, gaussian, or poisson -->