honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug in parent handling where the parsed parent value was not set in the SourceToParse

This commit is contained in:
Benjamin Devèze 2011-09-02 12:07:03 +02:00 committed by Shay Banon
parent 847b10dc99
commit 8958e9fd4a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
View File

@ -122,6 +122,7 @@ public class ParentFieldMapper extends AbstractFieldMapper<Uid> implements Inter
if (context.parser().currentName() != null && context.parser().currentName().equals(Defaults.NAME)) { if (context.parser().currentName() != null && context.parser().currentName().equals(Defaults.NAME)) {
// we are in the parsing of _parent phase // we are in the parsing of _parent phase
String parentId = context.parser().text(); String parentId = context.parser().text();
context.sourceToParse().parent(parentId);
return new Field(names.indexName(), Uid.createUid(context.stringBuilder(), type, parentId), store, index); return new Field(names.indexName(), Uid.createUid(context.stringBuilder(), type, parentId), store, index);
} }
// otherwise, we are running it post processing of the xcontent // otherwise, we are running it post processing of the xcontent

4
modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java
View File

@ -48,6 +48,7 @@ public class ParentMappingTests {
.copiedBytes()).type("type").id("1")); .copiedBytes()).type("type").id("1"));
// no _parent mapping, used as a simple field // no _parent mapping, used as a simple field
assertThat(doc.parent(), equalTo(null));
assertThat(doc.rootDoc().get("_parent"), equalTo("1122")); assertThat(doc.rootDoc().get("_parent"), equalTo("1122"));
} }
@ -63,7 +64,8 @@ public class ParentMappingTests {
.field("x_field", "x_value") .field("x_field", "x_value")
.endObject() .endObject()
.copiedBytes()).type("type").id("1")); .copiedBytes()).type("type").id("1"));
assertThat(doc.parent(), equalTo("1122"));
assertThat(doc.rootDoc().get("_parent"), equalTo(Uid.createUid("p_type", "1122"))); assertThat(doc.rootDoc().get("_parent"), equalTo(Uid.createUid("p_type", "1122")));
} }