grandChilds = child.getChildDocuments();
+ assertEquals(childIndex * 2, grandChilds.size());
+ for (int grandIndex = 0; grandIndex < childIndex * 2; ++grandIndex) {
+ SolrInputDocument grandChild = grandChilds.get(grandIndex);
+ assertFalse(grandChild.hasChildDocuments());
+ for (int fieldNum = 0; fieldNum < grandIndex; ++fieldNum) {
+ assertEquals(grandIndex + "value" + fieldNum, grandChild.getFieldValue(grandIndex + "grand" + fieldNum));
+ }
+ }
+ }
+ }
+
+ private void addChildren(String prefix, SolrInputDocument topDocument, int childIndex, boolean lastLevel) {
+ SolrInputDocument childDocument = new SolrInputDocument();
+ for (int index = 0; index < childIndex; ++index) {
+ childDocument.addField(childIndex + prefix + index, childIndex + "value"+ index);
+ }
+
+ if (!lastLevel) {
+ for (int i = 0; i < childIndex * 2; ++i) {
+ addChildren("grand", childDocument, i, true);
+ }
+ }
+ topDocument.addChildDocument(childDocument);
+ }
+
+ /**
+ * on the given abcD it generates one parent doc, taking D from the tail and
+ * two subdocs relaitons ab and c uniq ids are supplied also
+ *
+ *
+ * {@code
+ *
+ *
+ * D
+ *
+ * a
+ * 1
+ *
+ *
+ * b
+ * 1
+ *
+ *
+ * c
+ * 2
+ *
+ *
+ *
+ * }
+ *
+ * */
+ private Document block(String string) {
+ Document document = DocumentHelper.createDocument();
+ Element root = document.addElement("add");
+ Element doc = root.addElement("doc");
+
+ if (string.length() > 0) {
+ // last character is a top parent
+ attachField(doc, parent,
+ String.valueOf(string.charAt(string.length() - 1)));
+ attachField(doc, "id", id());
+
+ // add subdocs
+ int type = 1;
+ for (int i = 0; i < string.length() - 1; i += 2) {
+ String relation = string.substring(i,
+ Math.min(i + 2, string.length() - 1));
+ attachSubDocs(doc, relation, type);
+ type++;
+ }
+ }
+
+ return document;
+ }
+
+ private void attachSubDocs(Element parent, String relation, int typeValue) {
+ for (int j = 0; j < relation.length(); j++) {
+ Element document = parent.addElement("doc");
+ attachField(document, child, String.valueOf(relation.charAt(j)));
+ attachField(document, "id", id());
+ attachField(document, type, String.valueOf(typeValue));
+ }
+ }
+
+ /**
+ * Merges two documents like
+ *
+ *
+ * {@code ... + ... = ... + ...}
+ *
+ *
+ * @param doc1
+ * first document
+ * @param doc2
+ * second document
+ * @return merged document
+ */
+ private Document merge(Document doc1, Document doc2) {
+ List list = doc2.getRootElement().elements();
+ for (Element element : list) {
+ doc1.getRootElement().add(element.detach());
+ }
+
+ return doc1;
+ }
+
+ private void attachField(Element root, String fieldName, String value) {
+ Element field = root.addElement("field");
+ field.addAttribute("name", fieldName);
+ field.addText(value);
+ }
+
+ private static String id() {
+ return "" + counter.incrementAndGet();
+ }
+
+ private String one(String string) {
+ return "" + string.charAt(random().nextInt(string.length()));
+ }
+
+ protected void assertSingleParentOf(final SolrIndexSearcher searcher,
+ final String childTerm, String parentExp) throws IOException {
+ final TopDocs docs = searcher.search(join(childTerm), 10);
+ assertEquals(1, docs.totalHits);
+ final String pAct = searcher.doc(docs.scoreDocs[0].doc).get(parent);
+ assertEquals(parentExp, pAct);
+ }
+
+ protected ToParentBlockJoinQuery join(final String childTerm) {
+ return new ToParentBlockJoinQuery(
+ new TermQuery(new Term(child, childTerm)), new TermRangeFilter(parent,
+ null, null, false, false), ScoreMode.None);
+ }
+
+ private Collection> callables(List blocks) {
+ final List> rez = new ArrayList>();
+ for (Document block : blocks) {
+ final String msg = block.asXML();
+ if (msg.length() > 0) {
+ rez.add(new Callable() {
+ @Override
+ public Void call() {
+ assertBlockU(msg);
+ return null;
+ }
+
+ });
+ if (rarely()) {
+ rez.add(new Callable() {
+ @Override
+ public Void call() {
+ assertBlockU(commit());
+ return null;
+ }
+
+ });
+ }
+ }
+ }
+ return rez;
+ }
+
+ private void assertBlockU(final String msg) {
+ assertBlockU(msg, "0");
+ }
+
+ private void assertFailedBlockU(final String msg) {
+ try {
+ assertBlockU(msg, "1");
+ fail("expecting fail");
+ } catch (Exception e) {
+ // gotcha
+ }
+ }
+
+ private void assertBlockU(final String msg, String expected) {
+ try {
+ String res = h.checkUpdateStatus(msg, expected);
+ if (res != null) {
+ fail("update was not successful: " + res + " expected: " + expected);
+ }
+ } catch (SAXException e) {
+ throw new RuntimeException("Invalid XML", e);
+ }
+ }
+}
+
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java b/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
index 95a29b59c0a..2385512a1a0 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
@@ -133,6 +133,11 @@ public class ClientUtils
}
}
}
+
+ for (SolrInputDocument childDocument : doc.getChildDocuments()) {
+ writeXML(childDocument, writer);
+ }
+
writer.write("");
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java b/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
index 78aa5301aff..0fdf78b7a39 100644
--- a/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
+++ b/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
@@ -18,9 +18,12 @@
package org.apache.solr.common;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -36,13 +39,16 @@ public class SolrInputDocument implements Map, Iterable _fields;
private float _documentBoost = 1.0f;
-
+ private List _childDocuments;
+
public SolrInputDocument() {
_fields = new LinkedHashMap();
+ _childDocuments = new ArrayList();
}
public SolrInputDocument(Map fields) {
_fields = fields;
+ _childDocuments = new ArrayList();
}
/**
@@ -52,7 +58,10 @@ public class SolrInputDocument implements Map, Iterable, Iterable, Iterable(_childDocuments.size());
+ for (SolrInputDocument child : _childDocuments) {
+ clone._childDocuments.add(child.deepCopy());
+ }
+
return clone;
}
@@ -260,4 +275,23 @@ public class SolrInputDocument implements Map, Iterable values() {
return _fields.values();
}
+
+ public void addChildDocument(SolrInputDocument child) {
+ _childDocuments.add(child);
+ }
+
+ public void addChildDocuments(Collection childs) {
+ for (SolrInputDocument child : childs) {
+ addChildDocument(child);
+ }
+ }
+
+ public List getChildDocuments() {
+ return _childDocuments;
+ }
+
+ public boolean hasChildDocuments() {
+ boolean isEmpty = (_childDocuments == null || _childDocuments.isEmpty());
+ return !isEmpty;
+ }
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
index d65bdc304eb..583c33eb35b 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
@@ -62,6 +62,7 @@ public class JavaBinCodec {
END = 15,
SOLRINPUTDOC = 16,
+ SOLRINPUTDOC_CHILDS = 17,
// types that combine tag + length (or other info) in a single byte
TAG_AND_LEN = (byte) (1 << 5),
@@ -358,6 +359,8 @@ public class JavaBinCodec {
public SolrInputDocument readSolrInputDocument(DataInputInputStream dis) throws IOException {
int sz = readVInt(dis);
+ dis.readByte(); // skip childDocuments tag
+ int childsSize = readVInt(dis);
float docBoost = (Float)readVal(dis);
SolrInputDocument sdoc = new SolrInputDocument();
sdoc.setDocumentBoost(docBoost);
@@ -374,11 +377,17 @@ public class JavaBinCodec {
Object fieldVal = readVal(dis);
sdoc.setField(fieldName, fieldVal, boost);
}
+ for (int i = 0; i < childsSize; i++) {
+ dis.readByte(); // skip solrinputdoc tag
+ SolrInputDocument child = readSolrInputDocument(dis);
+ sdoc.addChildDocument(child);
+ }
return sdoc;
}
public void writeSolrInputDocument(SolrInputDocument sdoc) throws IOException {
writeTag(SOLRINPUTDOC, sdoc.size());
+ writeTag(SOLRINPUTDOC_CHILDS, sdoc.getChildDocuments().size());
writeFloat(sdoc.getDocumentBoost());
for (SolrInputField inputField : sdoc.values()) {
if (inputField.getBoost() != 1.0f) {
@@ -387,6 +396,9 @@ public class JavaBinCodec {
writeExternString(inputField.getName());
writeVal(inputField.getValue());
}
+ for (SolrInputDocument child : sdoc.getChildDocuments()) {
+ writeSolrInputDocument(child);
+ }
}
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index b0288861147..35f48d06619 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -72,6 +72,7 @@ import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@@ -969,6 +970,10 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
return sd;
}
+ public static List sdocs(SolrInputDocument... docs) {
+ return Arrays.asList(docs);
+ }
+
/** Converts "test JSON" and returns standard JSON.
* Currently this only consists of changing unescaped single quotes to double quotes,
* and escaped single quotes to single quotes.
@@ -1527,7 +1532,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
}
/** Return a Map from field value to a list of document ids */
- Map> invertField(Map model, String field) {
+ public Map> invertField(Map model, String field) {
Map> value_to_id = new HashMap>();
// invert field