Author: kwright
Date: Sun Nov 24 23:46:17 2013
New Revision: 1545115
URL: http://svn.apache.org/r1545115
Log:
Remove more hard-wired process ID stuff.
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/EventManager.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java?rev=1545115&r1=1545114&r2=1545115&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java
Sun Nov 24 23:46:17 2013
@@ -560,10 +560,11 @@ public interface IJobManager
throws ManifoldCFException;
/** Begin an event sequence.
+ *@param processID is the current process ID.
*@param eventName is the name of the event.
*@return true if the event could be created, or false if it's already there.
*/
- public boolean beginEventSequence(String eventName)
+ public boolean beginEventSequence(String processID, String eventName)
throws ManifoldCFException;
/** Complete an event sequence.
@@ -598,6 +599,7 @@ public interface IJobManager
* This method is called during document processing, when a document
reference is discovered.
* The document reference is passed to this method, which updates the status
of the document
* in the specified job's queue, according to specific state rules.
+ *@param processID is the current process ID.
*@param jobID is the job identifier.
*@param legalLinkTypes is the set of legal link types that this connector
generates.
*@param docIDHash is the local document identifier hash value.
@@ -614,7 +616,8 @@ public interface IJobManager
*@param prereqEventNames are the events that must be completed before the
document can be processed.
*@return true if the priority value was used, false otherwise.
*/
- public boolean addDocument(Long jobID, String[] legalLinkTypes,
+ public boolean addDocument(String processID,
+ Long jobID, String[] legalLinkTypes,
String docIDHash, String docID,
String parentIdentifierHash,
String relationshipType,
@@ -626,6 +629,7 @@ public interface IJobManager
* This method is called during document processing, when a set of document
references are discovered.
* The document references are passed to this method, which updates the
status of the document(s)
* in the specified job's queue, according to specific state rules.
+ *@param processID is the current process ID.
*@param jobID is the job identifier.
*@param legalLinkTypes is the set of legal link types that this connector
generates.
*@param docIDHashes are the hashes of the local document identifiers.
@@ -643,7 +647,8 @@ public interface IJobManager
*@param prereqEventNames are the events that must be completed before each
document can be processed.
*@return an array of boolean values indicating whether or not the passed-in
priority value was used or not for each doc id (true if used).
*/
- public boolean[] addDocuments(Long jobID, String[] legalLinkTypes,
+ public boolean[] addDocuments(String processID,
+ Long jobID, String[] legalLinkTypes,
String[] docIDHashes, String[] docIDs,
String parentIdentifierHash,
String relationshipType,
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java?rev=1545115&r1=1545114&r2=1545115&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java
(original)
+++
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java
Sun Nov 24 23:46:17 2013
@@ -254,17 +254,17 @@ public class Carrydown extends org.apach
*@return true if new carrydown data was recorded; false otherwise.
*/
public boolean recordCarrydownData(Long jobID, String parentDocumentIDHash,
String childDocumentIDHash,
- String[] documentDataNames, String[][] documentDataValueHashes, Object[][]
documentDataValues)
+ String[] documentDataNames, String[][] documentDataValueHashes, Object[][]
documentDataValues, String processID)
throws ManifoldCFException
{
return recordCarrydownDataMultiple(jobID,parentDocumentIDHash,new
String[]{childDocumentIDHash},
- new String[][]{documentDataNames},new
String[][][]{documentDataValueHashes},new Object[][][]{documentDataValues})[0];
+ new String[][]{documentDataNames},new
String[][][]{documentDataValueHashes},new
Object[][][]{documentDataValues},processID)[0];
}
/** Add carrydown data to the table.
*/
public boolean[] recordCarrydownDataMultiple(Long jobID, String
parentDocumentIDHash, String[] childDocumentIDHashes,
- String[][] dataNames, String[][][] dataValueHashes, Object[][][]
dataValues)
+ String[][] dataNames, String[][][] dataValueHashes, Object[][][]
dataValues, String processID)
throws ManifoldCFException
{
@@ -372,7 +372,7 @@ public class Carrydown extends org.apach
}
map.put(newField,statusToString(ISNEW_NEW));
- map.put(processIDField,ManifoldCF.getProcessID());
+ map.put(processIDField,processID);
performInsert(map,null);
noteModifications(1,0,0);
insertHappened.put(childDocumentIDHash,new Boolean(true));
@@ -412,7 +412,7 @@ public class Carrydown extends org.apach
*/
map.put(newField,statusToString(ISNEW_EXISTING));
- map.put(processIDField,ManifoldCF.getProcessID());
+ map.put(processIDField,processID);
performUpdate(map,sb.toString(),updateList,null);
noteModifications(0,1,0);
}
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/EventManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/EventManager.java?rev=1545115&r1=1545114&r2=1545115&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/EventManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/EventManager.java
Sun Nov 24 23:46:17 2013
@@ -139,12 +139,12 @@ public class EventManager extends org.ap
}
/** Atomically create an event - and return false if the event already
exists */
- public void createEvent(String eventName)
+ public void createEvent(String eventName, String processID)
throws ManifoldCFException
{
HashMap map = new HashMap();
map.put(eventNameField,eventName);
- map.put(processIDField,ManifoldCF.getProcessID());
+ map.put(processIDField,processID);
performInsert(map,null);
}
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java?rev=1545115&r1=1545114&r2=1545115&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java
(original)
+++
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java
Sun Nov 24 23:46:17 2013
@@ -321,10 +321,10 @@ public class HopCount extends org.apache
/** Record a references from a set of documents to the root. These will be
marked as "new" or "existing", and
* will have a null linktype.
*/
- public void recordSeedReferences(Long jobID, String[] legalLinkTypes,
String[] targetDocumentIDHashes, int hopcountMethod)
+ public void recordSeedReferences(Long jobID, String[] legalLinkTypes,
String[] targetDocumentIDHashes, int hopcountMethod, String processID)
throws ManifoldCFException
{
- doRecord(jobID,legalLinkTypes,"",targetDocumentIDHashes,"",hopcountMethod);
+
doRecord(jobID,legalLinkTypes,"",targetDocumentIDHashes,"",hopcountMethod,processID);
}
/** Finish seed references. Seed references are special in that the only
source is the root.
@@ -338,19 +338,19 @@ public class HopCount extends org.apache
/** Record a reference from source to target. This reference will be marked
as "new" or "existing".
*/
public boolean recordReference(Long jobID, String[] legalLinkTypes, String
sourceDocumentIDHash, String targetDocumentIDHash, String linkType,
- int hopcountMethod)
+ int hopcountMethod, String processID)
throws ManifoldCFException
{
- return doRecord(jobID,legalLinkTypes,sourceDocumentIDHash,new
String[]{targetDocumentIDHash},linkType,hopcountMethod)[0];
+ return doRecord(jobID,legalLinkTypes,sourceDocumentIDHash,new
String[]{targetDocumentIDHash},linkType,hopcountMethod,processID)[0];
}
/** Record a set of references from source to target. This reference will
be marked as "new" or "existing".
*/
public boolean[] recordReferences(Long jobID, String[] legalLinkTypes,
String sourceDocumentIDHash, String[] targetDocumentIDHashes, String linkType,
- int hopcountMethod)
+ int hopcountMethod, String processID)
throws ManifoldCFException
{
- return
doRecord(jobID,legalLinkTypes,sourceDocumentIDHash,targetDocumentIDHashes,linkType,hopcountMethod);
+ return
doRecord(jobID,legalLinkTypes,sourceDocumentIDHash,targetDocumentIDHashes,linkType,hopcountMethod,processID);
}
/** Complete a recalculation pass for a set of source documents. All child
links that are not marked as "new"
@@ -364,7 +364,7 @@ public class HopCount extends org.apache
/** Do the work of recording source-target references. */
protected boolean[] doRecord(Long jobID, String[] legalLinkTypes, String
sourceDocumentIDHash, String[] targetDocumentIDHashes, String linkType,
- int hopcountMethod)
+ int hopcountMethod, String processID)
throws ManifoldCFException
{
@@ -376,7 +376,7 @@ public class HopCount extends org.apache
rval[i] = false;
}
- String[] newReferences =
intrinsicLinkManager.recordReferences(jobID,sourceDocumentIDHash,targetDocumentIDHashes,linkType);
+ String[] newReferences =
intrinsicLinkManager.recordReferences(jobID,sourceDocumentIDHash,targetDocumentIDHashes,linkType,processID);
if (newReferences.length > 0)
{
// There are added links.
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java?rev=1545115&r1=1545114&r2=1545115&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java
(original)
+++
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java
Sun Nov 24 23:46:17 2013
@@ -222,7 +222,8 @@ public class IntrinsicLink extends org.a
/** Record a references from source to targets. These references will be
marked as either "new" or "existing".
*@return the target document ID's that are considered "new".
*/
- public String[] recordReferences(Long jobID, String sourceDocumentIDHash,
String[] targetDocumentIDHashes, String linkType)
+ public String[] recordReferences(Long jobID, String sourceDocumentIDHash,
+ String[] targetDocumentIDHashes, String linkType, String processID)
throws ManifoldCFException
{
HashMap duplicateRemoval = new HashMap();
@@ -279,7 +280,7 @@ public class IntrinsicLink extends org.a
map.put(childIDHashField,sourceDocumentIDHash);
map.put(linkTypeField,linkType);
map.put(newField,statusToString(LINKSTATUS_NEW));
- map.put(processIDField,ManifoldCF.getProcessID());
+ map.put(processIDField,processID);
performInsert(map,null);
noteModifications(1,0,0);
}
@@ -287,7 +288,7 @@ public class IntrinsicLink extends org.a
{
HashMap map = new HashMap();
map.put(newField,statusToString(LINKSTATUS_EXISTING));
- map.put(processIDField,ManifoldCF.getProcessID());
+ map.put(processIDField,processID);
ArrayList updateList = new ArrayList();
String query = buildConjunctionClause(updateList,new
ClauseDescription[]{
new UnitaryClause(jobIDField,jobID),
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1545115&r1=1545114&r2=1545115&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Sun Nov 24 23:46:17 2013
@@ -3914,7 +3914,7 @@ public class JobManager implements IJobM
" initial docs for job "+jobID.toString());
if (legalLinkTypes.length > 0)
-
hopCount.recordSeedReferences(jobID,legalLinkTypes,reorderedDocIDHashes,hopcountMethod);
+
hopCount.recordSeedReferences(jobID,legalLinkTypes,reorderedDocIDHashes,hopcountMethod,processID);
TrackerClass.notePrecommit();
database.performCommit();
@@ -4006,7 +4006,7 @@ public class JobManager implements IJobM
jobQueue.addRemainingDocumentsInitial(jobID,reorderedDocIDHashes,processID);
if (legalLinkTypes.length > 0)
-
hopCount.recordSeedReferences(jobID,legalLinkTypes,reorderedDocIDHashes,hopcountMethod);
+
hopCount.recordSeedReferences(jobID,legalLinkTypes,reorderedDocIDHashes,hopcountMethod,processID);
database.performCommit();
@@ -4314,6 +4314,7 @@ public class JobManager implements IJobM
* This method is called during document processing, when a set of document
references are discovered.
* The document references are passed to this method, which updates the
status of the document(s)
* in the specified job's queue, according to specific state rules.
+ *@param processID is the process ID.
*@param jobID is the job identifier.
*@param legalLinkTypes is the set of legal link types that this connector
generates.
*@param docIDHashes are the local document identifier hashes.
@@ -4330,7 +4331,9 @@ public class JobManager implements IJobM
*@param prereqEventNames are the events that must be completed before a
document can be queued.
*@return an array of boolean values indicating whether or not the passed-in
priority value was used or not for each doc id (true if used).
*/
- public boolean[] addDocuments(Long jobID, String[] legalLinkTypes,
+ @Override
+ public boolean[] addDocuments(String processID,
+ Long jobID, String[] legalLinkTypes,
String[] docIDHashes, String[] docIDs,
String parentIdentifierHash, String relationshipType,
int hopcountMethod, String[][] dataNames, Object[][][] dataValues,
@@ -4517,12 +4520,12 @@ public class JobManager implements IJobM
}
// Update all the carrydown data at once, for greatest efficiency.
- boolean[] carrydownChangesSeen =
carryDown.recordCarrydownDataMultiple(jobID,parentIdentifierHash,reorderedDocIDHashes,dataNames,dataHashValues,dataValues);
+ boolean[] carrydownChangesSeen =
carryDown.recordCarrydownDataMultiple(jobID,parentIdentifierHash,reorderedDocIDHashes,dataNames,dataHashValues,dataValues,processID);
// Same with hopcount.
boolean[] hopcountChangesSeen = null;
if (parentIdentifierHash != null && relationshipType != null)
- hopcountChangesSeen =
hopCount.recordReferences(jobID,legalLinkTypes,parentIdentifierHash,reorderedDocIDHashes,relationshipType,hopcountMethod);
+ hopcountChangesSeen =
hopCount.recordReferences(jobID,legalLinkTypes,parentIdentifierHash,reorderedDocIDHashes,relationshipType,hopcountMethod,processID);
// Loop through the document id's again, and perform updates where
needed
boolean[] reorderedRval = new boolean[reorderedDocIDHashes.length];
@@ -4606,6 +4609,7 @@ public class JobManager implements IJobM
* This method is called during document processing, when a document
reference is discovered.
* The document reference is passed to this method, which updates the status
of the document
* in the specified job's queue, according to specific state rules.
+ *@param processID is the process ID.
*@param jobID is the job identifier.
*@param legalLinkTypes is the set of legal link types that this connector
generates.
*@param docIDHash is the local document identifier hash value.
@@ -4621,13 +4625,15 @@ public class JobManager implements IJobM
*@param prereqEventNames are the events that must be completed before the
document can be processed.
*@return true if the priority value was used, false otherwise.
*/
- public boolean addDocument(Long jobID, String[] legalLinkTypes, String
docIDHash, String docID,
+ @Override
+ public boolean addDocument(String processID,
+ Long jobID, String[] legalLinkTypes, String docIDHash, String docID,
String parentIdentifierHash, String relationshipType,
int hopcountMethod, String[] dataNames, Object[][] dataValues,
long currentTime, double priority, String[] prereqEventNames)
throws ManifoldCFException
{
- return addDocuments(jobID,legalLinkTypes,
+ return addDocuments(processID,jobID,legalLinkTypes,
new String[]{docIDHash},new String[]{docID},
parentIdentifierHash,relationshipType,hopcountMethod,new
String[][]{dataNames},
new Object[][][]{dataValues},currentTime,new double[]{priority},new
String[][]{prereqEventNames})[0];
@@ -4853,15 +4859,17 @@ public class JobManager implements IJobM
}
/** Begin an event sequence.
+ *@param processID is the current process ID.
*@param eventName is the name of the event.
*@return true if the event could be created, or false if it's already there.
*/
- public boolean beginEventSequence(String eventName)
+ @Override
+ public boolean beginEventSequence(String processID, String eventName)
throws ManifoldCFException
{
try
{
- eventManager.createEvent(eventName);
+ eventManager.createEvent(eventName,processID);
return true;
}
catch (ManifoldCFException e)
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java?rev=1545115&r1=1545114&r2=1545115&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
(original)
+++
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Sun Nov 24 23:46:17 2013
@@ -310,7 +310,7 @@ public class WorkerThread extends Thread
String outputVersion =
ingester.getOutputDescription(outputName,outputSpec);
HashMap abortSet = new HashMap();
- VersionActivity versionActivity = new
VersionActivity(connectionName,connMgr,jobManager,job,ingester,abortSet,outputVersion);
+ VersionActivity versionActivity = new
VersionActivity(processID,connectionName,connMgr,jobManager,job,ingester,abortSet,outputVersion);
String aclAuthority = connection.getACLAuthority();
boolean isDefaultAuthority = (aclAuthority == null ||
aclAuthority.length() == 0);
@@ -526,7 +526,8 @@ public class WorkerThread extends Thread
}
// First, make the things we will need for all
subsequent steps.
- ProcessActivity activity = new
ProcessActivity(threadContext,queueTracker,jobManager,ingester,
+ ProcessActivity activity = new
ProcessActivity(processID,
+ threadContext,queueTracker,jobManager,ingester,
currentTime,job,connection,connector,connMgr,legalLinkTypes,ingestLogger,abortSet,outputVersion,newParameterVersion);
try
{
@@ -1231,21 +1232,22 @@ public class WorkerThread extends Thread
*/
protected static class VersionActivity implements IVersionActivity
{
- protected String connectionName;
- protected IRepositoryConnectionManager connMgr;
- protected IJobManager jobManager;
- protected Long jobID;
- protected IJobDescription job;
- protected IIncrementalIngester ingester;
- protected HashMap abortSet;
- protected String outputVersion;
+ protected final String processID;
+ protected final String connectionName;
+ protected final IRepositoryConnectionManager connMgr;
+ protected final IJobManager jobManager;
+ protected final IJobDescription job;
+ protected final IIncrementalIngester ingester;
+ protected final HashMap abortSet;
+ protected final String outputVersion;
/** Constructor.
*/
- public VersionActivity(String connectionName, IRepositoryConnectionManager
connMgr,
+ public VersionActivity(String processID, String connectionName,
IRepositoryConnectionManager connMgr,
IJobManager jobManager, IJobDescription job, IIncrementalIngester
ingester, HashMap abortSet,
String outputVersion)
{
+ this.processID = processID;
this.connectionName = connectionName;
this.connMgr = connMgr;
this.jobManager = jobManager;
@@ -1364,7 +1366,7 @@ public class WorkerThread extends Thread
public boolean beginEventSequence(String eventName)
throws ManifoldCFException
{
- return jobManager.beginEventSequence(eventName);
+ return jobManager.beginEventSequence(processID,eventName);
}
/** Complete an event sequence.
@@ -1417,7 +1419,7 @@ public class WorkerThread extends Thread
*/
public String createJobSpecificString(String simpleString)
{
- return ManifoldCF.createJobSpecificString(jobID,simpleString);
+ return ManifoldCF.createJobSpecificString(job.getID(),simpleString);
}
}
@@ -1427,6 +1429,7 @@ public class WorkerThread extends Thread
protected static class ProcessActivity implements IProcessActivity
{
// Member variables
+ protected final String processID;
protected final IThreadContext threadContext;
protected final IJobManager jobManager;
protected final IIncrementalIngester ingester;
@@ -1458,10 +1461,11 @@ public class WorkerThread extends Thread
*@param jobManager is the job manager
*@param ingester is the ingester
*/
- public ProcessActivity(IThreadContext threadContext, QueueTracker
queueTracker, IJobManager jobManager, IIncrementalIngester ingester,
+ public ProcessActivity(String processID, IThreadContext threadContext,
QueueTracker queueTracker, IJobManager jobManager, IIncrementalIngester
ingester,
long currentTime, IJobDescription job, IRepositoryConnection connection,
IRepositoryConnector connector, IRepositoryConnectionManager connMgr,
String[] legalLinkTypes, OutputActivity ingestLogger, HashMap abortSet,
String outputVersion, String parameterVersion)
{
+ this.processID = processID;
this.threadContext = threadContext;
this.queueTracker = queueTracker;
this.jobManager = jobManager;
@@ -2018,7 +2022,8 @@ public class WorkerThread extends Thread
j++;
}
- boolean[] trackerNote =
jobManager.addDocuments(job.getID(),legalLinkTypes,docidHashes,docids,db.getParentIdentifierHash(),db.getLinkType(),job.getHopcountMode(),
+ boolean[] trackerNote = jobManager.addDocuments(processID,
+
job.getID(),legalLinkTypes,docidHashes,docids,db.getParentIdentifierHash(),db.getLinkType(),job.getHopcountMode(),
dataNames,dataValues,currentTime,priorities,eventNames);
// Inform queuetracker about what we used and what we didn't
@@ -2062,7 +2067,7 @@ public class WorkerThread extends Thread
public boolean beginEventSequence(String eventName)
throws ManifoldCFException
{
- return jobManager.beginEventSequence(eventName);
+ return jobManager.beginEventSequence(processID,eventName);
}
/** Complete an event sequence.
