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/12/27 08:27:19 UTC
svn commit: r1426136 - in
/manifoldcf/branches/CONNECTORS-590/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs:
JobManager.java JobQueue.java
Author: kwright
Date: Thu Dec 27 07:27:19 2012
New Revision: 1426136
URL: http://svn.apache.org/viewvc?rev=1426136&view=rev
Log:
Finish adding hooks for TrackerClass
Modified:
manifoldcf/branches/CONNECTORS-590/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
manifoldcf/branches/CONNECTORS-590/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Modified: manifoldcf/branches/CONNECTORS-590/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-590/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1426136&r1=1426135&r2=1426136&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-590/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java (original)
+++ manifoldcf/branches/CONNECTORS-590/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java Thu Dec 27 07:27:19 2012
@@ -999,6 +999,7 @@ public class JobManager implements IJobM
}
database.performCommit();
+ TrackerClass.noteCommit();
if (Logging.perf.isDebugEnabled())
Logging.perf.debug("Done pruning unindexable docs after "+new Long(System.currentTimeMillis()-startTime).toString()+" ms.");
@@ -1009,11 +1010,13 @@ public class JobManager implements IJobM
catch (Error e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
throw e;
}
catch (ManifoldCFException e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
if (e.getErrorCode() == e.DATABASE_TRANSACTION_ABORT)
{
if (Logging.perf.isDebugEnabled())
@@ -1260,6 +1263,7 @@ public class JobManager implements IJobM
}
database.performCommit();
+ TrackerClass.noteCommit();
if (Logging.perf.isDebugEnabled())
Logging.perf.debug("Done pruning unindexable docs after "+new Long(System.currentTimeMillis()-startTime).toString()+" ms.");
@@ -1270,11 +1274,13 @@ public class JobManager implements IJobM
catch (Error e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
throw e;
}
catch (ManifoldCFException e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
if (e.getErrorCode() == e.DATABASE_TRANSACTION_ABORT)
{
if (Logging.perf.isDebugEnabled())
@@ -1820,6 +1826,7 @@ public class JobManager implements IJobM
}
database.performCommit();
+ TrackerClass.noteCommit();
return new DocumentSetAndFlags(rval, rvalBoolean);
@@ -1827,6 +1834,7 @@ public class JobManager implements IJobM
catch (ManifoldCFException e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
if (e.getErrorCode() == e.DATABASE_TRANSACTION_ABORT)
{
if (Logging.perf.isDebugEnabled())
@@ -1839,6 +1847,7 @@ public class JobManager implements IJobM
catch (Error e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
throw e;
}
finally
@@ -2441,11 +2450,13 @@ public class JobManager implements IJobM
i++;
}
database.performCommit();
+ TrackerClass.noteCommit();
break;
}
catch (ManifoldCFException e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
if (e.getErrorCode() == e.DATABASE_TRANSACTION_ABORT)
{
if (Logging.perf.isDebugEnabled())
@@ -2459,6 +2470,7 @@ public class JobManager implements IJobM
catch (Error e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
throw e;
}
finally
@@ -2606,11 +2618,13 @@ public class JobManager implements IJobM
// we don't delete them here.
database.performCommit();
+ TrackerClass.noteCommit();
return rval;
}
catch (ManifoldCFException e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
if (e.getErrorCode() == e.DATABASE_TRANSACTION_ABORT)
{
if (Logging.perf.isDebugEnabled())
@@ -2624,6 +2638,7 @@ public class JobManager implements IJobM
catch (Error e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
throw e;
}
finally
@@ -2986,16 +3001,19 @@ public class JobManager implements IJobM
}
database.performCommit();
+ TrackerClass.noteCommit();
break;
}
catch (Error e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
throw e;
}
catch (ManifoldCFException e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
if (e.getErrorCode() == e.DATABASE_TRANSACTION_ABORT)
{
if (Logging.perf.isDebugEnabled())
@@ -3193,11 +3211,13 @@ public class JobManager implements IJobM
}
database.performCommit();
+ TrackerClass.noteCommit();
break;
}
catch (ManifoldCFException e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
if (e.getErrorCode() == e.DATABASE_TRANSACTION_ABORT)
{
if (Logging.perf.isDebugEnabled())
@@ -3210,6 +3230,7 @@ public class JobManager implements IJobM
catch (Error e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
throw e;
}
finally
@@ -3288,11 +3309,13 @@ public class JobManager implements IJobM
}
database.performCommit();
+ TrackerClass.noteCommit();
break;
}
catch (ManifoldCFException e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
if (e.getErrorCode() == e.DATABASE_TRANSACTION_ABORT)
{
if (Logging.perf.isDebugEnabled())
@@ -3305,6 +3328,7 @@ public class JobManager implements IJobM
catch (Error e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
throw e;
}
finally
@@ -3523,6 +3547,7 @@ public class JobManager implements IJobM
hopCount.recordSeedReferences(jobID,legalLinkTypes,reorderedDocIDHashes,hopcountMethod);
database.performCommit();
+ TrackerClass.noteCommit();
if (Logging.perf.isDebugEnabled())
Logging.perf.debug("Took "+new Long(System.currentTimeMillis()-startTime).toString()+" ms to add "+Integer.toString(reorderedDocIDHashes.length)+
@@ -3543,6 +3568,7 @@ public class JobManager implements IJobM
catch (ManifoldCFException e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
if (e.getErrorCode() == e.DATABASE_TRANSACTION_ABORT)
{
if (Logging.perf.isDebugEnabled())
@@ -3556,6 +3582,7 @@ public class JobManager implements IJobM
catch (Error e)
{
database.signalRollback();
+ TrackerClass.noteRollback();
throw e;
}
finally
@@ -5437,6 +5464,7 @@ public class JobManager implements IJobM
throws ManifoldCFException
{
jobQueue.prepareIncrementalScan(jobID);
+ TrackerClass.noteCommit();
}
/** Manually abort a running job. The job will be permanently stopped, and will not run again until
Modified: manifoldcf/branches/CONNECTORS-590/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-590/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java?rev=1426136&r1=1426135&r2=1426136&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-590/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java (original)
+++ manifoldcf/branches/CONNECTORS-590/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java Thu Dec 27 07:27:19 2012
@@ -758,49 +758,6 @@ public class JobQueue extends org.apache
TrackerClass.noteRecordEvent(recID, newStatus, "Note completion");
}
- /** Either delete a record, or set status to "rescan", depending on the
- * record's state.
- */
- public boolean updateOrDeleteRecord(Long recID, int currentStatus)
- throws ManifoldCFException
- {
- HashMap map = new HashMap();
-
- int newStatus;
- String actionFieldValue;
- Long checkTimeValue;
-
- switch (currentStatus)
- {
- case STATUS_ACTIVE:
- case STATUS_ACTIVEPURGATORY:
- // Delete it
- deleteRecord(recID);
- return true;
- case STATUS_ACTIVENEEDRESCAN:
- case STATUS_ACTIVENEEDRESCANPURGATORY:
- newStatus = STATUS_PENDINGPURGATORY;
- actionFieldValue = actionToString(ACTION_RESCAN);
- checkTimeValue = new Long(0L);
- // Leave doc priority unchanged.
- break;
- default:
- TrackerClass.printForensics(recID, currentStatus);
- throw new ManifoldCFException("Unexpected jobqueue status - record id "+recID.toString()+", expecting active status, saw "+Integer.toString(currentStatus));
- }
-
- map.put(statusField,statusToString(newStatus));
- map.put(checkTimeField,checkTimeValue);
- map.put(checkActionField,actionFieldValue);
- map.put(failTimeField,null);
- map.put(failCountField,null);
- ArrayList list = new ArrayList();
- String query = buildConjunctionClause(list,new ClauseDescription[]{
- new UnitaryClause(idField,recID)});
- performUpdate(map,"WHERE "+query,list,null);
- TrackerClass.noteRecordEvent(recID, newStatus, "Rescan or delete");
- return false;
- }
/** Either mark a record as hopcountremoved, or set status to "rescan", depending on the
* record's state.