svn commit: r1372223 - /manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java

[kw...@apache.org]

Author: kwright
Date: Mon Aug 13 00:38:29 2012
New Revision: 1372223

URL: http://svn.apache.org/viewvc?rev=1372223&view=rev
Log:
Clean up the code and don't do more work than is necessary.

Modified:
    manifoldcf/branches/CONNECTORS-501/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.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=1372223&r1=1372222&r2=1372223&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 Mon Aug 13 00:38:29 2012
@@ -2489,112 +2489,9 @@ public class JobManager implements IJobM
     int hopcountMethod)
     throws ManifoldCFException
   {
-    // For each record, we're going to have to choose between deleting it, and marking it for rescan.  So the
-    // basic flow may involve changing a document's status, or blowing it away completely.
-    
-    // Before we can change a document status, we need to know the *current* status.  Therefore, a SELECT xxx FOR UPDATE/UPDATE
-    // transaction is needed in order to complete these documents correctly.
-    //
-    // Since we are therefore setting row locks on thejobqueue table, we need to work to avoid unnecessary deadlocking.  To do that, we have to
-    // lock rows in document id hash order!!  Luckily, the DocumentDescription objects have a document identifier buried within, which we can use to
-    // order the "select for update" operations appropriately.
-    //
-
-    HashMap indexMap = new HashMap();
-    String[] docIDHashes = new String[documentDescriptions.length];
-
-    int i = 0;
-    while (i < documentDescriptions.length)
-    {
-      String documentIDHash = documentDescriptions[i].getDocumentIdentifierHash() + ":" + documentDescriptions[i].getJobID();
-      docIDHashes[i] = documentIDHash;
-      indexMap.put(documentIDHash,new Integer(i));
-      i++;
-    }
-
-    java.util.Arrays.sort(docIDHashes);
-
-    // Retry loop - in case we get a deadlock despite our best efforts
-    while (true)
-    {
-      long sleepAmt = 0L;
-      database.beginTransaction(database.TRANSACTION_SERIALIZED);
-      try
-      {
-        // Do one row at a time, to avoid deadlocking things
-        List<String> deleteList = new ArrayList<String>();
-        
-        i = 0;
-        while (i < docIDHashes.length)
-        {
-          String docIDHash = docIDHashes[i];
-
-          // Get the DocumentDescription object
-          DocumentDescription dd = documentDescriptions[((Integer)indexMap.get(docIDHash)).intValue()];
-
-          // Query for the status
-          ArrayList list = new ArrayList();
-          String query = database.buildConjunctionClause(list,new ClauseDescription[]{
-            new UnitaryClause(jobQueue.idField,dd.getID())});
-          IResultSet set = database.performQuery("SELECT "+jobQueue.statusField+" FROM "+jobQueue.getTableName()+" WHERE "+
-            query+" FOR UPDATE",list,null,null);
-          if (set.getRowCount() > 0)
-          {
-            IResultRow row = set.getRow(0);
-            // Grab the status
-            int status = jobQueue.stringToStatus((String)row.getValue(jobQueue.statusField));
-            // Update the jobqueue table
-            boolean didDelete = jobQueue.updateOrDeleteRecord(dd.getID(),status);
-            if (didDelete)
-            {
-              deleteList.add(dd.getDocumentIdentifierHash());
-            }
-          }
-          i++;
-        }
-        
-        String[] docIDSimpleHashes = new String[deleteList.size()];
-        for (int j = 0; j < docIDSimpleHashes.length; j++)
-        {
-          docIDSimpleHashes[j] = deleteList.get(j);
-        }
-        
-        // Next, find the documents that are affected by carrydown deletion.
-        DocumentDescription[] rval = calculateAffectedDeleteCarrydownChildren(jobID,docIDSimpleHashes);
-
-        // Finally, delete the carrydown records in question.
-        carryDown.deleteRecords(jobID,docIDSimpleHashes);
-        if (legalLinkTypes.length > 0)
-          hopCount.deleteDocumentIdentifiers(jobID,legalLinkTypes,docIDSimpleHashes,hopcountMethod);
-
-        database.performCommit();
-        return rval;
-      }
-      catch (ManifoldCFException e)
-      {
-        database.signalRollback();
-        if (e.getErrorCode() == e.DATABASE_TRANSACTION_ABORT)
-        {
-          if (Logging.perf.isDebugEnabled())
-            Logging.perf.debug("Aborted transaction marking completed "+Integer.toString(docIDHashes.length)+
-            " docs: "+e.getMessage());
-          sleepAmt = getRandomAmount();
-          continue;
-        }
-        throw e;
-      }
-      catch (Error e)
-      {
-        database.signalRollback();
-        throw e;
-      }
-      finally
-      {
-        database.endTransaction();
-        sleepFor(sleepAmt);
-      }
-    }
-
+    // It's no longer an issue to have to deal with documents being conditionally deleted; that's been
+    // taken over by the hopcountremoval method below.  So just use the simple 'delete' functionality.
+    return doDeleteMultiple(jobID,legalLinkTypes,documentDescriptions,hopcountMethod);
   }
 
   /** Delete from queue as a result of processing of an active document.