Author: kwright
Date: Tue Nov 4 09:07:56 2014
New Revision: 1636521
URL: http://svn.apache.org/r1636521
Log:
Pull up fix for CONNECTORS-1093 from branches/dev_1x
Modified:
manifoldcf/branches/release-1.7-branch/ (props changed)
manifoldcf/branches/release-1.7-branch/CHANGES.txt
manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
Propchange: manifoldcf/branches/release-1.7-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/dev_1x:r1636520
Merged /manifoldcf/trunk:r1636519
Modified: manifoldcf/branches/release-1.7-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/CHANGES.txt?rev=1636521&r1=1636520&r2=1636521&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.7-branch/CHANGES.txt Tue Nov 4 09:07:56 2014
@@ -4,6 +4,10 @@ $Id$
======================= Release 1.7.2 =====================
+CONNECTORS-1093: Need to preload document priorities for reset
+of all priorities, for performance.
+(Karl Wright)
+
CONNECTORS-1092: Error in log during load tests.
(Karl Wright)
Modified:
manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java?rev=1636521&r1=1636520&r2=1636521&view=diff
==============================================================================
---
manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
(original)
+++
manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
Tue Nov 4 09:07:56 2014
@@ -1078,8 +1078,8 @@ public class ManifoldCF extends org.apac
IPriorityCalculator[] priorities = new IPriorityCalculator[descs.length];
// Go through the documents and calculate the priorities
- int i = 0;
- while (i < descs.length)
+ rt.clearPreloadRequests();
+ for (int i = 0; i < descs.length; i++)
{
DocumentDescription dd = descs[i];
IJobDescription job = jobDescriptionMap.get(dd.getJobID());
@@ -1111,16 +1111,16 @@ public class ManifoldCF extends org.apac
{
repositoryConnectorPool.release(connection,connector);
}
-
- priorities[i] = new PriorityCalculator(rt,connection,binNames);
-
- i++;
+ PriorityCalculator p = new PriorityCalculator(rt,connection,binNames);
+ priorities[i] = p;
+ p.makePreloadRequest();
}
-
+ rt.preloadBinValues();
+
// Now, write all the priorities we can.
jobManager.writeDocumentPriorities(currentTime,descs,priorities);
-
+ rt.clearPreloadedValues();
}
/** Get the activities list for a given repository connection.
