Author: kwright
Date: Sat Apr 27 13:23:57 2013
New Revision: 1476570
URL: http://svn.apache.org/r1476570
Log:
Another partial fix for CONNECTORS-678.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1476570&r1=1476569&r2=1476570&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Apr 27 13:23:57 2013
@@ -3,6 +3,10 @@ $Id$
======================= 1.2-dev =====================
+CONNECTORS-678: Add missing noteModification() method calls, so
+that jobqueue is reanalyzed more frequently.
+(Karl Wright)
+
CONNECTORS-681: ElasticSearch and OpenSearchServer connectors
both misused the File object passed to them in checkFileIndexable()
in order to see if the extension was a supported one. Instead they
Modified:
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java?rev=1476570&r1=1476569&r2=1476570&view=diff
==============================================================================
---
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
(original)
+++
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
Sat Apr 27 13:23:57 2013
@@ -1245,7 +1245,7 @@ public class DBInterfaceDerby extends Da
if (threshold == null)
{
// Look for this parameter; if we don't find it, use a default value.
- reindexThreshold =
ManifoldCF.getIntProperty("org.apache.manifold.db.derby.reindex."+tableName,250000);
+ reindexThreshold =
ManifoldCF.getIntProperty("org.apache.manifoldcf.db.derby.reindex."+tableName,250000);
reindexThresholds.put(tableName,new Integer(reindexThreshold));
}
else
@@ -1302,7 +1302,7 @@ public class DBInterfaceDerby extends Da
if (threshold == null)
{
// Look for this parameter; if we don't find it, use a default value.
- analyzeThreshold =
ManifoldCF.getIntProperty("org.apache.manifold.db.derby.analyze."+tableName,5000);
+ analyzeThreshold =
ManifoldCF.getIntProperty("org.apache.manifoldcf.db.derby.analyze."+tableName,5000);
analyzeThresholds.put(tableName,new Integer(analyzeThreshold));
}
else
Modified:
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java?rev=1476570&r1=1476569&r2=1476570&view=diff
==============================================================================
---
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
(original)
+++
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
Sat Apr 27 13:23:57 2013
@@ -1278,7 +1278,7 @@ public class DBInterfaceMySQL extends Da
if (threshold == null)
{
// Look for this parameter; if we don't find it, use a default value.
- analyzeThreshold =
ManifoldCF.getIntProperty("org.apache.manifold.db.mysql.analyze."+tableName,10000);
+ analyzeThreshold =
ManifoldCF.getIntProperty("org.apache.manifoldcf.db.mysql.analyze."+tableName,10000);
analyzeThresholds.put(tableName,new Integer(analyzeThreshold));
}
else
Modified:
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java?rev=1476570&r1=1476569&r2=1476570&view=diff
==============================================================================
---
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
(original)
+++
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
Sat Apr 27 13:23:57 2013
@@ -1416,7 +1416,7 @@ public class DBInterfacePostgreSQL exten
if (threshold == null)
{
// Look for this parameter; if we don't find it, use a default value.
- reindexThreshold =
ManifoldCF.getIntProperty("org.apache.manifold.db.postgres.reindex."+tableName,250000);
+ reindexThreshold =
ManifoldCF.getIntProperty("org.apache.manifoldcf.db.postgres.reindex."+tableName,250000);
reindexThresholds.put(tableName,new Integer(reindexThreshold));
}
else
@@ -1461,7 +1461,7 @@ public class DBInterfacePostgreSQL exten
lockManager.leaveWriteCriticalSection(tableStatisticsLock);
}
- // Analysis.
+ // Analysis.
// Here we count tuple addition.
eventCount = modifyCount + insertCount;
tableStatisticsLock = statslockAnalyzePrefix+tableName;
@@ -1473,7 +1473,7 @@ public class DBInterfacePostgreSQL exten
if (threshold == null)
{
// Look for this parameter; if we don't find it, use a default value.
- analyzeThreshold =
ManifoldCF.getIntProperty("org.apache.manifold.db.postgres.analyze."+tableName,5000);
+ analyzeThreshold =
ManifoldCF.getIntProperty("org.apache.manifoldcf.db.postgres.analyze."+tableName,5000);
analyzeThresholds.put(tableName,new Integer(analyzeThreshold));
}
else
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java?rev=1476570&r1=1476569&r2=1476570&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Sat Apr 27 13:23:57 2013
@@ -409,21 +409,11 @@ public class JobQueue extends org.apache
new UnitaryClause(jobIDField,jobID),
new UnitaryClause(statusField,statusToString(STATUS_HOPCOUNTREMOVED))});
performUpdate(map,"WHERE "+query,list,null);
+ unconditionallyAnalyzeTables();
TrackerClass.noteJobChange(jobID,"Map HOPCOUNTREMOVED to PENDING");
}
- /** Delete all records for a job that have status HOPCOUNTREMOVED.
- */
- public void deleteHopcountRemovedRecords(Long jobID)
- throws ManifoldCFException
- {
- ArrayList list = new ArrayList();
- String query = buildConjunctionClause(list,new ClauseDescription[]{
- new UnitaryClause(jobIDField,jobID),
- new UnitaryClause(statusField,statusToString(STATUS_HOPCOUNTREMOVED))});
- performDelete("WHERE "+query,list,null);
- }
/** Clear the failtimes for all documents associated with a job.
* This method is called when the system detects that a significant delaying
event has occurred,
@@ -468,6 +458,7 @@ public class JobQueue extends org.apache
statusToString(STATUS_ACTIVEPURGATORY),
statusToString(STATUS_ACTIVENEEDRESCANPURGATORY)})});
performUpdate(map,"WHERE "+query,list,null);
+ unconditionallyAnalyzeTables();
TrackerClass.noteGlobalChange("Reset document worker status");
}
@@ -485,7 +476,8 @@ public class JobQueue extends org.apache
String query = buildConjunctionClause(list,new ClauseDescription[]{
new UnitaryClause(statusField,statusToString(STATUS_BEINGDELETED))});
performUpdate(map,"WHERE "+query,list,null);
-
+ unconditionallyAnalyzeTables();
+
TrackerClass.noteGlobalChange("Reset document delete worker status");
}
@@ -502,7 +494,8 @@ public class JobQueue extends org.apache
String query = buildConjunctionClause(list,new ClauseDescription[]{
new UnitaryClause(statusField,statusToString(STATUS_BEINGCLEANED))});
performUpdate(map,"WHERE "+query,list,null);
-
+ unconditionallyAnalyzeTables();
+
TrackerClass.noteGlobalChange("Reset document cleanup worker status");
}
@@ -795,7 +788,7 @@ public class JobQueue extends org.apache
String query = buildConjunctionClause(list,new ClauseDescription[]{
new UnitaryClause(idField,recID)});
performUpdate(map,"WHERE "+query,list,null);
-
+ noteModifications(0,1,0);
TrackerClass.noteRecordChange(recID, newStatus, "Note completion");
}
@@ -845,6 +838,7 @@ public class JobQueue extends org.apache
String query = buildConjunctionClause(list,new ClauseDescription[]{
new UnitaryClause(idField,recID)});
performUpdate(map,"WHERE "+query,list,null);
+ noteModifications(0,1,0);
TrackerClass.noteRecordChange(recID, newStatus, "Update or hopcount
remove");
return rval;
}
