svn commit: r1639601 - in /manifoldcf/branches/dev_1x: ./ CHANGES.txt framework/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java

[kw...@apache.org]

Author: kwright
Date: Fri Nov 14 10:55:14 2014
New Revision: 1639601

URL: http://svn.apache.org/r1639601
Log:
Pull up fix for CONNECTORS-1102 from trunk.

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/CHANGES.txt
    manifoldcf/branches/dev_1x/framework/   (props changed)
    manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1639600

Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1639601&r1=1639600&r2=1639601&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Fri Nov 14 10:55:14 2014
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.8-dev =====================
 
+CONNECTORS-1102: Don't do a hard reindex on jobqueue.restart,
+since it is expensive and may be unnecessary.
+(Aeham Abushwashi, Karl Wright)
+
 CONNECTORS-1101: Fix shutdown hang caused by poor interrupt
 handling in MySQL driver.
 (Karl Wright)

Propchange: manifoldcf/branches/dev_1x/framework/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk/framework:r1639600

Modified: manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java?rev=1639601&r1=1639600&r2=1639601&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java (original)
+++ manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java Fri Nov 14 10:55:14 2014
@@ -419,8 +419,11 @@ public class JobQueue extends org.apache
       new UnitaryClause(seedingProcessIDField,processID)});
     performUpdate(map,"WHERE "+query,list,null);
 
-    // Reindex the jobqueue table, since we've probably made lots of bad tuples doing the above operations.
-    reindexTable();
+    // Not accurate, but best we can do without overhead.  This number is chosen so that default
+    // values of the reindexing parameters will cause reindexing to occur at this point, but users
+    // can configure them higher and shut this down.
+    noteModifications(0,50000,0);
+    // Always analyze.
     unconditionallyAnalyzeTables();
 
     TrackerClass.noteGlobalChange("Restart");
@@ -479,8 +482,10 @@ public class JobQueue extends org.apache
       new UnitaryClause(isSeedField,seedstatusToString(SEEDSTATUS_NEWSEED))});
     performUpdate(map,"WHERE "+query,list,null);
 
-    // Reindex the jobqueue table, since we've probably made lots of bad tuples doing the above operations.
-    reindexTable();
+    // Not accurate, but best we can do without overhead.  This number is chosen so that default
+    // values of the reindexing parameters will cause reindexing to occur at this point, but users
+    // can configure them higher and shut this down.
+    noteModifications(0,50000,0);
     unconditionallyAnalyzeTables();
 
     TrackerClass.noteGlobalChange("Restart cluster");