You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2014/07/26 15:08:44 UTC
svn commit: r1613620 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/contrib/
solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/
Author: noble
Date: Sat Jul 26 13:08:44 2014
New Revision: 1613620
URL: http://svn.apache.org/r1613620
Log:
SOLR-6269
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java?rev=1613620&r1=1613619&r2=1613620&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java Sat Jul 26 13:08:44 2014
@@ -74,7 +74,7 @@ public abstract class AbstractDIHJdbcTes
@AfterClass
public static void afterClassDihJdbcTest() throws Exception {
try {
- DriverManager.getConnection("jdbc:derby:;shutdown=true");
+ DriverManager.getConnection("jdbc:derby:;shutdown=true;territory=en_US");
} catch (SQLException e) {
// ignore...we might not even be using derby this time...
}
@@ -109,7 +109,7 @@ public abstract class AbstractDIHJdbcTes
if (dbToUse == Database.DERBY) {
try {
conn = DriverManager
- .getConnection("jdbc:derby:memory:derbyDB;drop=true");
+ .getConnection("jdbc:derby:memory:derbyDB;drop=true;territory=en_US");
} catch (SQLException e) {
if (!"08006".equals(e.getSQLState())) {
throw e;
@@ -136,7 +136,7 @@ public abstract class AbstractDIHJdbcTes
protected Connection newConnection() throws Exception {
if (dbToUse == Database.DERBY) {
- return DriverManager.getConnection("jdbc:derby:memory:derbyDB;");
+ return DriverManager.getConnection("jdbc:derby:memory:derbyDB;territory=en_US");
} else if (dbToUse == Database.HSQLDB) {
return DriverManager.getConnection("jdbc:hsqldb:mem:.");
}
@@ -148,7 +148,7 @@ public abstract class AbstractDIHJdbcTes
try {
if (dbToUse == Database.DERBY) {
conn = DriverManager
- .getConnection("jdbc:derby:memory:derbyDB;create=true");
+ .getConnection("jdbc:derby:memory:derbyDB;create=true;territory=en_US");
} else if (dbToUse == Database.HSQLDB) {
conn = DriverManager.getConnection("jdbc:hsqldb:mem:.");
} else {
@@ -160,17 +160,6 @@ public abstract class AbstractDIHJdbcTes
while(cause.getCause()!=null) {
cause = cause.getCause();
}
- String message = cause.getMessage();
- if(cause instanceof StandardException) {
- message = ((StandardException) cause).getMessageId();
- }
- //Derby INVALID_LOCALE_DESCRIPTION
- if("XBM0X.D".equals(message)) {
- log.warn("Skipping test because Database " + dbToUse + " does not support the locale " + Locale.getDefault());
- skipThisTest = true;
- Assume.assumeNoException(sqe);
- throw sqe;
- }
} finally {
try {
conn.close();
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java?rev=1613620&r1=1613619&r2=1613620&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java Sat Jul 26 13:08:44 2014
@@ -565,7 +565,7 @@ public abstract class AbstractSqlEntityP
sb.append("\n<dataConfig> \n");
sb.append("<propertyWriter type=''SimplePropertiesWriter'' directory=''" + fileLocation + "'' filename=''" + fileName + "'' />\n");
sb.append("<dataSource name=''hsqldb'' driver=''org.hsqldb.jdbcDriver'' url=''jdbc:hsqldb:mem:.'' /> \n");
- sb.append("<dataSource name=''derby'' driver=''org.apache.derby.jdbc.EmbeddedDriver'' url=''jdbc:derby:memory:derbyDB;'' /> \n");
+ sb.append("<dataSource name=''derby'' driver=''org.apache.derby.jdbc.EmbeddedDriver'' url=''jdbc:derby:memory:derbyDB;territory=en_US'' /> \n");
sb.append("<document name=''TestSqlEntityProcessor''> \n");
sb.append("<entity name=''People'' ");
sb.append("pk=''" + (random().nextBoolean() ? "ID" : "People.ID") + "'' ");
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java?rev=1613620&r1=1613619&r2=1613620&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java Sat Jul 26 13:08:44 2014
@@ -54,7 +54,7 @@ public class TestJdbcDataSourceConvertTy
JdbcDataSource dataSource = new JdbcDataSource();
Properties p = new Properties();
p.put("driver", "org.apache.derby.jdbc.EmbeddedDriver");
- p.put("url", "jdbc:derby:memory:tempDB;create=true");
+ p.put("url", "jdbc:derby:memory:tempDB;create=true;territory=en_US");
p.put("convertType", convertType);
List<Map<String, String>> flds = new ArrayList<>();
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java?rev=1613620&r1=1613619&r2=1613620&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java Sat Jul 26 13:08:44 2014
@@ -32,7 +32,7 @@ public class TestNestedChildren extends
protected String generateConfig() {
StringBuilder sb = new StringBuilder();
sb.append("<dataConfig> \n");
- sb.append("<dataSource name=\"derby\" driver=\"org.apache.derby.jdbc.EmbeddedDriver\" url=\"jdbc:derby:memory:derbyDB;\" /> \n");
+ sb.append("<dataSource name=\"derby\" driver=\"org.apache.derby.jdbc.EmbeddedDriver\" url=\"jdbc:derby:memory:derbyDB;territory=en_US\" /> \n");
sb.append("<document name=\"TestSimplePropertiesWriter\"> \n");
sb.append("<entity name=\"FIRST\" processor=\"SqlEntityProcessor\" dataSource=\"derby\" ");
sb.append(" query=\"select 1 as id, 'PORK' as FIRST_S from sysibm.sysdummy1 \" >\n");
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java?rev=1613620&r1=1613619&r2=1613620&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java Sat Jul 26 13:08:44 2014
@@ -131,7 +131,7 @@ public class TestSimplePropertiesWriter
String q = useJdbcEscapeSyntax ? "" : "'";
sb.append("<dataConfig> \n");
sb.append("<propertyWriter dateFormat=\"" + dateFormat + "\" type=\"SimplePropertiesWriter\" directory=\"" + fileLocation + "\" filename=\"" + fileName + "\" />\n");
- sb.append("<dataSource name=\"derby\" driver=\"org.apache.derby.jdbc.EmbeddedDriver\" url=\"jdbc:derby:memory:derbyDB;\" /> \n");
+ sb.append("<dataSource name=\"derby\" driver=\"org.apache.derby.jdbc.EmbeddedDriver\" url=\"jdbc:derby:memory:derbyDB;territory=en_US\" /> \n");
sb.append("<document name=\"TestSimplePropertiesWriter\"> \n");
sb.append("<entity name=\"SomeDates\" processor=\"SqlEntityProcessor\" dataSource=\"derby\" ");
sb.append("query=\"select 1 as id, YEAR(" + q + "${dih.last_index_time}" + q + ") as AYEAR_S from sysibm.sysdummy1 \" >\n");