Author: kwright
Date: Tue Dec 11 00:56:22 2012
New Revision: 1419954
URL: http://svn.apache.org/viewvc?rev=1419954&view=rev
Log:
Various changes and fixes to address MCF database driver problems.
Modified:
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/Database.java
manifoldcf/branches/CONNECTORS-584/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Modified:
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java?rev=1419954&r1=1419953&r2=1419954&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
(original)
+++
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
Tue Dec 11 00:56:22 2012
@@ -631,7 +631,7 @@ public class DBInterfaceDerby extends Da
{
List list = new ArrayList();
list.add("APP");
- list.add(tableName.toUpperCase());
+ list.add(tableName.toUpperCase(Locale.ROOT));
performModification("CALL
SYSCS_UTIL.SYSCS_UPDATE_STATISTICS(?,?,null)",list,null);
}
else
@@ -875,7 +875,7 @@ public class DBInterfaceDerby extends Da
{
String query = "SELECT CAST(t0.columnname AS VARCHAR(128)) AS
columnname,CAST(t0.columndatatype AS VARCHAR(128)) AS columndatatype FROM
sys.syscolumns t0, sys.systables t1 WHERE t0.referenceid=t1.tableid AND
CAST(t1.tablename AS VARCHAR(128))=? ORDER BY t0.columnnumber ASC";
List list = new ArrayList();
- list.add(tableName.toUpperCase());
+ list.add(tableName.toUpperCase(Locale.ROOT));
IResultSet set = performQuery(query,list,cacheKeys,queryClass);
if (set.getRowCount() == 0)
@@ -886,7 +886,7 @@ public class DBInterfaceDerby extends Da
while (i < set.getRowCount())
{
IResultRow row = set.getRow(i++);
- String fieldName = ((String)row.getValue("columnname")).toLowerCase();
+ String fieldName =
((String)row.getValue("columnname")).toLowerCase(Locale.ROOT);
String type = (String)row.getValue("columndatatype");
boolean isNull = false;
boolean isPrimaryKey = false;
@@ -1548,7 +1548,7 @@ public class DBInterfaceDerby extends Da
@Override
protected String mapLabelName(String rawLabelName)
{
- return rawLabelName.toLowerCase();
+ return rawLabelName.toLowerCase(Locale.ROOT);
}
// Functions that correspond to user-defined functions in Derby
Modified:
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java?rev=1419954&r1=1419953&r2=1419954&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java
(original)
+++
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java
Tue Dec 11 00:56:22 2012
@@ -125,7 +125,7 @@ public class DBInterfaceHSQLDB extends D
{
super.initializeConnection(connection);
// Set the schema
- executeViaThread(connection,"SET SCHEMA
"+schemaNameForQueries.toUpperCase(),null,false,-1,null,null);
+ executeViaThread(connection,"SET SCHEMA
"+schemaNameForQueries.toUpperCase(Locale.ROOT),null,false,-1,null,null);
}
/** Initialize. This method is called once per JVM instance, in order to
set up
@@ -585,13 +585,13 @@ public class DBInterfaceHSQLDB extends D
// Now, look for schema
params.clear();
- params.add(databaseName.toUpperCase());
+ params.add(databaseName.toUpperCase(Locale.ROOT));
IResultSet schemaResult = masterDatabase.executeQuery("SELECT * FROM
INFORMATION_SCHEMA.SYSTEM_SCHEMAS WHERE TABLE_SCHEM=?",params,
null,null,null,true,-1,null,null);
if (schemaResult.getRowCount() == 0)
{
// Create the schema
- masterDatabase.executeQuery("CREATE SCHEMA
"+databaseName.toUpperCase()+" AUTHORIZATION "+quoteString(userName),null,
+ masterDatabase.executeQuery("CREATE SCHEMA
"+databaseName.toUpperCase(Locale.ROOT)+" AUTHORIZATION
"+quoteString(userName),null,
null,invalidateKeys,null,false,0,null,null);
}
}
@@ -766,8 +766,8 @@ public class DBInterfaceHSQLDB extends D
{
StringBuilder query = new StringBuilder();
List list = new ArrayList();
- list.add(schemaNameForQueries.toUpperCase());
- list.add(tableName.toUpperCase());
+ list.add(schemaNameForQueries.toUpperCase(Locale.ROOT));
+ list.add(tableName.toUpperCase(Locale.ROOT));
query.append("SELECT column_name, is_nullable, data_type,
character_maximum_length ")
.append("FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema=? AND
table_name=?");
IResultSet set = performQuery(query.toString(),list,cacheKeys,queryClass);
@@ -780,7 +780,7 @@ public class DBInterfaceHSQLDB extends D
IResultSet primarySet =
performQuery(query.toString(),list,cacheKeys,queryClass);
String primaryKey = null;
if (primarySet.getRowCount() != 0)
- primaryKey =
((String)primarySet.getRow(0).getValue("column_name")).toLowerCase();
+ primaryKey =
((String)primarySet.getRow(0).getValue("column_name")).toLowerCase(Locale.ROOT);
if (primaryKey == null)
primaryKey = "";
@@ -790,7 +790,7 @@ public class DBInterfaceHSQLDB extends D
while (i < set.getRowCount())
{
IResultRow row = set.getRow(i++);
- String fieldName = ((String)row.getValue("column_name")).toLowerCase();
+ String fieldName =
((String)row.getValue("column_name")).toLowerCase(Locale.ROOT);
String type = (String)row.getValue("data_type");
Long width = (Long)row.getValue("character_maximum_length");
String isNullable = (String)row.getValue("is_nullable");
@@ -823,8 +823,8 @@ public class DBInterfaceHSQLDB extends D
String query = "SELECT index_name,column_name,non_unique,ordinal_position
FROM INFORMATION_SCHEMA.SYSTEM_INDEXINFO "+
"WHERE table_schem=? AND TABLE_NAME=? ORDER BY
index_name,ordinal_position ASC";
List list = new ArrayList();
- list.add(schemaNameForQueries.toUpperCase());
- list.add(tableName.toUpperCase());
+ list.add(schemaNameForQueries.toUpperCase(Locale.ROOT));
+ list.add(tableName.toUpperCase(Locale.ROOT));
IResultSet result = performQuery(query,list,cacheKeys,queryClass);
String lastIndexName = null;
List<String> indexColumns = null;
@@ -833,8 +833,8 @@ public class DBInterfaceHSQLDB extends D
while (i < result.getRowCount())
{
IResultRow row = result.getRow(i++);
- String indexName = ((String)row.getValue("index_name")).toLowerCase();
- String columnName = ((String)row.getValue("column_name")).toLowerCase();
+ String indexName =
((String)row.getValue("index_name")).toLowerCase(Locale.ROOT);
+ String columnName =
((String)row.getValue("column_name")).toLowerCase(Locale.ROOT);
String nonUnique = row.getValue("non_unique").toString();
if (lastIndexName != null && !lastIndexName.equals(indexName))
@@ -884,7 +884,7 @@ public class DBInterfaceHSQLDB extends D
throws ManifoldCFException
{
ArrayList list = new ArrayList();
- list.add(schemaNameForQueries.toUpperCase());
+ list.add(schemaNameForQueries.toUpperCase(Locale.ROOT));
IResultSet set = performQuery("SELECT table_name FROM
INFORMATION_SCHEMA.TABLES WHERE table_schema=?",list,cacheKeys,queryClass);
StringSetBuffer ssb = new StringSetBuffer();
String columnName = "table_name";
@@ -1462,7 +1462,7 @@ public class DBInterfaceHSQLDB extends D
@Override
protected String mapLabelName(String rawLabelName)
{
- return rawLabelName.toLowerCase();
+ return rawLabelName.toLowerCase(Locale.ROOT);
}
}
Modified:
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java?rev=1419954&r1=1419953&r2=1419954&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
(original)
+++
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
Tue Dec 11 00:56:22 2012
@@ -706,8 +706,8 @@ public class DBInterfaceMySQL extends Da
{
StringBuilder query = new StringBuilder();
List list = new ArrayList();
- list.add(databaseName.toUpperCase());
- list.add(tableName.toUpperCase());
+ list.add(databaseName.toLowerCase(Locale.ROOT));
+ list.add(tableName.toLowerCase(Locale.ROOT));
query.append("SELECT column_name, is_nullable, data_type,
character_maximum_length ")
.append("FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA=? AND
TABLE_NAME=?");
IResultSet set = performQuery(query.toString(),list,cacheKeys,queryClass);
@@ -723,7 +723,7 @@ public class DBInterfaceMySQL extends Da
IResultSet primarySet =
performQuery(query.toString(),list,cacheKeys,queryClass);
String primaryKey = null;
if (primarySet.getRowCount() != 0)
- primaryKey =
((String)primarySet.getRow(0).getValue("column_name")).toLowerCase();
+ primaryKey =
((String)primarySet.getRow(0).getValue("column_name")).toLowerCase(Locale.ROOT);
if (primaryKey == null)
primaryKey = "";
@@ -733,7 +733,7 @@ public class DBInterfaceMySQL extends Da
while (i < set.getRowCount())
{
IResultRow row = set.getRow(i++);
- String fieldName = ((String)row.getValue("column_name")).toLowerCase();
+ String fieldName =
((String)row.getValue("column_name")).toLowerCase(Locale.ROOT);
String type = (String)row.getValue("data_type");
Long width = (Long)row.getValue("character_maximum_length");
String isNullable = (String)row.getValue("is_nullable");
@@ -770,8 +770,8 @@ public class DBInterfaceMySQL extends Da
String query = "SELECT index_name,column_name,non_unique,seq_in_index FROM
INFORMATION_SCHEMA.STATISTICS "+
"WHERE TABLE_SCHEMA=? AND TABLE_NAME=? ORDER BY index_name,seq_in_index
ASC";
List list = new ArrayList();
- list.add(databaseName.toUpperCase());
- list.add(tableName.toUpperCase());
+ list.add(databaseName.toLowerCase(Locale.ROOT));
+ list.add(tableName.toLowerCase(Locale.ROOT));
IResultSet result = performQuery(query,list,cacheKeys,queryClass);
String lastIndexName = null;
List<String> indexColumns = null;
@@ -780,8 +780,8 @@ public class DBInterfaceMySQL extends Da
while (i < result.getRowCount())
{
IResultRow row = result.getRow(i++);
- String indexName = ((String)row.getValue("index_name")).toLowerCase();
- String columnName = ((String)row.getValue("column_name")).toLowerCase();
+ String indexName =
((String)row.getValue("index_name")).toLowerCase(Locale.ROOT);
+ String columnName =
((String)row.getValue("column_name")).toLowerCase(Locale.ROOT);
String nonUnique = row.getValue("non_unique").toString();
if (lastIndexName != null && !lastIndexName.equals(indexName))
@@ -832,7 +832,7 @@ public class DBInterfaceMySQL extends Da
{
IResultSet set = performQuery("SHOW TABLES",null,cacheKeys,queryClass);
StringSetBuffer ssb = new StringSetBuffer();
- String columnName = "Tables_in_"+databaseName.toLowerCase();
+ String columnName = "Tables_in_"+databaseName.toLowerCase(Locale.ROOT);
// System.out.println(columnName);
int i = 0;
Modified:
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/Database.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/Database.java?rev=1419954&r1=1419953&r2=1419954&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/Database.java
(original)
+++
manifoldcf/branches/CONNECTORS-584/framework/core/src/main/java/org/apache/manifoldcf/core/database/Database.java
Tue Dec 11 00:56:22 2012
@@ -935,7 +935,7 @@ public abstract class Database
value = null;
if (colnum > -1)
{
- value = getObject(rs,rsmd,colnum,(spec ==
null)?ResultSpecification.FORM_DEFAULT:spec.getForm(key.toLowerCase()));
+ value = getObject(rs,rsmd,colnum,(spec ==
null)?ResultSpecification.FORM_DEFAULT:spec.getForm(key.toLowerCase(Locale.ROOT)));
}
//System.out.println(" Key = '"+resultLabels[i]+"', value =
"+((value==null)?"NULL":value.toString()));
m.put(resultLabels[i], value);
Modified:
manifoldcf/branches/CONNECTORS-584/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-584/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1419954&r1=1419953&r2=1419954&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-584/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-584/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Tue Dec 11 00:56:22 2012
@@ -2104,7 +2104,7 @@ public class JobManager implements IJobM
sb.append(jobQueue.docPriorityField).append(",").append(jobQueue.jobIDField).append(",")
.append(jobQueue.docHashField).append(",").append(jobQueue.docIDField)
.append(" FROM ").append(jobQueue.getTableName())
- .append(" t0
").append(jobQueue.getGetNextDocumentsIndex()).append("WHERE ");
+ .append(" t0
").append(database.constructIndexHintClause(jobQueue.getGetNextDocumentsIndex())).append("WHERE
");
sb.append(database.buildConjunctionClause(list,new ClauseDescription[]{
//new UnitaryClause(jobQueue.docPriorityField,">=",new Long(0L)),
@@ -2162,7 +2162,7 @@ public class JobManager implements IJobM
.append(jobQueue.failTimeField).append(",t0.")
.append(jobQueue.failCountField).append(",t0.")
.append(jobQueue.prioritySetField).append(" FROM
").append(jobQueue.getTableName())
- .append(" t0
").append(jobQueue.getGetNextDocumentsIndex()).append("WHERE ");
+ .append(" t0
").append(database.constructIndexHintClause(jobQueue.getGetNextDocumentsIndex())).append("WHERE
");
sb.append(database.buildConjunctionClause(list,new ClauseDescription[]{
//new UnitaryClause("t0."+jobQueue.docPriorityField,">=",new Long(0L)),
