manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1197696 - in /incubator/lcf/trunk: framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ loadtests/filesystem/src/test/java/org/apache/manifoldcf...
Date Fri, 04 Nov 2011 17:57:31 GMT
Author: kwright
Date: Fri Nov  4 17:57:30 2011
New Revision: 1197696

URL: http://svn.apache.org/viewvc?rev=1197696&view=rev
Log:
Add a way of checking for job status that doesn't involve a sequential jobqueue table scan.
 Part of CONNECTORS-285.

Modified:
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
    incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java
    incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java
    incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java
    incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java
    incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java
    incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java
    incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java
    incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java
    incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java

Modified: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
(original)
+++ incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
Fri Nov  4 17:57:30 2011
@@ -877,6 +877,34 @@ public interface IJobManager
   public JobStatus[] getFinishedJobs()
     throws ManifoldCFException;
 
+  /** Get the status of a job.
+  *@param includeCounts is true if document counts should be included.
+  *@return the status object for the specified job.
+  */
+  public JobStatus getStatus(Long jobID, boolean includeCounts)
+    throws ManifoldCFException;
+
+  /** Get a list of all jobs, and their status information.
+  *@param includeCounts is true if document counts should be included.
+  *@return an ordered array of job status objects.
+  */
+  public JobStatus[] getAllStatus(boolean includeCounts)
+    throws ManifoldCFException;
+
+  /** Get a list of running jobs.  This is for status reporting.
+  *@param includeCounts is true if document counts should be included.
+  *@return an array of the job status objects.
+  */
+  public JobStatus[] getRunningJobs(boolean includeCounts)
+    throws ManifoldCFException;
+
+  /** Get a list of completed jobs, and their statistics.
+  *@param includeCounts is true if document counts should be included.
+  *@return an array of the job status objects.
+  */
+  public JobStatus[] getFinishedJobs(boolean includeCounts)
+    throws ManifoldCFException;
+
   // The following commands generate reports based on the queue.
 
   /** Run a 'document status' report.

Modified: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
(original)
+++ incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Fri Nov  4 17:57:30 2011
@@ -6409,10 +6409,47 @@ public class JobManager implements IJobM
   public JobStatus getStatus(Long jobID)
     throws ManifoldCFException
   {
+    return getStatus(jobID,true);
+  }
+
+  /** Get a list of all jobs, and their status information.
+  *@return an ordered array of job status objects.
+  */
+  public JobStatus[] getAllStatus()
+    throws ManifoldCFException
+  {
+    return getAllStatus(true);
+  }
+
+  /** Get a list of running jobs.  This is for status reporting.
+  *@return an array of the job status objects.
+  */
+  public JobStatus[] getRunningJobs()
+    throws ManifoldCFException
+  {
+    return getRunningJobs(true);
+  }
+
+  /** Get a list of completed jobs, and their statistics.
+  *@return an array of the job status objects.
+  */
+  public JobStatus[] getFinishedJobs()
+    throws ManifoldCFException
+  {
+    return getFinishedJobs(true);
+  }
+
+  /** Get the status of a job.
+  *@param includeCounts is true if document counts should be included.
+  *@return the status object for the specified job.
+  */
+  public JobStatus getStatus(Long jobID, boolean includeCounts)
+    throws ManifoldCFException
+  {
     ArrayList list = new ArrayList();
     String whereClause = Jobs.idField+"=?";
     list.add(jobID);
-    JobStatus[] records = makeJobStatus(whereClause,list);
+    JobStatus[] records = makeJobStatus(whereClause,list,includeCounts);
     if (records.length == 0)
       return null;
     return records[0];
@@ -6420,18 +6457,20 @@ public class JobManager implements IJobM
 
 
   /** Get a list of all jobs, and their status information.
+  *@param includeCounts is true if document counts should be included.
   *@return an ordered array of job status objects.
   */
-  public JobStatus[] getAllStatus()
+  public JobStatus[] getAllStatus(boolean includeCounts)
     throws ManifoldCFException
   {
-    return makeJobStatus(null,null);
+    return makeJobStatus(null,null,includeCounts);
   }
 
   /** Get a list of running jobs.  This is for status reporting.
+  *@param includeCounts is true if document counts should be included.
   *@return an array of the job status objects.
   */
-  public JobStatus[] getRunningJobs()
+  public JobStatus[] getRunningJobs(boolean includeCounts)
     throws ManifoldCFException
   {
     ArrayList whereParams = new ArrayList();
@@ -6453,13 +6492,14 @@ public class JobManager implements IJobM
         Jobs.statusToString(Jobs.STATUS_PAUSEDWAIT),
         Jobs.statusToString(Jobs.STATUS_PAUSEDWAITSEEDING)})});
     
-    return makeJobStatus(whereClause,whereParams);
+    return makeJobStatus(whereClause,whereParams,includeCounts);
   }
 
   /** Get a list of completed jobs, and their statistics.
+  *@param includeCounts is true if document counts should be included.
   *@return an array of the job status objects.
   */
-  public JobStatus[] getFinishedJobs()
+  public JobStatus[] getFinishedJobs(boolean includeCounts)
     throws ManifoldCFException
   {
     StringBuilder sb = new StringBuilder();
@@ -6469,7 +6509,7 @@ public class JobManager implements IJobM
       new UnitaryClause(Jobs.statusField,Jobs.statusToString(Jobs.STATUS_INACTIVE))})).append("
AND ")
     .append(Jobs.endTimeField).append(" IS NOT NULL");
       
-    return makeJobStatus(sb.toString(),whereParams);
+    return makeJobStatus(sb.toString(),whereParams,includeCounts);
   }
 
   // Protected methods and classes
@@ -6478,7 +6518,7 @@ public class JobManager implements IJobM
   *@param whereClause is the where clause for the jobs we are interested in.
   *@return the status array.
   */
-  protected JobStatus[] makeJobStatus(String whereClause, ArrayList whereParams)
+  protected JobStatus[] makeJobStatus(String whereClause, ArrayList whereParams, boolean
includeCounts)
     throws ManifoldCFException
   {
     IResultSet set = database.performQuery("SELECT t0."+
@@ -6491,106 +6531,124 @@ public class JobManager implements IJobM
       " FROM "+jobs.getTableName()+" t0 "+((whereClause==null)?"":(" WHERE "+whereClause))+"
ORDER BY "+Jobs.descriptionField+" ASC",
       whereParams,null,null);
 
-    StringBuilder sb = new StringBuilder("SELECT ");
-    ArrayList list = new ArrayList();
+    IResultSet set2 = null;
+    IResultSet set3 = null;
+    IResultSet set4 = null;
     
-    sb.append(JobQueue.jobIDField).append(",")
-      .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
-      .append(" FROM ").append(jobQueue.getTableName()).append(" t1");
-    
-    if (whereClause != null)
+    if (includeCounts)
     {
-      sb.append(" WHERE EXISTS(SELECT 'x' FROM ").append(jobs.getTableName()).append(" t0
WHERE ")
-        .append(database.buildConjunctionClause(list,new ClauseDescription[]{
-          new JoinClause("t0."+Jobs.idField,"t1."+JobQueue.jobIDField)})).append(" AND ")
-        .append(whereClause)
-        .append(")");
-      list.addAll(whereParams);
-    }
-    
-    sb.append(" GROUP BY ").append(JobQueue.jobIDField);
-    
-    IResultSet set2 = database.performQuery(sb.toString(),list,null,null);
+      StringBuilder sb = new StringBuilder("SELECT ");
+      ArrayList list = new ArrayList();
+      
+      sb.append(JobQueue.jobIDField).append(",")
+        .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
+        .append(" FROM ").append(jobQueue.getTableName()).append(" t1");
+      
+      if (whereClause != null)
+      {
+        sb.append(" WHERE EXISTS(SELECT 'x' FROM ").append(jobs.getTableName()).append("
t0 WHERE ")
+          .append(database.buildConjunctionClause(list,new ClauseDescription[]{
+            new JoinClause("t0."+Jobs.idField,"t1."+JobQueue.jobIDField)})).append(" AND
")
+          .append(whereClause)
+          .append(")");
+        list.addAll(whereParams);
+      }
+      
+      sb.append(" GROUP BY ").append(JobQueue.jobIDField);
+      
+      set2 = database.performQuery(sb.toString(),list,null,null);
 
-    sb = new StringBuilder("SELECT ");
-    list.clear();
-    
-    sb.append(JobQueue.jobIDField).append(",")
-      .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
-      .append(" FROM ").append(jobQueue.getTableName()).append(" t1 WHERE ")
-      .append(database.buildConjunctionClause(list,new ClauseDescription[]{
-        new MultiClause(JobQueue.statusField,new Object[]{
-          JobQueue.statusToString(JobQueue.STATUS_ACTIVE),
-          JobQueue.statusToString(JobQueue.STATUS_ACTIVENEEDRESCAN),
-          JobQueue.statusToString(JobQueue.STATUS_PENDING),
-          JobQueue.statusToString(JobQueue.STATUS_ACTIVEPURGATORY),
-          JobQueue.statusToString(JobQueue.STATUS_ACTIVENEEDRESCANPURGATORY),
-          JobQueue.statusToString(JobQueue.STATUS_PENDINGPURGATORY)})}));
-    if (whereClause != null)
-    {
-      sb.append(" AND EXISTS(SELECT 'x' FROM ").append(jobs.getTableName()).append(" t0 WHERE
")
+      sb = new StringBuilder("SELECT ");
+      list.clear();
+      
+      sb.append(JobQueue.jobIDField).append(",")
+        .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
+        .append(" FROM ").append(jobQueue.getTableName()).append(" t1 WHERE ")
         .append(database.buildConjunctionClause(list,new ClauseDescription[]{
-          new JoinClause("t0."+Jobs.idField,"t1."+JobQueue.jobIDField)})).append(" AND ")
-        .append(whereClause)
-        .append(")");
-      if (whereParams != null)
-        list.addAll(whereParams);
-    }
-    sb.append(" GROUP BY ").append(JobQueue.jobIDField);
-    
-    IResultSet set3 = database.performQuery(sb.toString(),list,null,null);
+          new MultiClause(JobQueue.statusField,new Object[]{
+            JobQueue.statusToString(JobQueue.STATUS_ACTIVE),
+            JobQueue.statusToString(JobQueue.STATUS_ACTIVENEEDRESCAN),
+            JobQueue.statusToString(JobQueue.STATUS_PENDING),
+            JobQueue.statusToString(JobQueue.STATUS_ACTIVEPURGATORY),
+            JobQueue.statusToString(JobQueue.STATUS_ACTIVENEEDRESCANPURGATORY),
+            JobQueue.statusToString(JobQueue.STATUS_PENDINGPURGATORY)})}));
+      if (whereClause != null)
+      {
+        sb.append(" AND EXISTS(SELECT 'x' FROM ").append(jobs.getTableName()).append(" t0
WHERE ")
+          .append(database.buildConjunctionClause(list,new ClauseDescription[]{
+            new JoinClause("t0."+Jobs.idField,"t1."+JobQueue.jobIDField)})).append(" AND
")
+          .append(whereClause)
+          .append(")");
+        if (whereParams != null)
+          list.addAll(whereParams);
+      }
+      sb.append(" GROUP BY ").append(JobQueue.jobIDField);
+      
+      set3 = database.performQuery(sb.toString(),list,null,null);
 
-    sb = new StringBuilder("SELECT ");
-    list.clear();
-    
-    sb.append(JobQueue.jobIDField).append(",")
-      .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
-      .append(" FROM ").append(jobQueue.getTableName()).append(" t1 WHERE ")
-      .append(database.buildConjunctionClause(list,new ClauseDescription[]{
-        new MultiClause(JobQueue.statusField,new Object[]{
-          JobQueue.statusToString(JobQueue.STATUS_COMPLETE),
-          JobQueue.statusToString(JobQueue.STATUS_PURGATORY),
-          JobQueue.statusToString(JobQueue.STATUS_ACTIVEPURGATORY),
-          JobQueue.statusToString(JobQueue.STATUS_ACTIVENEEDRESCANPURGATORY),
-          JobQueue.statusToString(JobQueue.STATUS_PENDINGPURGATORY)})}));
-    
-    if (whereClause != null)
-    {
-      sb.append(" AND EXISTS(SELECT 'x' FROM ").append(jobs.getTableName()).append(" t0 WHERE
")
+      sb = new StringBuilder("SELECT ");
+      list.clear();
+      
+      sb.append(JobQueue.jobIDField).append(",")
+        .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
+        .append(" FROM ").append(jobQueue.getTableName()).append(" t1 WHERE ")
         .append(database.buildConjunctionClause(list,new ClauseDescription[]{
-          new JoinClause("t0."+Jobs.idField,"t1."+JobQueue.jobIDField)})).append(" AND ")
-        .append(whereClause)
-        .append(")");
+          new MultiClause(JobQueue.statusField,new Object[]{
+            JobQueue.statusToString(JobQueue.STATUS_COMPLETE),
+            JobQueue.statusToString(JobQueue.STATUS_PURGATORY),
+            JobQueue.statusToString(JobQueue.STATUS_ACTIVEPURGATORY),
+            JobQueue.statusToString(JobQueue.STATUS_ACTIVENEEDRESCANPURGATORY),
+            JobQueue.statusToString(JobQueue.STATUS_PENDINGPURGATORY)})}));
+      
+      if (whereClause != null)
+      {
+        sb.append(" AND EXISTS(SELECT 'x' FROM ").append(jobs.getTableName()).append(" t0
WHERE ")
+          .append(database.buildConjunctionClause(list,new ClauseDescription[]{
+            new JoinClause("t0."+Jobs.idField,"t1."+JobQueue.jobIDField)})).append(" AND
")
+          .append(whereClause)
+          .append(")");
 
-      if (whereParams != null)
-        list.addAll(whereParams);
+        if (whereParams != null)
+          list.addAll(whereParams);
+      }
+      
+      sb.append(" GROUP BY ").append(JobQueue.jobIDField);
+      
+      set4 = database.performQuery(sb.toString(),list,null,null);
     }
     
-    sb.append(" GROUP BY ").append(JobQueue.jobIDField);
+    int i;
     
-    IResultSet set4 = database.performQuery(sb.toString(),list,null,null);
-
     // Build hashes for set2 and set3
     HashMap set2Hash = new HashMap();
-    int i = 0;
-    while (i < set2.getRowCount())
+    if (set2 != null)
     {
-      IResultRow row = set2.getRow(i++);
-      set2Hash.put(row.getValue(JobQueue.jobIDField),row.getValue("doccount"));
+      i = 0;
+      while (i < set2.getRowCount())
+      {
+        IResultRow row = set2.getRow(i++);
+        set2Hash.put(row.getValue(JobQueue.jobIDField),row.getValue("doccount"));
+      }
     }
     HashMap set3Hash = new HashMap();
-    i = 0;
-    while (i < set3.getRowCount())
+    if (set3 != null)
     {
-      IResultRow row = set3.getRow(i++);
-      set3Hash.put(row.getValue(JobQueue.jobIDField),row.getValue("doccount"));
+      i = 0;
+      while (i < set3.getRowCount())
+      {
+        IResultRow row = set3.getRow(i++);
+        set3Hash.put(row.getValue(JobQueue.jobIDField),row.getValue("doccount"));
+      }
     }
     HashMap set4Hash = new HashMap();
-    i = 0;
-    while (i < set4.getRowCount())
+    if (set4 != null)
     {
-      IResultRow row = set4.getRow(i++);
-      set4Hash.put(row.getValue(JobQueue.jobIDField),row.getValue("doccount"));
+      i = 0;
+      while (i < set4.getRowCount())
+      {
+        IResultRow row = set4.getRow(i++);
+        set4Hash.put(row.getValue(JobQueue.jobIDField),row.getValue("doccount"));
+      }
     }
 
     JobStatus[] rval = new JobStatus[set.getRowCount()];

Modified: incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java
(original)
+++ incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java
Fri Nov  4 17:57:30 2011
@@ -367,7 +367,7 @@ public class BaseDerby extends org.apach
           // Wait for this job to stop
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               int statusValue = status.getStatus();
@@ -408,7 +408,7 @@ public class BaseDerby extends org.apach
           // Wait for this job to disappear
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               ManifoldCF.sleep(10000);

Modified: incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java
(original)
+++ incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java
Fri Nov  4 17:57:30 2011
@@ -367,7 +367,7 @@ public class BaseHSQLDB extends org.apac
           // Wait for this job to stop
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               int statusValue = status.getStatus();
@@ -408,7 +408,7 @@ public class BaseHSQLDB extends org.apac
           // Wait for this job to disappear
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               ManifoldCF.sleep(10000);

Modified: incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java
(original)
+++ incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java
Fri Nov  4 17:57:30 2011
@@ -367,7 +367,7 @@ public class BasePostgresql extends org.
           // Wait for this job to stop
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               int statusValue = status.getStatus();
@@ -408,7 +408,7 @@ public class BasePostgresql extends org.
           // Wait for this job to disappear
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               ManifoldCF.sleep(10000);

Modified: incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java
(original)
+++ incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java
Fri Nov  4 17:57:30 2011
@@ -305,7 +305,7 @@ public class BaseDerby extends org.apach
           // Wait for this job to stop
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               int statusValue = status.getStatus();
@@ -346,7 +346,7 @@ public class BaseDerby extends org.apach
           // Wait for this job to disappear
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               ManifoldCF.sleep(10000);

Modified: incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java
(original)
+++ incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java
Fri Nov  4 17:57:30 2011
@@ -305,7 +305,7 @@ public class BaseHSQLDB extends org.apac
           // Wait for this job to stop
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               int statusValue = status.getStatus();
@@ -346,7 +346,7 @@ public class BaseHSQLDB extends org.apac
           // Wait for this job to disappear
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               ManifoldCF.sleep(10000);

Modified: incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java
(original)
+++ incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java
Fri Nov  4 17:57:30 2011
@@ -305,7 +305,7 @@ public class BasePostgresql extends org.
           // Wait for this job to stop
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               int statusValue = status.getStatus();
@@ -346,7 +346,7 @@ public class BasePostgresql extends org.
           // Wait for this job to disappear
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               ManifoldCF.sleep(10000);

Modified: incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java
(original)
+++ incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java
Fri Nov  4 17:57:30 2011
@@ -337,7 +337,7 @@ public class Base extends org.apache.man
           // Wait for this job to stop
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               int statusValue = status.getStatus();
@@ -378,7 +378,7 @@ public class Base extends org.apache.man
           // Wait for this job to disappear
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               ManifoldCF.sleep(10000);

Modified: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java
(original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java
Fri Nov  4 17:57:30 2011
@@ -367,7 +367,7 @@ public class Base extends org.apache.man
           // Wait for this job to stop
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               int statusValue = status.getStatus();
@@ -408,7 +408,7 @@ public class Base extends org.apache.man
           // Wait for this job to disappear
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               ManifoldCF.sleep(10000);

Modified: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java
(original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java
Fri Nov  4 17:57:30 2011
@@ -367,7 +367,7 @@ public class BaseHSQLDB extends org.apac
           // Wait for this job to stop
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               int statusValue = status.getStatus();
@@ -408,7 +408,7 @@ public class BaseHSQLDB extends org.apac
           // Wait for this job to disappear
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               ManifoldCF.sleep(10000);

Modified: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java
(original)
+++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java
Fri Nov  4 17:57:30 2011
@@ -367,7 +367,7 @@ public class BasePostgresql extends org.
           // Wait for this job to stop
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               int statusValue = status.getStatus();
@@ -408,7 +408,7 @@ public class BasePostgresql extends org.
           // Wait for this job to disappear
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               ManifoldCF.sleep(10000);

Modified: incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java?rev=1197696&r1=1197695&r2=1197696&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
(original)
+++ incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
Fri Nov  4 17:57:30 2011
@@ -324,7 +324,7 @@ public class BaseDerby extends org.apach
           // Wait for this job to stop
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               int statusValue = status.getStatus();
@@ -365,7 +365,7 @@ public class BaseDerby extends org.apach
           // Wait for this job to disappear
           while (true)
           {
-            JobStatus status = jobManager.getStatus(desc.getID());
+            JobStatus status = jobManager.getStatus(desc.getID(),false);
             if (status != null)
             {
               ManifoldCF.sleep(10000);



Mime
View raw message