You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ko...@apache.org on 2010/11/30 17:41:07 UTC
svn commit: r1040629 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/
solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/
solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/
Author: koji
Date: Tue Nov 30 16:41:06 2010
New Revision: 1040629
URL: http://svn.apache.org/viewvc?rev=1040629&view=rev
Log:
SOLR-2252: when child entity is the root in nested entities, delta-import doesn't work
Added:
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta3.java
- copied unchanged from r1040608, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta3.java
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1040629&r1=1040628&r2=1040629&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Tue Nov 30 16:41:06 2010
@@ -468,6 +468,9 @@ Bug Fixes
SingleResponseWriter.end to be called 2x
(Chris A. Mattmann via hossman)
+* SOLR-2252: When a child entity in nested entities is rootEntity="true", delta-import doesn't work.
+ (koji)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java?rev=1040629&r1=1040628&r2=1040629&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java Tue Nov 30 16:41:06 2010
@@ -175,6 +175,10 @@ public class DataConfig {
public String getPk(){
return pk == null ? pkMappingFromSchema : pk;
}
+
+ public String getSchemaPk(){
+ return pkMappingFromSchema != null ? pkMappingFromSchema : pk;
+ }
}
public static class Script {
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=1040629&r1=1040628&r2=1040629&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Tue Nov 30 16:41:06 2010
@@ -314,9 +314,10 @@ public class DocBuilder {
Iterator<Map<String, Object>> iter = deletedKeys.iterator();
while (iter.hasNext()) {
Map<String, Object> map = iter.next();
- Object key = map.get(root.getPk());
+ String keyName = root.isDocRoot ? root.getPk() : root.getSchemaPk();
+ Object key = map.get(keyName);
if(key == null) {
- LOG.warn("no key was available for deleteted pk query");
+ LOG.warn("no key was available for deleteted pk query. keyName = " + keyName);
continue;
}
writer.deleteDoc(key);
@@ -607,7 +608,8 @@ public class DocBuilder {
if (entity.entities != null) {
vr.addNamespace(entity.name, arow);
for (DataConfig.Entity child : entity.entities) {
- buildDocument(vr, doc, null, child, false, ctx);
+ buildDocument(vr, doc,
+ child.isDocRoot ? pk : null, child, false, ctx);
}
vr.removeNamespace(entity.name);
}
@@ -910,8 +912,9 @@ public class DocBuilder {
if (entity.isDocRoot)
deletedRows.addAll(deletedSet);
- return entity.isDocRoot ? myModifiedPks : new HashSet<Map<String, Object>>(
- parentKeyList);
+ // Do not use entity.isDocRoot here because one of descendant entities may set rootEntity="true"
+ return entity.parentEntity == null ?
+ myModifiedPks : new HashSet<Map<String, Object>>(parentKeyList);
}
private void getModifiedParentRows(VariableResolverImpl resolver,
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java?rev=1040629&r1=1040628&r2=1040629&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java Tue Nov 30 16:41:06 2010
@@ -40,6 +40,23 @@ public class TestSqlEntityProcessorDelta
private static final String DELETED_PK_QUERY = "select id from x where last_modified > NOW AND deleted='true'";
+ private static final String dataConfig_delta =
+ "<dataConfig>" +
+ " <dataSource type=\"MockDataSource\"/>\n" +
+ " <document>\n" +
+ " <entity name=\"x\" transformer=\"TemplateTransformer\"" +
+ " query=\"" + FULLIMPORT_QUERY + "\"" +
+ " deletedPkQuery=\"" + DELETED_PK_QUERY + "\"" +
+ " deltaImportQuery=\"select * from x where id='${dih.delta.id}'\"" +
+ " deltaQuery=\"" + DELTA_QUERY + "\">\n" +
+ " <field column=\"id\" name=\"id\"/>\n" +
+ " <entity name=\"y\" query=\"select * from y where y.A='${x.id}'\">\n" +
+ " <field column=\"desc\" />\n" +
+ " </entity>\n" +
+ " </entity>\n" +
+ " </document>\n" +
+ "</dataConfig>\n";
+
@BeforeClass
public static void beforeClass() throws Exception {
initCore("dataimport-solrconfig.xml", "dataimport-schema.xml");
@@ -115,8 +132,8 @@ public class TestSqlEntityProcessorDelta
List childRow = new ArrayList();
childRow.add(createMap("desc", "hello"));
- MockDataSource.setIterator("select * from y where y.A='1'", childRow
- .iterator());
+ MockDataSource.setIterator("select * from y where y.A='1'",
+ childRow.iterator());
runDeltaImport(dataConfig_delta);
@@ -270,18 +287,4 @@ public class TestSqlEntityProcessorDelta
assertQ(req("desc:hello"), "//*[@numFound='0']");
assertQ(req("desc:goodbye"), "//*[@numFound='1']");
}
-
- private static String dataConfig_delta = "<dataConfig><dataSource type=\"MockDataSource\"/>\n"
- + " <document>\n"
- + " <entity name=\"x\" transformer=\"TemplateTransformer\""
- + " query=\"" + FULLIMPORT_QUERY + "\""
- + " deletedPkQuery=\"" + DELETED_PK_QUERY + "\""
- + " deltaImportQuery=\"select * from x where id='${dataimporter.delta.id}'\""
- + " deltaQuery=\"" + DELTA_QUERY + "\">\n"
- + " <field column=\"id\" name=\"id\"/>\n"
- + " <entity name=\"y\" query=\"select * from y where y.A='${x.id}'\">\n"
- + " <field column=\"desc\" />\n"
- + " </entity>\n" + " </entity>\n"
- + " </document>\n" + "</dataConfig>\n";
-
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java?rev=1040629&r1=1040628&r2=1040629&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java Tue Nov 30 16:41:06 2010
@@ -40,6 +40,23 @@ public class TestSqlEntityProcessorDelta
private static final String DELETED_PK_QUERY = "select id from x where last_modified > NOW AND deleted='true'";
+ private static final String dataConfig_delta2 =
+ "<dataConfig>" +
+ " <dataSource type=\"MockDataSource\"/>\n" +
+ " <document>\n" +
+ " <entity name=\"x\" transformer=\"TemplateTransformer\"" +
+ " query=\"" + FULLIMPORT_QUERY + "\"" +
+ " deletedPkQuery=\"" + DELETED_PK_QUERY + "\"" +
+ " deltaImportQuery=\"select * from x where id='${dih.delta.id}'\"" +
+ " deltaQuery=\"" + DELTA_QUERY + "\">\n" +
+ " <field column=\"tmpid\" template=\"prefix-${x.id}\" name=\"solr_id\"/>\n" +
+ " <entity name=\"y\" query=\"select * from y where y.A='${x.id}'\">\n" +
+ " <field column=\"desc\" />\n" +
+ " </entity>\n" +
+ " </entity>\n" +
+ " </document>\n" +
+ "</dataConfig>\n";
+
@BeforeClass
public static void beforeClass() throws Exception {
initCore("dataimport-solrconfig.xml", "dataimport-solr_id-schema.xml");
@@ -266,18 +283,4 @@ public class TestSqlEntityProcessorDelta
assertQ(req("desc:hello"), "//*[@numFound='0']");
assertQ(req("desc:goodbye"), "//*[@numFound='1']");
}
-
- private static String dataConfig_delta2 = "<dataConfig><dataSource type=\"MockDataSource\"/>\n"
- + " <document>\n"
- + " <entity name=\"x\" transformer=\"TemplateTransformer\""
- + " query=\"" + FULLIMPORT_QUERY + "\""
- + " deletedPkQuery=\"" + DELETED_PK_QUERY + "\""
- + " deltaImportQuery=\"select * from x where id='${dataimporter.delta.id}'\""
- + " deltaQuery=\"" + DELTA_QUERY + "\">\n"
- + " <field column=\"tmpid\" template=\"prefix-${x.id}\" name=\"solr_id\"/>\n"
- + " <entity name=\"y\" query=\"select * from y where y.A='${x.id}'\">\n"
- + " <field column=\"desc\" />\n"
- + " </entity>\n" + " </entity>\n"
- + " </document>\n" + "</dataConfig>\n";
-
}