You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/10/15 16:23:40 UTC
svn commit: r1632053 - in /manifoldcf/trunk: ./
framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/
framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/
framework/pull-agent/src/main/java/org/apache/mani...
Author: kwright
Date: Wed Oct 15 14:23:39 2014
New Revision: 1632053
URL: http://svn.apache.org/r1632053
Log:
Fix for CONNECTORS-1073.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/EventManager.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ScheduleManager.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryHistoryManager.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/ThrottleSpecManager.java
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1632053&r1=1632052&r2=1632053&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Oct 15 14:23:39 2014
@@ -3,6 +3,10 @@ $Id$
======================= 2.0-dev =====================
+CONNECTORS-1073: Remove 1.x-related upgrade code, since schema
+for 2.0 is not backwards compatible with 1.x anyhow.
+(Karl Wright)
+
CONNECTORS-1075: Provide a means of obfuscating passwords in
properties.xml and global-properties.xml. Also include an obfuscation
utility in the distribution, for generating obfuscated passwords.
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java?rev=1632053&r1=1632052&r2=1632053&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java Wed Oct 15 14:23:39 2014
@@ -109,78 +109,7 @@ public class AuthorityConnectionManager
}
else
{
- // Add the mappingField column
- ColumnDescription cd = (ColumnDescription)existing.get(mappingField);
- if (cd == null)
- {
- Map addMap = new HashMap();
- addMap.put(mappingField,new ColumnDescription("VARCHAR(32)",false,true,null,null,false));
- performAlter(addMap,null,null,null);
- }
- // Add the authDomainField column
- cd = (ColumnDescription)existing.get(authDomainField);
- if (cd == null)
- {
- Map addMap = new HashMap();
- addMap.put(authDomainField,new ColumnDescription("VARCHAR(255)",false,true,null,null,false));
- performAlter(addMap,null,null,null);
- }
- cd = (ColumnDescription)existing.get(groupNameField);
- if (cd == null)
- {
- Map addMap = new HashMap();
- addMap.put(groupNameField,new ColumnDescription("VARCHAR(32)",false,true,
- authMgr.getTableName(),authMgr.getGroupNameColumn(),false));
- performAlter(addMap,null,null,null);
- boolean revert = true;
- try
- {
- ArrayList params = new ArrayList();
- IResultSet set = performQuery("SELECT "+nameField+","+descriptionField+" FROM "+getTableName(),null,null,null);
- for (int i = 0 ; i < set.getRowCount() ; i++)
- {
- IResultRow row = set.getRow(i);
- String authName = (String)row.getValue(nameField);
- String authDescription = (String)row.getValue(descriptionField);
- // Attempt to create a matching auth group. This will fail if the group
- // already exists
- IAuthorityGroup grp = authMgr.create();
- grp.setName(authName);
- grp.setDescription(authDescription);
- try
- {
- authMgr.save(grp);
- }
- catch (ManifoldCFException e)
- {
- if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
- throw e;
- // Fall through; the row exists already
- }
- Map<String,String> map = new HashMap<String,String>();
- map.put(groupNameField,authName);
- params.clear();
- String query = buildConjunctionClause(params,new ClauseDescription[]{
- new UnitaryClause(nameField,authName)});
- performUpdate(map," WHERE "+query,params,null);
- }
- Map modifyMap = new HashMap();
- modifyMap.put(groupNameField,new ColumnDescription("VARCHAR(32)",false,false,
- authMgr.getTableName(),authMgr.getGroupNameColumn(),false));
- performAlter(null,modifyMap,null,null);
- revert = false;
- }
- finally
- {
- if (revert)
- {
- // Upgrade failed; back out our changes
- List<String> deleteList = new ArrayList<String>();
- deleteList.add(groupNameField);
- performAlter(null,null,deleteList,null);
- }
- }
- }
+ // Upgrade goes here if any
}
// Index management goes here
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java?rev=1632053&r1=1632052&r2=1632053&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java Wed Oct 15 14:23:39 2014
@@ -76,7 +76,11 @@ public class ConnectorManager extends or
performCreate(map,null);
}
-
+ else
+ {
+ // Upgrade goes here if needed
+ }
+
// Index management
IndexDescription descriptionIndex = new IndexDescription(true,new String[]{descriptionField});
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java?rev=1632053&r1=1632052&r2=1632053&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java Wed Oct 15 14:23:39 2014
@@ -116,12 +116,6 @@ public class Carrydown extends org.apach
else
{
// Upgrade code goes here, if needed.
- if (existing.get(processIDField) == null)
- {
- Map insertMap = new HashMap();
- insertMap.put(processIDField,new ColumnDescription("VARCHAR(16)",false,true,null,null,false));
- performAlter(insertMap,null,null,null);
- }
}
// Now do index management
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/EventManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/EventManager.java?rev=1632053&r1=1632052&r2=1632053&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/EventManager.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/EventManager.java Wed Oct 15 14:23:39 2014
@@ -75,12 +75,6 @@ public class EventManager extends org.ap
else
{
// Upgrade goes here if needed
- if (existing.get(processIDField) == null)
- {
- Map insertMap = new HashMap();
- insertMap.put(processIDField,new ColumnDescription("VARCHAR(16)",false,true,null,null,false));
- performAlter(insertMap,null,null,null);
- }
}
// Index management goes here
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java?rev=1632053&r1=1632052&r2=1632053&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java Wed Oct 15 14:23:39 2014
@@ -107,12 +107,6 @@ public class IntrinsicLink extends org.a
else
{
// Perform upgrade, if needed.
- if (existing.get(processIDField) == null)
- {
- Map insertMap = new HashMap();
- insertMap.put(processIDField,new ColumnDescription("VARCHAR(16)",false,true,null,null,false));
- performAlter(insertMap,null,null,null);
- }
}
// Indexes
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=1632053&r1=1632052&r2=1632053&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 Wed Oct 15 14:23:39 2014
@@ -214,25 +214,6 @@ public class JobQueue extends org.apache
else
{
// Upgrade; null docpriority fields bashed to 'infinity', so they don't slow down MySQL
- Map map = new HashMap();
- map.put(docPriorityField,nullDocPriority);
- performUpdate(map,"WHERE "+docPriorityField+" IS NULL",null,null);
-
- // Also, add processIDField
- if (existing.get(processIDField) == null)
- {
- Map insertMap = new HashMap();
- insertMap.put(processIDField,new ColumnDescription("VARCHAR(16)",false,true,null,null,false));
- performAlter(insertMap,null,null,null);
- }
-
- // Add seedingProcessID field too
- if (existing.get(seedingProcessIDField) == null)
- {
- Map insertMap = new HashMap();
- insertMap.put(seedingProcessIDField,new ColumnDescription("VARCHAR(16)",false,true,null,null,false));
- performAlter(insertMap,null,null,null);
- }
}
// Secondary table installation
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java?rev=1632053&r1=1632052&r2=1632053&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java Wed Oct 15 14:23:39 2014
@@ -422,92 +422,6 @@ public class Jobs extends org.apache.man
else
{
// Do any needed upgrades
- if (existing.get(processIDField) == null)
- {
- Map insertMap = new HashMap();
- insertMap.put(processIDField,new ColumnDescription("VARCHAR(16)",false,true,null,null,false));
- performAlter(insertMap,null,null,null);
- }
- if (existing.get(maxIntervalField) == null)
- {
- Map insertMap = new HashMap();
- insertMap.put(maxIntervalField,new ColumnDescription("BIGINT",false,true,null,null,false));
- performAlter(insertMap,null,null,null);
- }
- if (existing.get(failTimeField) == null)
- {
- Map insertMap = new HashMap();
- insertMap.put(failTimeField,new ColumnDescription("BIGINT",false,true,null,null,false));
- performAlter(insertMap,null,null,null);
- }
- if (existing.get(failCountField) == null)
- {
- Map insertMap = new HashMap();
- insertMap.put(failCountField,new ColumnDescription("BIGINT",false,true,null,null,false));
- performAlter(insertMap,null,null,null);
- }
- if (existing.get(assessmentStateField) == null)
- {
- Map insertMap = new HashMap();
- insertMap.put(assessmentStateField,new ColumnDescription("CHAR(1)",false,true,null,null,false));
- performAlter(insertMap,null,null,null);
- String query;
- ArrayList list = new ArrayList();
- HashMap map = new HashMap();
- query = buildConjunctionClause(list,new ClauseDescription[]{
- new MultiClause(statusField,new Object[]{
- statusToString(STATUS_ACTIVE_NOOUTPUT),
- statusToString(STATUS_ACTIVE_NEITHER)})});
- map.put(statusField,statusToString(STATUS_ACTIVE_UNINSTALLED));
- performUpdate(map,"WHERE "+query,list,null);
- list.clear();
- map.clear();
- query = buildConjunctionClause(list,new ClauseDescription[]{
- new MultiClause(statusField,new Object[]{
- statusToString(STATUS_ACTIVESEEDING_NOOUTPUT),
- statusToString(STATUS_ACTIVESEEDING_NEITHER)})});
- map.put(statusField,statusToString(STATUS_ACTIVESEEDING_UNINSTALLED));
- performUpdate(map,"WHERE "+query,list,null);
- }
- if (existing.get(seedingVersionField) == null)
- {
- Map insertMap = new HashMap();
- insertMap.put(seedingVersionField,new ColumnDescription("LONGTEXT",false,true,null,null,false));
- performAlter(insertMap,null,null,null);
- // Populate it with data from the old last check version field
- IResultSet set = performQuery("SELECT "+idField+","+oldLastCheckTimeField+" FROM "+getTableName(),null,null,null);
- for (int i = 0; i < set.getRowCount(); i++)
- {
- IResultRow row = set.getRow(i);
- Long jobID = (Long)row.getValue(idField);
- Long oldTime = (Long)row.getValue(oldLastCheckTimeField);
- if (oldTime != null)
- {
- HashMap map = new HashMap();
- map.put(seedingVersionField,oldTime.toString());
- ArrayList list = new ArrayList();
- String query = buildConjunctionClause(list,new ClauseDescription[]{
- new UnitaryClause(idField,jobID)});
- performUpdate(map,"WHERE "+query,list,null);
- }
- }
- List<String> deleteList = new ArrayList<String>();
- deleteList.add(oldLastCheckTimeField);
- performAlter(null,null,deleteList,null);
- }
-
- if (existing.get(oldOutputNameField) != null)
- {
- // Remove output name and spec fields, but first read them so we can put them into the pipeline manager
- outputSet = performQuery("SELECT "+idField+","+oldOutputSpecField+","+oldOutputNameField+" FROM "+getTableName(),null,null,null);
- // Now, delete columns
- List<String> deleteList = new ArrayList<String>();
- deleteList.add(oldOutputSpecField);
- deleteList.add(oldOutputNameField);
- performAlter(null,null,deleteList,null);
- }
- // Need upgrade for seedingversionfield and to get rid of lastcheckfield
- // MHL
}
// Handle related tables
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ScheduleManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ScheduleManager.java?rev=1632053&r1=1632052&r2=1632053&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ScheduleManager.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ScheduleManager.java Wed Oct 15 14:23:39 2014
@@ -103,26 +103,6 @@ public class ScheduleManager extends org
else
{
// Upgrade code goes here, if needed.
- if (existing.get(yearField) == null)
- {
- // Need to rename the "year" column as the "yearlist" column.
- HashMap map = new HashMap();
- map.put(yearField,new ColumnDescription("VARCHAR(255)",false,true,null,null,false));
- performAlter(map,null,null,null);
- performModification("UPDATE "+getTableName()+" SET "+yearField+"=year",null,null);
- ArrayList list = new ArrayList();
- list.add("year");
- performAlter(null,null,list,null);
-
- }
-
- if (existing.get(requestMinimumField) == null)
- {
- HashMap map = new HashMap();
- map.put(requestMinimumField,new ColumnDescription("CHAR(1)",false,true,null,null,false));
- performAlter(map,null,null,null);
- }
-
}
// Index management
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java?rev=1632053&r1=1632052&r2=1632053&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java Wed Oct 15 14:23:39 2014
@@ -118,54 +118,6 @@ public class RepositoryConnectionManager
else
{
// Upgrade code
- ColumnDescription cd = (ColumnDescription)existing.get(groupNameField);
- if (cd == null)
- {
- Map addMap = new HashMap();
- addMap.put(groupNameField,new ColumnDescription("VARCHAR(32)",false,true,
- authMgr.getTableName(),authMgr.getGroupNameColumn(),false));
- performAlter(addMap,null,null,null);
- }
- // Get rid of the authorityName field. When we do this we need to copy into the group name
- // field, adding groups if they don't yet exist first
- cd = (ColumnDescription)existing.get(authorityNameField);
- if (cd != null)
- {
- ArrayList params = new ArrayList();
- IResultSet set = performQuery("SELECT "+nameField+","+authorityNameField+" FROM "+getTableName(),null,null,null);
- for (int i = 0 ; i < set.getRowCount() ; i++)
- {
- IResultRow row = set.getRow(i);
- String repoName = (String)row.getValue(nameField);
- String authName = (String)row.getValue(authorityNameField);
- if (authName != null && authName.length() > 0)
- {
- // Attempt to create a matching auth group. This will fail if the group
- // already exists
- IAuthorityGroup grp = authMgr.create();
- grp.setName(authName);
- try
- {
- authMgr.save(grp);
- }
- catch (ManifoldCFException e)
- {
- if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
- throw e;
- // Fall through; the row exists already
- }
- Map<String,String> map = new HashMap<String,String>();
- map.put(groupNameField,authName);
- params.clear();
- String query = buildConjunctionClause(params,new ClauseDescription[]{
- new UnitaryClause(nameField,repoName)});
- performUpdate(map," WHERE "+query,params,null);
- }
- }
- List<String> deleteList = new ArrayList<String>();
- deleteList.add(authorityNameField);
- performAlter(null,null,deleteList,null);
- }
}
// Install dependent tables.
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryHistoryManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryHistoryManager.java?rev=1632053&r1=1632052&r2=1632053&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryHistoryManager.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryHistoryManager.java Wed Oct 15 14:23:39 2014
@@ -102,13 +102,6 @@ public class RepositoryHistoryManager ex
else
{
// Upgrade code.
- ColumnDescription cd = (ColumnDescription)existing.get(activityTypeField);
- if (cd.getTypeString().toUpperCase().equals("VARCHAR(32)"))
- {
- HashMap alterMap = new HashMap();
- alterMap.put(activityTypeField,new ColumnDescription("VARCHAR(64)",false,false,null,null,false));
- performAlter(null,alterMap,null,null);
- }
}
// Index management
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/ThrottleSpecManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/ThrottleSpecManager.java?rev=1632053&r1=1632052&r2=1632053&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/ThrottleSpecManager.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/ThrottleSpecManager.java Wed Oct 15 14:23:39 2014
@@ -82,17 +82,6 @@ public class ThrottleSpecManager extends
else
{
// Upgrade code goes here, if needed.
- if (existing.get(matchField) == null)
- {
- // Need to rename the "match" column as the "matchstring" column.
- HashMap map = new HashMap();
- map.put(matchField,new ColumnDescription("VARCHAR(255)",false,true,null,null,false));
- performAlter(map,null,null,null);
- performModification("UPDATE "+getTableName()+" SET "+matchField+"=match",null,null);
- ArrayList list = new ArrayList();
- list.add("match");
- performAlter(null,null,list,null);
- }
}
// Index management