[jboss-svn-commits] JBL Code SVN: r31884 - labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc.

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

Author: whitingjr
Date: 2010-03-01 10:38:46 -0500 (Mon, 01 Mar 2010)
New Revision: 31884

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTask.java
Log:
Changed implementation to use abstracted connection handler. This allows runtime behaviour to change using configuration.


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-03-01 15:37:49 UTC (rev 31883)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTask.java	2010-03-01 15:38:46 UTC (rev 31884)
@@ -59,6 +59,7 @@
       ResultSet resultA = null;
       ResultSet resultB = null;
       boolean completed = false;
+      boolean resAOK = false;
       try
       {
          long time = System.currentTimeMillis();
@@ -66,41 +67,51 @@
          {
             getTaskConfiguration().getUserTransaction().begin();
             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=?");
+            //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=?");
+            pStatementARead = connectionA.prepareStatement("SELECT USER_ID , OBJ_VERSION FROM USERS WHERE USER_ID=?");
             resultA = findUsingResourceA(pStatementARead, this.getTaskConfiguration().getTestConfiguration().getThreadIdentity());
             Assert.assertTrue(resultA.next());
-            int version = resultA.getInt(13);
+            //int version = resultA.getInt(13);
+            int version = resultA.getInt(2);
             
             if (this.isOptionalWriteEnabled)
             {
                pStatementAWrite = connectionA.prepareStatement("update USERS set FIRSTNAME=?, OBJ_VERSION=? where USER_ID=? and OBJ_VERSION=?");
                writeUsingResourceA(pStatementAWrite, time, version);
             }
+            resAOK = true;
          }
          finally
          {
             DbUtils.closeQuietly(resultA);
             DbUtils.closeQuietly(pStatementARead) ;
             DbUtils.closeQuietly(pStatementAWrite);
+            this.getTaskConfiguration().getConnectionHandler().closeQuietly(connectionA);
          }
-         try
+         if (resAOK)
          {
-            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());
-            int version = resultB.getInt(13);
-            
-            pStatementBWrite = connectionB.prepareStatement("update USERS set FIRSTNAME=?, OBJ_VERSION=? where USER_ID=? and OBJ_VERSION=?");
-            writeUsingResourceB(pStatementBWrite, time, version);
-            completed = true;
+            try
+            {
+               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=?");
+               pStatementBRead = connectionB.prepareStatement("SELECT USER_ID, OBJ_VERSION FROM USERS WHERE USER_ID=?");
+               resultB = findUsingResourceB(pStatementBRead, this.getTaskConfiguration().getTestConfiguration().getThreadIdentity());
+               Assert.assertTrue(resultB.next());
+               //int version = resultB.getInt(13);
+               int version = resultB.getInt(2);
+               
+               pStatementBWrite = connectionB.prepareStatement("update USERS set FIRSTNAME=?, OBJ_VERSION=? where USER_ID=? and OBJ_VERSION=?");
+               writeUsingResourceB(pStatementBWrite, time, version);
+               completed = true;
+            }
+            finally
+            {
+               DbUtils.closeQuietly(resultB);
+               DbUtils.closeQuietly(pStatementBRead) ;
+               DbUtils.closeQuietly(pStatementBWrite);
+               this.getTaskConfiguration().getConnectionHandler().closeQuietly(connectionB);
+            }
          }
-         finally
-         {
-            DbUtils.closeQuietly(resultB);
-            DbUtils.closeQuietly(pStatementBRead) ;
-            DbUtils.closeQuietly(pStatementBWrite);
-         }
       }
       finally
       {