You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jd...@apache.org on 2012/11/12 18:42:46 UTC
svn commit: r1408370 - in /lucene/dev/branches/branch_4x: dev-tools/eclipse/
dev-tools/idea/.idea/libraries/
dev-tools/idea/solr/contrib/dataimporthandler/ solr/
solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/
solr/contrib/d...
Author: jdyer
Date: Mon Nov 12 17:42:44 2012
New Revision: 1408370
URL: http://svn.apache.org/viewvc?rev=1408370&view=rev
Log:
SOLR-2045: DIH doesn't release jdbc connections for some databases
Added:
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Derby.xml
- copied unchanged from r1408368, lucene/dev/trunk/dev-tools/idea/.idea/libraries/Derby.xml
lucene/dev/branches/branch_4x/solr/licenses/derby-10.9.1.0.jar.sha1
- copied unchanged from r1408368, lucene/dev/trunk/solr/licenses/derby-10.9.1.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/derby-LICENSE-ASL.txt
- copied unchanged from r1408368, lucene/dev/trunk/solr/licenses/derby-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/derby-NOTICE.txt
- copied unchanged from r1408368, lucene/dev/trunk/solr/licenses/derby-NOTICE.txt
Modified:
lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath
lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
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/TestSqlEntityProcessor.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
lucene/dev/branches/branch_4x/solr/example/example-DIH/ivy.xml
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
Modified: lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath?rev=1408370&r1=1408369&r2=1408370&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath Mon Nov 12 17:42:44 2012
@@ -144,6 +144,8 @@
<classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
+ <classpathentry kind="lib" path="solr/example/example-DIH/solr/db/lib/derby-10.9.1.0.jar"/>
+ <classpathentry kind="lib" path="solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/boilerpipe-1.1.0.jar"/>
Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1408370&r1=1408369&r2=1408370&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Mon Nov 12 17:42:44 2012
@@ -14,6 +14,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" scope="TEST" name="HSQLDB" level="project" />
+ <orderEntry type="library" scope="TEST" name="Derby" level="project" />
<orderEntry type="library" name="Solr core library" level="project" />
<orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1408370&r1=1408369&r2=1408370&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Nov 12 17:42:44 2012
@@ -151,6 +151,12 @@ Bug Fixes
* SOLR-3993: If multiple SolrCore's for a shard coexist on a node, on cluster
restart, leader election would stall until timeout, waiting to see all of
the replicas come up. (Mark Miller, Alexey Kudinov)
+
+* SOLR-2045: Databases that require a commit to be issued before closing the
+ connection on a non-read-only database leak connections. Also expanded the
+ SqlEntityProcessor test to sometimes use Derby as well as HSQLDB (Derby is
+ one db affected by this bug). (Fenlor Sebastia, James Dyer)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java?rev=1408370&r1=1408369&r2=1408370&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java Mon Nov 12 17:42:44 2012
@@ -397,6 +397,12 @@ public class JdbcDataSource extends
private void closeConnection() {
try {
if (conn != null) {
+ try {
+ //SOLR-2045
+ conn.commit();
+ } catch(Exception ex) {
+ //ignore.
+ }
conn.close();
}
} catch (Exception e) {
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=1408370&r1=1408369&r2=1408370&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 Mon Nov 12 17:42:44 2012
@@ -16,6 +16,7 @@ package org.apache.solr.handler.dataimpo
* the License.
*/
+import java.io.OutputStream;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
@@ -33,6 +34,7 @@ import java.util.regex.Pattern;
import junit.framework.Assert;
import org.apache.solr.request.LocalSolrQueryRequest;
+import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -40,8 +42,7 @@ import org.junit.BeforeClass;
* This sets up an in-memory Sql database with a little sample data.
*/
public abstract class AbstractDIHJdbcTestCase extends AbstractDataImportHandlerTestCase {
- //Start with "true" so the first test run will populate the data.
- protected boolean underlyingDataModified = true;
+ protected boolean underlyingDataModified;
protected boolean useSimpleCaches;
protected boolean countryEntity;
@@ -52,6 +53,11 @@ public abstract class AbstractDIHJdbcTes
protected boolean countryTransformer;
protected boolean sportsTransformer;
+ protected Database db = Database.RANDOM;
+ private Database dbToUse;
+
+ public enum Database { RANDOM , DERBY , HSQLDB }
+
private static final Pattern totalRequestsPattern = Pattern
.compile(".str name..Total Requests made to DataSource..(\\d+)..str.");
@@ -59,11 +65,20 @@ public abstract class AbstractDIHJdbcTes
public static void beforeClassDihJdbcTest() throws Exception {
try {
Class.forName("org.hsqldb.jdbcDriver").newInstance();
+ Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
} catch (Exception e) {
throw e;
}
initCore("dataimport-solrconfig.xml", "dataimport-schema.xml");
- }
+ }
+ @AfterClass
+ public static void afterClassDihJdbcTest() throws Exception {
+ try {
+ DriverManager.getConnection("jdbc:derby:;shutdown=true");
+ } catch(SQLException e) {
+ //ignore...we might not even be using derby this time...
+ }
+ }
@Before
public void beforeDihJdbcTest() throws Exception {
useSimpleCaches = false;
@@ -75,21 +90,37 @@ public abstract class AbstractDIHJdbcTes
countryTransformer = false;
sportsTransformer = false;
- clearIndex();
- assertU(commit());
+ dbToUse = db;
+ if(db==Database.RANDOM) {
+ if(random().nextBoolean()) {
+ dbToUse = Database.DERBY;
+ } else {
+ dbToUse = Database.HSQLDB;
+ }
+ }
- if(underlyingDataModified) {
- refreshDatabase();
- }
- }
- @AfterClass
- public static void afterClassDihJdbcTest() throws Exception {
+ clearIndex();
+ assertU(commit());
+ buildDatabase();
+ }
+ @After
+ public void afterDihJdbcTest() throws Exception {
Connection conn = null;
Statement s = null;
- try {
- conn = DriverManager.getConnection("jdbc:hsqldb:mem:.");
- s = conn.createStatement();
- s.executeUpdate("shutdown");
+ try {
+ if(dbToUse==Database.DERBY) {
+ try {
+ conn = DriverManager.getConnection("jdbc:derby:memory:derbyDB;drop=true");
+ } catch(SQLException e) {
+ if(!"08006".equals(e.getSQLState())) {
+ throw e;
+ }
+ }
+ } else if(dbToUse==Database.HSQLDB) {
+ conn = DriverManager.getConnection("jdbc:hsqldb:mem:.");
+ s = conn.createStatement();
+ s.executeUpdate("shutdown");
+ }
} catch (SQLException e) {
throw e;
} finally {
@@ -97,6 +128,15 @@ public abstract class AbstractDIHJdbcTes
try { conn.close(); } catch(Exception ex) { }
}
}
+ private Connection newConnection() throws Exception {
+ if(dbToUse==Database.DERBY) {
+ return DriverManager.getConnection("jdbc:derby:memory:derbyDB;");
+ } else if(dbToUse==Database.HSQLDB) {
+ return DriverManager.getConnection("jdbc:hsqldb:mem:.");
+ }
+ throw new AssertionError("Invalid database to use: " + dbToUse);
+ }
+
protected void singleEntity(int numToExpect) throws Exception {
h.query("/dataimport", generateRequest());
assertQ("There should be 1 document per person in the database: "
@@ -278,23 +318,27 @@ public abstract class AbstractDIHJdbcTes
totalDatabaseRequests() < dbRequestsLessThan);
}
}
- public void refreshDatabase() throws Exception
+ public void buildDatabase() throws Exception
{
underlyingDataModified = false;
Connection conn = null;
Statement s = null;
PreparedStatement ps = null;
Timestamp theTime = new Timestamp(System.currentTimeMillis() - 10000); //10 seconds ago
- try {
- conn = DriverManager.getConnection("jdbc:hsqldb:mem:.");
- s = conn.createStatement();
- try {
- s.executeUpdate("drop table countries");
- s.executeUpdate("drop table people");
- s.executeUpdate("drop table people_sports");
- } catch(Exception e) {
- //ignore. dbs complain when tables do no exist.
+ try {
+ if(dbToUse==Database.DERBY) {
+ String oldProp = System.getProperty("derby.stream.error.field");
+ System.setProperty("derby.stream.error.field", "DerbyUtil.DEV_NULL");
+ conn = DriverManager.getConnection("jdbc:derby:memory:derbyDB;create=true");
+ if(oldProp!=null) {
+ System.setProperty("derby.stream.error.field", oldProp);
+ }
+ } else if(dbToUse==Database.HSQLDB) {
+ conn = DriverManager.getConnection("jdbc:hsqldb:mem:.");
+ } else {
+ throw new AssertionError("Invalid database to use: " + dbToUse);
}
+ s = conn.createStatement();
s.executeUpdate("create table countries(code varchar(3) not null primary key, country_name varchar(50), deleted char(1) default 'N', last_modified timestamp not null)");
s.executeUpdate("create table people(id int not null primary key, name varchar(50), country_code char(2), deleted char(1) default 'N', last_modified timestamp not null)");
s.executeUpdate("create table people_sports(id int not null primary key, person_id int, sport_name varchar(50), deleted char(1) default 'N', last_modified timestamp not null)");
@@ -346,7 +390,7 @@ public abstract class AbstractDIHJdbcTes
Statement s = null;
ResultSet rs = null;
try {
- conn = DriverManager.getConnection("jdbc:hsqldb:mem:.");
+ conn = newConnection();
s = conn.createStatement();
rs = s.executeQuery(query);
if(rs.next()) {
@@ -366,7 +410,7 @@ public abstract class AbstractDIHJdbcTes
Statement s = null;
ResultSet rs = null;
try {
- conn = DriverManager.getConnection("jdbc:hsqldb:mem:.");
+ conn = newConnection();
s = conn.createStatement();
rs = s.executeQuery(query);
List<String> results = new ArrayList<String>();
@@ -450,10 +494,10 @@ public abstract class AbstractDIHJdbcTes
//One second in the future ensures a change time after the last import (DIH uses second precision only)
Timestamp theTime = new Timestamp(System.currentTimeMillis() + 1000);
try {
- conn = DriverManager.getConnection("jdbc:hsqldb:mem:.");
+ conn = newConnection();
change = conn.prepareStatement("update people set name=?, last_modified=? where id=?");
delete = conn.prepareStatement("update people set deleted='Y', last_modified=? where id=?");
- add = conn.prepareStatement("insert into people (id,name,country_code,last_modified) values (?,?,'NEW',?)");
+ add = conn.prepareStatement("insert into people (id,name,country_code,last_modified) values (?,?,'ZZ',?)");
for(int i=0 ; i<numberToChange ; i++) {
int tryIndex = random().nextInt(people.length);
Integer id = (Integer) people[tryIndex][0];
@@ -511,7 +555,7 @@ public abstract class AbstractDIHJdbcTes
// uses second precision only)
Timestamp theTime = new Timestamp(System.currentTimeMillis() + 1000);
try {
- conn = DriverManager.getConnection("jdbc:hsqldb:mem:.");
+ conn = newConnection();
change = conn
.prepareStatement("update countries set country_name=?, last_modified=? where code=?");
for (int i = 0; i < numberToChange; i++) {
@@ -547,86 +591,93 @@ public abstract class AbstractDIHJdbcTes
return lrf.makeRequest("command", "full-import", "dataConfig", generateConfig(),
"clean", "true", "commit", "true", "synchronous", "true", "indent", "true");
}
+
protected String generateConfig() {
- StringBuilder sb = new StringBuilder();
- sb.append("<dataConfig> \n");
- sb.append("<dataSource name=''hsqldb'' driver=''org.hsqldb.jdbcDriver'' url=''jdbc:hsqldb:mem:.'' /> \n");
- sb.append("<document name=''TestSqlEntityProcessor''> \n");
- sb.append("<entity name=''People'' ");
- sb.append("pk=''" + (random().nextBoolean() ? "ID" : "People.ID") + "'' ");
- sb.append("processor=''SqlEntityProcessor'' dataSource=''hsqldb'' ");
- sb.append(rootTransformerName !=null ? "transformer=''" + rootTransformerName + "'' " : "");
- sb.append("query=''SELECT ID, NAME, COUNTRY_CODE FROM PEOPLE WHERE DELETED != 'Y' '' ");
- sb.append(deltaQueriesPersonTable());
- sb.append("> \n");
-
- sb.append("<field column=''NAME'' name=''NAME_mult_s'' /> \n");
- sb.append("<field column=''COUNTRY_CODE'' name=''COUNTRY_CODES_mult_s'' /> \n");
-
- if(countryEntity) {
- sb.append("<entity name=''Countries'' ");
- sb.append("pk=''" + (random().nextBoolean() ? "CODE" : "Countries.CODE") + "'' ");
- sb.append("dataSource=''hsqldb'' ");
- sb.append(countryTransformer ? "transformer=''AddAColumnTransformer'' " +
- "newColumnName=''countryAdded_s'' newColumnValue=''country_added'' " : "");
- if(countryCached) {
- sb.append(random().nextBoolean() ?
- "processor=''SqlEntityProcessor'' cacheImpl=''SortedMapBackedCache'' " :
- "processor=''CachedSqlEntityProcessor'' "
- );
- if(useSimpleCaches) {
- sb.append("query=''SELECT CODE, COUNTRY_NAME FROM COUNTRIES WHERE DELETED != 'Y' AND CODE='${People.COUNTRY_CODE}' ''>\n");
- } else {
- sb.append(random().nextBoolean() ?
- "cacheKey=''CODE'' cacheLookup=''People.COUNTRY_CODE'' " :
- "where=''CODE=People.COUNTRY_CODE'' "
- );
- sb.append("query=''SELECT CODE, COUNTRY_NAME FROM COUNTRIES'' ");
- sb.append("> \n");
- }
- } else {
- sb.append("processor=''SqlEntityProcessor'' query=''SELECT CODE, COUNTRY_NAME FROM COUNTRIES WHERE DELETED != 'Y' AND CODE='${People.COUNTRY_CODE}' '' ");
- sb.append(deltaQueriesCountryTable());
- sb.append("> \n");
- }
- sb.append("<field column=''CODE'' name=''COUNTRY_CODE_s'' /> \n");
- sb.append("<field column=''COUNTRY_NAME'' name=''COUNTRY_NAME_s'' /> \n");
- sb.append("</entity> \n");
- }
- if(sportsEntity) {
- sb.append("<entity name=''Sports'' dataSource=''hsqldb'' "
- + (sportsTransformer ? "transformer=''AddAColumnTransformer'' " +
- "newColumnName=''sportsAdded_s'' newColumnValue=''sport_added'' " : ""));
- if(sportsCached) {
- sb.append(random().nextBoolean() ?
- "processor=''SqlEntityProcessor'' cacheImpl=''SortedMapBackedCache'' " :
- "processor=''CachedSqlEntityProcessor'' "
- );
- if(useSimpleCaches) {
- sb.append("query=''SELECT ID, SPORT_NAME FROM PEOPLE_SPORTS WHERE DELETED != 'Y' AND PERSON_ID='${People.ID}' ORDER BY ID'' ");
- } else {
- sb.append(random().nextBoolean() ?
- "cacheKey=''PERSON_ID'' cacheLookup=''People.ID'' " :
- "where=''PERSON_ID=People.ID'' "
- );
- sb.append("query=''SELECT ID, PERSON_ID, SPORT_NAME FROM PEOPLE_SPORTS ORDER BY ID'' ");
- }
- } else {
- sb.append("processor=''SqlEntityProcessor'' query=''SELECT ID, SPORT_NAME FROM PEOPLE_SPORTS WHERE DELETED != 'Y' AND PERSON_ID='${People.ID}' ORDER BY ID'' ");
- }
- sb.append("> \n");
- sb.append("<field column=''SPORT_NAME'' name=''SPORT_NAME_mult_s'' /> \n");
- sb.append("<field column=''id'' name=''SPORT_ID_mult_s'' /> \n");
- sb.append("</entity> \n");
- }
-
- sb.append("</entity> \n");
- sb.append("</document> \n");
- sb.append("</dataConfig> \n");
- String config = sb.toString().replaceAll("[']{2}", "\"");
- log.debug(config);
- return config;
- }
+ String ds = null;
+ if (dbToUse == Database.DERBY) {
+ ds = "derby";
+ } else if (dbToUse == Database.HSQLDB) {
+ ds = "hsqldb";
+ } else {
+ throw new AssertionError("Invalid database to use: " + dbToUse);
+ }
+ StringBuilder sb = new StringBuilder();
+ sb.append("<dataConfig> \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("<document name=''TestSqlEntityProcessor''> \n");
+ sb.append("<entity name=''People'' ");
+ sb.append("pk=''" + (random().nextBoolean() ? "ID" : "People.ID") + "'' ");
+ sb.append("processor=''SqlEntityProcessor'' ");
+ sb.append("dataSource=''" + ds + "'' ");
+ sb.append(rootTransformerName != null ? "transformer=''" + rootTransformerName + "'' " : "");
+ sb.append("query=''SELECT ID, NAME, COUNTRY_CODE FROM PEOPLE WHERE DELETED != 'Y' '' ");
+ sb.append(deltaQueriesPersonTable());
+ sb.append("> \n");
+
+ sb.append("<field column=''NAME'' name=''NAME_mult_s'' /> \n");
+ sb.append("<field column=''COUNTRY_CODE'' name=''COUNTRY_CODES_mult_s'' /> \n");
+
+ if (countryEntity) {
+ sb.append("<entity name=''Countries'' ");
+ sb.append("pk=''" + (random().nextBoolean() ? "CODE" : "Countries.CODE")
+ + "'' ");
+ sb.append("dataSource=''" + ds + "'' ");
+ sb.append(countryTransformer ? "transformer=''AddAColumnTransformer'' "
+ + "newColumnName=''countryAdded_s'' newColumnValue=''country_added'' "
+ : "");
+ if (countryCached) {
+ sb.append(random().nextBoolean() ? "processor=''SqlEntityProcessor'' cacheImpl=''SortedMapBackedCache'' "
+ : "processor=''CachedSqlEntityProcessor'' ");
+ if (useSimpleCaches) {
+ sb.append("query=''SELECT CODE, COUNTRY_NAME FROM COUNTRIES WHERE DELETED != 'Y' AND CODE='${People.COUNTRY_CODE}' ''>\n");
+ } else {
+ sb.append(random().nextBoolean() ? "cacheKey=''CODE'' cacheLookup=''People.COUNTRY_CODE'' "
+ : "where=''CODE=People.COUNTRY_CODE'' ");
+ sb.append("query=''SELECT CODE, COUNTRY_NAME FROM COUNTRIES'' ");
+ sb.append("> \n");
+ }
+ } else {
+ sb.append("processor=''SqlEntityProcessor'' query=''SELECT CODE, COUNTRY_NAME FROM COUNTRIES WHERE DELETED != 'Y' AND CODE='${People.COUNTRY_CODE}' '' ");
+ sb.append(deltaQueriesCountryTable());
+ sb.append("> \n");
+ }
+ sb.append("<field column=''CODE'' name=''COUNTRY_CODE_s'' /> \n");
+ sb.append("<field column=''COUNTRY_NAME'' name=''COUNTRY_NAME_s'' /> \n");
+ sb.append("</entity> \n");
+ }
+ if (sportsEntity) {
+ sb.append("<entity name=''Sports'' ");
+ sb.append("dataSource=''" + ds + "'' ");
+ sb.append(sportsTransformer ? "transformer=''AddAColumnTransformer'' "
+ + "newColumnName=''sportsAdded_s'' newColumnValue=''sport_added'' "
+ : "");
+ if (sportsCached) {
+ sb.append(random().nextBoolean() ? "processor=''SqlEntityProcessor'' cacheImpl=''SortedMapBackedCache'' "
+ : "processor=''CachedSqlEntityProcessor'' ");
+ if (useSimpleCaches) {
+ sb.append("query=''SELECT ID, SPORT_NAME FROM PEOPLE_SPORTS WHERE DELETED != 'Y' AND PERSON_ID=${People.ID} ORDER BY ID'' ");
+ } else {
+ sb.append(random().nextBoolean() ? "cacheKey=''PERSON_ID'' cacheLookup=''People.ID'' "
+ : "where=''PERSON_ID=People.ID'' ");
+ sb.append("query=''SELECT ID, PERSON_ID, SPORT_NAME FROM PEOPLE_SPORTS ORDER BY ID'' ");
+ }
+ } else {
+ sb.append("processor=''SqlEntityProcessor'' query=''SELECT ID, SPORT_NAME FROM PEOPLE_SPORTS WHERE DELETED != 'Y' AND PERSON_ID=${People.ID} ORDER BY ID'' ");
+ }
+ sb.append("> \n");
+ sb.append("<field column=''SPORT_NAME'' name=''SPORT_NAME_mult_s'' /> \n");
+ sb.append("<field column=''id'' name=''SPORT_ID_mult_s'' /> \n");
+ sb.append("</entity> \n");
+ }
+
+ sb.append("</entity> \n");
+ sb.append("</document> \n");
+ sb.append("</dataConfig> \n");
+ String config = sb.toString().replaceAll("[']{2}", "\"");
+ log.debug(config);
+ return config;
+ }
public static final String[][] countries = {
{"NA", "Namibia"},
@@ -692,5 +743,10 @@ public abstract class AbstractDIHJdbcTes
{1800, 18, "White Water Rafting"},
{1900, 19, "Water skiing"},
{2000, 20, "Windsurfing"}
- };
+ };
+ public static class DerbyUtil {
+ public static final OutputStream DEV_NULL = new OutputStream() {
+ public void write(int b) {}
+ };
}
+}
\ No newline at end of file
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java?rev=1408370&r1=1408369&r2=1408370&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java Mon Nov 12 17:42:44 2012
@@ -21,7 +21,7 @@ import org.junit.Test;
*/
/**
- * Test with various combinations of parameters, child entites, caches, transformers.
+ * Test with various combinations of parameters, child entities, caches, transformers.
*/
public class TestSqlEntityProcessor extends AbstractDIHJdbcTestCase {
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java?rev=1408370&r1=1408369&r2=1408370&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java Mon Nov 12 17:42:44 2012
@@ -7,7 +7,6 @@ import java.util.Locale;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.junit.Assume;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
/*
Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/ivy.xml?rev=1408370&r1=1408369&r2=1408370&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/ivy.xml Mon Nov 12 17:42:44 2012
@@ -21,6 +21,7 @@
<dependencies>
<dependency org="hsqldb" name="hsqldb" rev="1.8.0.10" transitive="false"/>
+ <dependency org="org.apache.derby" name="derby" rev="10.9.1.0" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>