[jboss-svn-commits] JBL Code SVN: r31805 - in labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance: jdbc and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: whitingjr
Date: 2010-02-23 07:19:11 -0500 (Tue, 23 Feb 2010)
New Revision: 31805

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/configuration/JPAConfiguration.java
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTask.java
Log:
Changed to use the user transaction.
Removed duplicated private field.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/configuration/JPAConfiguration.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/configuration/JPAConfiguration.java	2010-02-23 12:09:46 UTC (rev 31804)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/configuration/JPAConfiguration.java	2010-02-23 12:19:11 UTC (rev 31805)
@@ -13,7 +13,6 @@
    private final DataSource dataSourceA;
    private final DataSource dataSourceB;
    private final UserTransaction userTransaction;
-   private final MultithreadedTestConfiguration testConfiguration;
 
    public JPAConfiguration(final DataSource resA, final DataSource resB, final UserTransaction userT ,final EntityManagerFactory sFactoryA, final EntityManagerFactory sFactoryB,  final int iterations, 
          final boolean isOptionalWEnabled, final Stack stack, final MultithreadedTestConfiguration testConf)
@@ -24,7 +23,6 @@
       this.dataSourceA = resA;
       this.dataSourceB = resB;
       this.userTransaction = userT;
-      this.testConfiguration = testConf;
    }
 
    public EntityManagerFactory getEntityManagerFactoryA()

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-23 12:09:46 UTC (rev 31804)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTask.java	2010-02-23 12:19:11 UTC (rev 31805)
@@ -62,9 +62,8 @@
       boolean completed = false;
       try
       {
-         //getTaskConfiguration().getUserTransaction().begin();
+         getTaskConfiguration().getUserTransaction().begin();
          connectionA = getTaskConfiguration().getDataSourceA().getConnection();
-         connectionA.setAutoCommit(false);
          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());
@@ -89,10 +88,8 @@
             pStatementAWrite.setInt(13, version);
             Assert.assertEquals(pStatementAWrite.executeUpdate(), 1) ;
          }
-         connectionA.commit();
          
          connectionB= getTaskConfiguration().getDataSourceB().getConnection();
-         connectionB.setAutoCommit(false);
          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());
@@ -113,7 +110,6 @@
          pStatementBWrite.setInt(12, this.getTaskConfiguration().getTestConfiguration().getThreadIdentity().intValue());
          pStatementBWrite.setInt(13, version);
          Assert.assertEquals(pStatementBWrite.executeUpdate(), 1) ;
-         connectionB.commit();
          
          completed = true;
       }
@@ -129,7 +125,7 @@
          
          DbUtils.closeQuietly(connectionA);
          DbUtils.closeQuietly(connectionB);
-         /*
+         
          if (completed)
          {
             this.getTaskConfiguration().getUserTransaction().commit();
@@ -138,7 +134,7 @@
          {
             getTaskConfiguration().getUserTransaction().rollback();
          }
-         */
+         
       }
    }
    private ResultSet findUsingResourceA(final PreparedStatement preparedStatement, final Long id)