You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/08/12 22:09:27 UTC
svn commit: r1372193 - in
/manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs:
JobManager.java JobQueue.java
Author: kwright
Date: Sun Aug 12 20:09:26 2012
New Revision: 1372193
URL: http://svn.apache.org/viewvc?rev=1372193&view=rev
Log:
Add deletion cleanup of hopcount-removed records
Modified:
manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Modified: manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1372193&r1=1372192&r2=1372193&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java (original)
+++ manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java Sun Aug 12 20:09:26 2012
@@ -5467,11 +5467,13 @@ public class JobManager implements IJobM
if (legalLinkTypes.length > 0)
{
ArrayList list = new ArrayList();
- list.add(jobQueue.statusToString(jobQueue.STATUS_PENDING));
- list.add(jobQueue.statusToString(jobQueue.STATUS_HOPCOUNTREMOVED));
+ String query = database.buildConjunctionClause(list,new ClauseDescription[]{
+ new MultiClause("t99."+jobQueue.statusField,new Object[]{
+ jobQueue.statusToString(jobQueue.STATUS_PENDING),
+ jobQueue.statusToString(jobQueue.STATUS_HOPCOUNTREMOVED)})});
hopCount.deleteMatchingDocuments(jobID,legalLinkTypes,jobQueue.getTableName()+" t99",
"t99."+jobQueue.docHashField,"t99."+jobQueue.jobIDField,
- "t99."+jobQueue.statusField+" IN (?,?)",list,
+ query,list,
hopcountMethod);
}
Modified: manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java?rev=1372193&r1=1372192&r2=1372193&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java (original)
+++ manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java Sun Aug 12 20:09:26 2012
@@ -481,14 +481,19 @@ public class JobQueue extends org.apache
{
// Delete PENDING entries
ArrayList list = new ArrayList();
- list.add(jobID);
- list.add(statusToString(STATUS_PENDING));
+ String query = buildConjunctionClause(list,new ClauseDescription[]{
+ new UnitaryClause("t0."+jobIDField,jobID),
+ new MultiClause("t0."+statusField,new Object[]{
+ statusToString(STATUS_PENDING),
+ statusToString(STATUS_HOPCOUNTREMOVED)})});
// Clean out prereqevents table first
- prereqEventManager.deleteRows(getTableName()+" t0","t0."+idField,"t0."+jobIDField+"=? AND t0."+statusField+"=?",list);
+ prereqEventManager.deleteRows(getTableName()+" t0","t0."+idField,query,list);
list.clear();
- String query = buildConjunctionClause(list,new ClauseDescription[]{
+ query = buildConjunctionClause(list,new ClauseDescription[]{
new UnitaryClause(jobIDField,jobID),
- new UnitaryClause(statusField,statusToString(STATUS_PENDING))});
+ new MultiClause(statusField,new Object[]{
+ statusToString(STATUS_PENDING),
+ statusToString(STATUS_HOPCOUNTREMOVED)})});
performDelete("WHERE "+query,list,null);
// Turn PENDINGPURGATORY, PURGATORY, COMPLETED into ELIGIBLEFORDELETE.