Author: kwright
Date: Sat Dec 15 14:29:23 2018
New Revision: 1848999
URL: http://svn.apache.org/viewvc?rev=1848999&view=rev
Log:
Log all delete dependencies that we record, and do more refactoring
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopDeleteDeps.java
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java?rev=1848999&r1=1848998&r2=1848999&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java
Sat Dec 15 14:29:23 2018
@@ -1659,7 +1659,7 @@ public class HopCount extends org.apache
HashMap map = new HashMap();
- Iterator iter;
+ Iterator<DeleteDependency> depiter;
// Find the existing record
int existingDistance = dn.getDatabaseValue();
@@ -1715,7 +1715,7 @@ public class HopCount extends org.apache
// have numerous delete dependencies. I therefore reorganized this
code to be incremental where it makes
// sense to be. This could cut back on the number of required
operations significantly.
- HashMap existingDepsMap = new HashMap();
+ Set<DeleteDependency> existingDepsMap = new HashSet<>();
if (hopcountMethod != IJobDescription.HOPCOUNT_NEVERDELETE)
{
// If we knew in advance which nodes we'd be writing, we could have
read the old
@@ -1742,11 +1742,8 @@ public class HopCount extends org.apache
*/
// Drop these into a hash map.
- int k = 0;
- while (k < existingDeps.length)
- {
- DeleteDependency dep = existingDeps[k++];
- existingDepsMap.put(dep,dep);
+ for (final DeleteDependency dep : existingDeps) {
+ existingDepsMap.add(dep);
}
}
@@ -1763,18 +1760,18 @@ public class HopCount extends org.apache
// Write either dependencies, or dependency deltas
int incrementalOpCount = 0;
- iter = existingDepsMap.keySet().iterator();
- while (iter.hasNext())
+ depiter = existingDepsMap.iterator();
+ while (depiter.hasNext())
{
- DeleteDependency dep = (DeleteDependency)iter.next();
+ DeleteDependency dep = depiter.next();
if (answer.hasDependency(dep) == false)
incrementalOpCount++;
}
- iter = answer.getDeleteDependencies();
- while (iter.hasNext())
+ depiter = answer.getDeleteDependencies();
+ while (depiter.hasNext())
{
- DeleteDependency dep = (DeleteDependency)iter.next();
- if (existingDepsMap.get(dep) == null)
+ DeleteDependency dep = depiter.next();
+ if (!existingDepsMap.contains(dep))
incrementalOpCount++;
}
@@ -1785,20 +1782,20 @@ public class HopCount extends org.apache
}
// Write the individual deletes...
- iter = existingDepsMap.keySet().iterator();
- while (iter.hasNext())
+ depiter = existingDepsMap.iterator();
+ while (depiter.hasNext())
{
- DeleteDependency dep = (DeleteDependency)iter.next();
+ DeleteDependency dep = depiter.next();
if (answer.hasDependency(dep) == false)
deleteDepsManager.deleteDependency(existingID,dep);
}
// Then, inserts...
- iter = answer.getDeleteDependencies();
- while (iter.hasNext())
+ depiter = answer.getDeleteDependencies();
+ while (depiter.hasNext())
{
- DeleteDependency dep = (DeleteDependency)iter.next();
- if (existingDepsMap.get(dep) == null)
+ DeleteDependency dep = depiter.next();
+ if (!existingDepsMap.contains(dep))
deleteDepsManager.writeDependency(existingID,jobID,dep);
}
}
@@ -1860,10 +1857,10 @@ public class HopCount extends org.apache
if (hopcountMethod != IJobDescription.HOPCOUNT_NEVERDELETE)
{
- iter = answer.getDeleteDependencies();
- while (iter.hasNext())
+ depiter = answer.getDeleteDependencies();
+ while (depiter.hasNext())
{
- DeleteDependency dep = (DeleteDependency)iter.next();
+ DeleteDependency dep = depiter.next();
deleteDepsManager.writeDependency(id,jobID,dep);
}
}
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopDeleteDeps.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopDeleteDeps.java?rev=1848999&r1=1848998&r2=1848999&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopDeleteDeps.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopDeleteDeps.java
Sat Dec 15 14:29:23 2018
@@ -227,6 +227,9 @@ public class HopDeleteDeps extends org.a
public void writeDependency(Long ownerID, Long jobID, DeleteDependency dd)
throws ManifoldCFException
{
+ if (Logging.hopcount.isDebugEnabled()) {
+ Logging.hopcount.debug("Writing hopcount dependency for job "+jobID+"
owner "+ownerID+" linktype='"+dd.getLinkType()+"'
parenthash='"+dd.getParentIDHash()+" childhash='"+dd.getChildIDHash()+"'");
+ }
HashMap map = new HashMap();
map.put(jobIDField,jobID);
map.put(ownerIDField,ownerID);
