[jbpm-commits] JBoss JBPM SVN: r4094 - in jbpm3/branches/jbpm-3.2.6.GA/modules/core: src/main/java/org/jbpm/db and 2 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2009-02-28 22:01:13 -0500 (Sat, 28 Feb 2009)
New Revision: 4094

Modified:
   jbpm3/branches/jbpm-3.2.6.GA/modules/core/pom.xml
   jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/main/java/org/jbpm/db/JobSession.java
   jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
   jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/test/java/org/jbpm/perf/SimplePerformanceTest.java
Log:
exclude JobSessionDbTest from Sybase test suite
bring back JobSession.findFailedJobs named query
remove unused fields in performance test, display progress

Modified: jbpm3/branches/jbpm-3.2.6.GA/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.6.GA/modules/core/pom.xml	2009-03-01 01:59:00 UTC (rev 4093)
+++ jbpm3/branches/jbpm-3.2.6.GA/modules/core/pom.xml	2009-03-01 03:01:13 UTC (rev 4094)
@@ -334,6 +334,12 @@
         <plugins>
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <!-- [JBPM-2042] failed jobs query fails -->
+                <exclude>org/jbpm/db/JobSessionDbTest.java</exclude>
+              </excludes>
+            </configuration>
           </plugin>
         </plugins>
       </build>

Modified: jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/main/java/org/jbpm/db/JobSession.java
===================================================================
--- jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/main/java/org/jbpm/db/JobSession.java	2009-03-01 01:59:00 UTC (rev 4093)
+++ jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/main/java/org/jbpm/db/JobSession.java	2009-03-01 03:01:13 UTC (rev 4094)
@@ -111,23 +111,6 @@
     }
   }
   
-  /**
-   * get all failed jobs. Failed job have a retry count
-   * of 0 and the occured exception set.
-   */
-  public List<Job> findFailedJobs() {
-    try {
-      List<?> jobs = session.createCriteria(Job.class)
-        .add(Restrictions.eq("retries", 0))
-        .add(Restrictions.isNotNull("exception"))
-        .list();
-      return CollectionUtil.checkList(jobs, Job.class);      
-    }
-    catch (HibernateException e) {
-      throw new JbpmException("couldn't find failed jobs", e);
-    }
-  }
-
   public void saveJob(Job job) {
     try {
       session.save(job);
@@ -280,5 +263,19 @@
     }
   }
 
+  /**
+   * get all failed jobs. Failed job have a retry count
+   * of 0 and the occured exception set.
+   */
+  public List<Job> findFailedJobs() {
+    try {
+      List<?> jobs = session.getNamedQuery("JobSession.findFailedJobs").list();
+      return CollectionUtil.checkList(jobs, Job.class);
+    }
+    catch (HibernateException e) {
+      throw new JbpmException("could not find failed jobs", e);
+    }
+  }
+
   private static Log log = LogFactory.getLog(JobSession.class);
 }

Modified: jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml	2009-03-01 01:59:00 UTC (rev 4093)
+++ jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml	2009-03-01 03:01:13 UTC (rev 4094)
@@ -386,6 +386,15 @@
     ]]>
   </query>
 
+  <query name="JobSession.findFailedJobs">
+    <![CDATA[
+      select job
+      from org.jbpm.job.Job as job
+      where job.retries = 0
+        and job.exception is not null
+    ]]>
+  </query>
+
   <!-- related to Tasks            -->
   <!-- ########################### -->
 

Modified: jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/test/java/org/jbpm/perf/SimplePerformanceTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/test/java/org/jbpm/perf/SimplePerformanceTest.java	2009-03-01 01:59:00 UTC (rev 4093)
+++ jbpm3/branches/jbpm-3.2.6.GA/modules/core/src/test/java/org/jbpm/perf/SimplePerformanceTest.java	2009-03-01 03:01:13 UTC (rev 4094)
@@ -23,11 +23,8 @@
 
 // $Id$
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jbpm.command.CommandService;
-import org.jbpm.command.StartProcessInstanceCommand;
-import org.jbpm.command.impl.CommandServiceImpl;
+import java.text.NumberFormat;
+
 import org.jbpm.db.AbstractDbTestCase;
 import org.jbpm.graph.def.ActionHandler;
 import org.jbpm.graph.def.ProcessDefinition;
@@ -43,13 +40,11 @@
  * @author mvecera at redhat.com
  * @author pmacik at redhat.com
  * @author thomas.diesler at jboss.com
+ * @author alex.guizar at jboss.com
  * @since 18-Feb-2009
  */
 public class SimplePerformanceTest extends AbstractDbTestCase
 {
-  private static final Log log = LogFactory.getLog(SimplePerformanceTest.class);
-  
-  private CommandService commandService = new CommandServiceImpl(getJbpmConfiguration());
   private static final int INSTANCES = 1000;
   private static int count;
   
@@ -82,7 +77,7 @@
   {
     long start = System.currentTimeMillis();
 
-    for (count = 0; count < INSTANCES; count++)
+    for (count = 1; count <= INSTANCES; count++)
     {
       ProcessInstance pi = new ProcessInstance(processDefinition);
       pi.signal();
@@ -97,9 +92,12 @@
 
   public static class PerfActionHandler implements ActionHandler
   {
+    private static final long serialVersionUID = 1L;
+
     public void execute(ExecutionContext executionContext) throws Exception
     {
-      //System.out.println(count);
+      if (count % (INSTANCES / 4) == 0)
+        System.out.println(NumberFormat.getPercentInstance().format((double) count / INSTANCES));
     }
   }
 }