You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/10/26 05:32:43 UTC
lucene-solr:branch_6x: SOLR-2039: Multivalued fields with dynamic
names does not work properly with DIH
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x de360d62c -> 279647a30
SOLR-2039: Multivalued fields with dynamic names does not work properly with DIH
(cherry picked from commit b8d9647)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/279647a3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/279647a3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/279647a3
Branch: refs/heads/branch_6x
Commit: 279647a303750408d10f6f8a6c27a066176fe49e
Parents: de360d6
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed Oct 26 11:02:10 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Wed Oct 26 11:02:44 2016 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../solr/handler/dataimport/DocBuilder.java | 2 ++
.../handler/dataimport/TestDocBuilder2.java | 23 ++++++++++++++++++++
3 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/279647a3/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0fddc36..7c0ae1b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -177,6 +177,9 @@ Bug Fixes
* SOLR-9536: OldBackupDirectory timestamp field needs to be initialized to avoid NPE.
(Hrishikesh Gadre, hossman via Mark Miller)
+
+* SOLR-2039: Multivalued fields with dynamic names does not work properly with DIH.
+ (K A, ruslan.shv, Cao Manh Dat via shalin)
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/279647a3/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
index f9ccfb6..c80d275 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
@@ -501,7 +501,9 @@ public class DocBuilder {
doc.addChildDocument(childDoc);
} else {
handleSpecialCommands(arow, doc);
+ vr.addNamespace(epw.getEntity().getName(), arow);
addFields(epw.getEntity(), doc, arow, vr);
+ vr.removeNamespace(epw.getEntity().getName());
}
}
if (epw.getEntity().getChildren() != null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/279647a3/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
index 40ee2b9..32a0d4a 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
@@ -117,6 +117,20 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
@Test
@SuppressWarnings("unchecked")
+ public void testDynamicFieldNames() throws Exception {
+ List rows = new ArrayList();
+ rows.add(createMap("mypk", "101", "text", "ApacheSolr"));
+ MockDataSource.setIterator("select * from x", rows.iterator());
+
+ LocalSolrQueryRequest request = lrf.makeRequest("command", "full-import",
+ "debug", "on", "clean", "true", "commit", "true",
+ "dataConfig", dataConfigWithDynamicFieldNames);
+ h.query("/dataimport", request);
+ assertQ(req("id:101"), "//*[@numFound='1']", "//*[@name='101_s']");
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
public void testRequestParamsAsFieldName() throws Exception {
List rows = new ArrayList();
rows.add(createMap("mypk", "101", "text", "ApacheSolr"));
@@ -398,6 +412,15 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
" </document>\n" +
"</dataConfig>";
+ private final String dataConfigWithDynamicFieldNames = "<dataConfig><dataSource type=\"MockDataSource\"/>\n" +
+ " <document>\n" +
+ " <entity name=\"books\" query=\"select * from x\">\n" +
+ " <field column=\"mypk\" name=\"id\" />\n" +
+ " <field column=\"text\" name=\"${books.mypk}_s\" />\n" +
+ " </entity>\n" +
+ " </document>\n" +
+ "</dataConfig>";
+
private final String dataConfigFileList = "<dataConfig>\n" +
"\t<document>\n" +
"\t\t<entity name=\"x\" processor=\"FileListEntityProcessor\" \n" +