[jboss-svn-commits] JBL Code SVN: r31829 - in labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance: resource and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 24 10:06:12 EST 2010
Author: whitingjr
Date: 2010-02-24 10:06:12 -0500 (Wed, 24 Feb 2010)
New Revision: 31829
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/HibernateNativeTest.java
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTask.java
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTest.java
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeResourcesTest.java
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/task/RecursiveTask.java
Log:
Added connection handling. Can now bypass the connection pool.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/HibernateNativeTest.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/HibernateNativeTest.java 2010-02-24 15:05:14 UTC (rev 31828)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/HibernateNativeTest.java 2010-02-24 15:06:12 UTC (rev 31829)
@@ -26,13 +26,14 @@
import org.jboss.jbossts.performance.MultiThreadedTest;
import org.jboss.jbossts.performance.configuration.JPAConfiguration;
import org.jboss.jbossts.performance.configuration.MultithreadedTestConfiguration;
+import org.jboss.jbossts.performance.task.pooling.PooledConnectionHandler;
public class HibernateNativeTest extends MultiThreadedTest
{
@Override
public Runnable getTask(final MultithreadedTestConfiguration taskConfiguration) throws Exception
{
- return new HibernateNativeTask(new JPAConfiguration(getDataSourceA(), getDataSourceB(), getUserTransaction(), getEntityManagerFactory(), getEntityManagerFactoryB(), taskConfiguration.getIterationCount(), this.isOptionalWriteEnabled, NDC.cloneStack(), taskConfiguration));
+ return new HibernateNativeTask(new JPAConfiguration(new PooledConnectionHandler(getDataSourceA(), getDataSourceB()), getUserTransaction(), getEntityManagerFactory(), getEntityManagerFactoryB(), taskConfiguration.getIterationCount(), this.isOptionalWriteEnabled, NDC.cloneStack(), taskConfiguration));
}
@Override
protected boolean isMultiResourceTest()
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTask.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTask.java 2010-02-24 15:05:14 UTC (rev 31828)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTask.java 2010-02-24 15:06:12 UTC (rev 31829)
@@ -26,7 +26,6 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Types;
import org.apache.commons.dbutils.DbUtils;
import org.jboss.jbossts.performance.configuration.JPAConfiguration;
@@ -66,7 +65,7 @@
try
{
getTaskConfiguration().getUserTransaction().begin();
- connectionA = getTaskConfiguration().getDataSourceA().getConnection();
+ connectionA = getTaskConfiguration().getConnectionHandler().getConnectionA();
pStatementARead = connectionA.prepareStatement("select user0_.USER_ID , user0_.CREATED , user0_.DEFAULT_BILLING_DETAILS_ID , user0_.EMAIL , user0_.FIRSTNAME , user0_.HOME_CITY , user0_.HOME_STREET as HOME6_4_1_, user0_.HOME_ZIPCODE , user0_.LASTNAME , user0_.PASSWD , user0_.RANK , user0_.USERNAME , user0_.OBJ_VERSION , user0_1_.CITY , user0_1_.STREET , user0_1_.ZIPCODE , addressent1_.ADDRESS_ID , addressent1_.CITY , addressent1_.STREET , addressent1_.OBJ_VERSION , addressent1_.ZIPCODE from USERS user0_ left outer join BILLING_ADDRESS user0_1_ on user0_.USER_ID=user0_1_.USER_ID left outer join ADDRESS addressent1_ on user0_.USER_ID=addressent1_.ADDRESS_ID where user0_.USER_ID=?");
resultA = findUsingResourceA(pStatementARead, this.getTaskConfiguration().getTestConfiguration().getThreadIdentity());
Assert.assertTrue(resultA.next());
@@ -83,11 +82,10 @@
DbUtils.closeQuietly(resultA);
DbUtils.closeQuietly(pStatementARead) ;
DbUtils.closeQuietly(pStatementAWrite);
- DbUtils.closeQuietly(connectionA);
}
try
{
- connectionB= getTaskConfiguration().getDataSourceB().getConnection();
+ connectionB= getTaskConfiguration().getConnectionHandler().getConnectionB();
pStatementBRead = connectionB.prepareStatement("select user0_.USER_ID , user0_.CREATED , user0_.DEFAULT_BILLING_DETAILS_ID , user0_.EMAIL , user0_.FIRSTNAME , user0_.HOME_CITY , user0_.HOME_STREET as HOME6_4_1_, user0_.HOME_ZIPCODE , user0_.LASTNAME , user0_.PASSWD , user0_.RANK , user0_.USERNAME , user0_.OBJ_VERSION , user0_1_.CITY , user0_1_.STREET , user0_1_.ZIPCODE , addressent1_.ADDRESS_ID , addressent1_.CITY , addressent1_.STREET , addressent1_.OBJ_VERSION , addressent1_.ZIPCODE from USERS user0_ left outer join BILLING_ADDRESS user0_1_ on user0_.USER_ID=user0_1_.USER_ID left outer join ADDRESS addressent1_ on user0_.USER_ID=addressent1_.ADDRESS_ID where user0_.USER_ID=?");
resultB = findUsingResourceB(pStatementBRead, this.getTaskConfiguration().getTestConfiguration().getThreadIdentity());
Assert.assertTrue(resultB.next());
@@ -102,7 +100,6 @@
DbUtils.closeQuietly(resultB);
DbUtils.closeQuietly(pStatementBRead) ;
DbUtils.closeQuietly(pStatementBWrite);
- DbUtils.closeQuietly(connectionB);
}
}
finally
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTest.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTest.java 2010-02-24 15:05:14 UTC (rev 31828)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTest.java 2010-02-24 15:06:12 UTC (rev 31829)
@@ -26,6 +26,7 @@
import org.jboss.jbossts.performance.MultiThreadedTest;
import org.jboss.jbossts.performance.configuration.JPAConfiguration;
import org.jboss.jbossts.performance.configuration.MultithreadedTestConfiguration;
+import org.jboss.jbossts.performance.task.pooling.RawConnection;
/**
* This class creates an instance of the underlying task.
@@ -38,7 +39,7 @@
@Override
public Runnable getTask(final MultithreadedTestConfiguration taskConfiguration) throws Exception
{
- return new JDBCTask(new JPAConfiguration(getDataSourceA(), getDataSourceB(), getUserTransactionA(), getEntityManagerFactory(), getEntityManagerFactoryB(), taskConfiguration.getIterationCount(), this.isOptionalWriteEnabled, NDC.cloneStack(), taskConfiguration));
+ return new JDBCTask(new JPAConfiguration(new RawConnection(getDataSourceA(), getDataSourceB()), getUserTransactionA(), getEntityManagerFactory(), getEntityManagerFactoryB(), taskConfiguration.getIterationCount(), this.isOptionalWriteEnabled, NDC.cloneStack(), taskConfiguration));
}
@Override
protected boolean isMultiResourceTest()
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeResourcesTest.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeResourcesTest.java 2010-02-24 15:05:14 UTC (rev 31828)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeResourcesTest.java 2010-02-24 15:06:12 UTC (rev 31829)
@@ -26,6 +26,7 @@
import org.jboss.jbossts.performance.MultiThreadedTest;
import org.jboss.jbossts.performance.configuration.JPAConfiguration;
import org.jboss.jbossts.performance.configuration.MultithreadedTestConfiguration;
+import org.jboss.jbossts.performance.task.pooling.PooledConnectionHandler;
/**
* This is in all intents and purposes has ended up being a factory.
@@ -38,7 +39,7 @@
public Runnable getTask(final MultithreadedTestConfiguration taskConfiguration)
throws Exception
{
- return new SynchronizeTask(new JPAConfiguration(getDataSourceA(), getDataSourceB(), getUserTransaction(), getEntityManagerFactory(), getEntityManagerFactoryB(), taskConfiguration.getIterationCount(), this.isOptionalWriteEnabled, NDC.cloneStack(), taskConfiguration));
+ return new SynchronizeTask(new JPAConfiguration(new PooledConnectionHandler(getDataSourceA(), getDataSourceB()), getUserTransaction(), getEntityManagerFactory(), getEntityManagerFactoryB(), taskConfiguration.getIterationCount(), this.isOptionalWriteEnabled, NDC.cloneStack(), taskConfiguration));
}
@Override
protected boolean isMultiResourceTest()
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/task/RecursiveTask.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/task/RecursiveTask.java 2010-02-24 15:05:14 UTC (rev 31828)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/task/RecursiveTask.java 2010-02-24 15:06:12 UTC (rev 31829)
@@ -22,8 +22,10 @@
package org.jboss.jbossts.performance.task;
+import java.sql.SQLException;
import java.util.Stack;
+import org.apache.commons.dbutils.DbUtils;
import org.apache.commons.lang.mutable.MutableLong;
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
@@ -123,8 +125,27 @@
logger.error(String.format("Failed profiled run of testbody for thread [%1$d] count [%2$d].", this.taskConfiguration.getTestConfiguration().getThreadIdentity(), i ));
Assert.fail(e.getMessage(), e);
}
+ finally
+ {
+ try
+ {
+ DbUtils.closeQuietly(this.taskConfiguration.getConnectionHandler().getConnectionA());
+ }
+ catch (SQLException sqlexception)
+ {
+ logger.warn(sqlexception.getMessage(), sqlexception);
+ }
+ try
+ {
+ DbUtils.closeQuietly(this.taskConfiguration.getConnectionHandler().getConnectionB());
+ }
+ catch (SQLException sqlexception)
+ {
+ logger.warn(sqlexception.getMessage(), sqlexception);
+ }
+ }
}
- return returnValue ;
+ return returnValue;
}
public JPAConfiguration getTaskConfiguration()
{
More information about the jboss-svn-commits
mailing list