[jboss-svn-commits] JBL Code SVN: r31326 - 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
jboss-svn-commits at lists.jboss.org
Fri Jan 29 13:54:53 EST 2010
Author: whitingjr
Date: 2010-01-29 13:54:52 -0500 (Fri, 29 Jan 2010)
New Revision: 31326
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/database-locations/embedded-db/resourceA/connection.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTest.java
Log:
Added create flag.
Completed JDBC test.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/database-locations/embedded-db/resourceA/connection.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/database-locations/embedded-db/resourceA/connection.properties 2010-01-29 18:17:01 UTC (rev 31325)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/database-locations/embedded-db/resourceA/connection.properties 2010-01-29 18:54:52 UTC (rev 31326)
@@ -1,6 +1,6 @@
# Resource A
-db-vendor-jdbc-connectionURL.A=jdbc:derby:lib/dbdrivers/${resource.A.db.vendor}/databases/${db-vendor-jdbc-database.A};logDevice=lib/dbdrivers/${resource.A.db.vendor}/logs/${db-vendor-jdbc-database.A}
+db-vendor-jdbc-connectionURL.A=jdbc:derby:lib/dbdrivers/${resource.A.db.vendor}/databases/${db-vendor-jdbc-database.A};logDevice=lib/dbdrivers/${resource.A.db.vendor}/logs/${db-vendor-jdbc-database.A};create=true
db-vendor-jdbc-userName.A=ugg
db-vendor-jdbc-password.A=ugg
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-01-29 18:17:01 UTC (rev 31325)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTest.java 2010-01-29 18:54:52 UTC (rev 31326)
@@ -34,14 +34,10 @@
import org.apache.log4j.NDC;
import org.hibernate.Transaction;
import org.hibernate.ejb.EntityManagerImpl;
-import org.jboss.ejb.plugins.cmp.jdbc2.FindByPrimaryKeyCommand;
import org.jboss.jbossts.performance.MultiThreadedTest;
-import org.jboss.jbossts.performance.resource.SynchronizeTask;
-import org.jboss.jbossts.performance.resource.SynchronizeTask.SessionSynchronization;
import org.jboss.tm.TransactionLocal;
import org.testng.Assert;
-import auction.dao.ejb3.persistence.UserDAOBeanMultiResource;
import auction.model.User;
public class JDBCTest extends MultiThreadedTest
@@ -139,7 +135,7 @@
{
try
{
- task();
+ task(count);
logger.debug("Completed profiled run of testbody for thread ["+this.threadId.toString()+"] count ["+i+"].");
} catch (Exception e)
@@ -150,7 +146,7 @@
}
}
}
- public void task()
+ public void task(final int iteration)
throws Exception
{
String readSQL = String.format("select user0_.USER_ID as USER1_4_1_, user0_.CREATED as CREATED4_1_, user0_.DEFAULT_BILLING_DETAILS_ID as DEFAULT13_4_1_, user0_.EMAIL as EMAIL4_1_, user0_.FIRSTNAME as FIRSTNAME4_1_, user0_.HOME_CITY as HOME5_4_1_, user0_.HOME_STREET as HOME6_4_1_, user0_.HOME_ZIPCODE as HOME7_4_1_, user0_.LASTNAME as LASTNAME4_1_, user0_.PASSWD as PASSWD4_1_, user0_.RANK as RANK4_1_, user0_.USERNAME as USERNAME4_1_, user0_.OBJ_VERSION as OBJ12_4_1_, user0_1_.CITY as CITY5_1_, user0_1_.STREET as STREET5_1_, user0_1_.ZIPCODE as ZIPCODE5_1_, addressent1_.ADDRESS_ID as ADDRESS1_2_0_, addressent1_.CITY as CITY2_0_, addressent1_.STREET as STREET2_0_, addressent1_.OBJ_VERSION as OBJ4_2_0_, addressent1_.ZIPCODE as ZIPCODE2_0_ 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=%1$d", this.threadId);
@@ -165,13 +161,26 @@
transaction.registerSynchronization(new SessionSynchronization(emA, transaction, true));
transaction.registerSynchronization(new SessionSynchronization( emB, transaction, true ) );
- User userA = findUsingResourceA(emA, readSQL);
- User userB = findUsingResourceB(emA, readSQL);
+ findUsingResourceA(emA, readSQL);//discard details
+ findUsingResourceB(emA, readSQL);//discard details
long time = System.currentTimeMillis();
- String writeSQL = String.format("update USERS set DEFAULT_BILLING_DETAILS_ID=?, EMAIL=?, FIRSTNAME=?, HOME_CITY=?, HOME_STREET=?, HOME_ZIPCODE=?, LASTNAME=?, PASSWD=?, RANK=?, USERNAME=?, OBJ_VERSION=? where USER_ID=? and OBJ_VERSION=?", null);
+ String writeSQLResA = String.format("update USERS set DEFAULT_BILLING_DETAILS_ID=%1$d, EMAIL='%2$s', FIRSTNAME='%3$s', HOME_CITY='%4$s', HOME_STREET='%5$s', HOME_ZIPCODE='%6$s', LASTNAME='%7$s', PASSWD='%8$s', RANK=%9$d, USERNAME='%10$s', OBJ_VERSION=%11$d where USER_ID=%12$d and OBJ_VERSION=%13$d",
+ 1, "anotheruser at mail.tld", "Ben"+time, "Foocity", "Foostreet", "a222a2", "User", "secret", 0, "anotheruser110"+this.threadId, iteration+1, iteration+1, iteration);
-
+ writeUserA(emA, writeSQLResA);
+ writeUserB(emB, writeSQLResA);
+ resourceAFlush(emA);
+ resourceBFlush(emB);
+ emA.getSession().getTransaction().commit();
}
+ private void writeUserA(final EntityManager em, final String sql)
+ {
+ em.createNativeQuery(sql).executeUpdate();
+ }
+ private void writeUserB(final EntityManager em, final String sql)
+ {
+ em.createNativeQuery(sql).executeUpdate();
+ }
private void resourceAFlush(EntityManager entityManager)
{
entityManager.flush();
@@ -180,13 +189,13 @@
{
entityManager.flush();
}
- private User findUsingResourceA(final EntityManager em, final String sql)
+ private Object findUsingResourceA(final EntityManager em, final String sql)
{
- return (User) em.createNativeQuery(sql).getSingleResult();
+ return em.createNativeQuery(sql).getSingleResult();
}
- private User findUsingResourceB(final EntityManager em, final String sql)
+ private Object findUsingResourceB(final EntityManager em, final String sql)
{
- return (User) em.createNativeQuery(sql).getSingleResult();
+ return em.createNativeQuery(sql).getSingleResult();
}
public EntityManagerFactory getEMFactoryA()
{
More information about the jboss-svn-commits
mailing list