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

modified code according to nik9000's comments.

This commit is contained in:
makeyang 2016-12-08 11:04:33 +08:00
parent 318ce6ab16
commit 46cdb411b5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java
View File

@ -229,10 +229,11 @@ public class TypeParsers {
builder.indexOptions(nodeIndexOptionValue(propNode));
iterator.remove();
} else if (propName.equals("include_in_all")) {
if(parserContext.isWithinMultiField()) {
throw new MapperParsingException("sub-fields shouldn't contain property: include_in_all, and current node is:" + name);
if (parserContext.isWithinMultiField()) {
throw new MapperParsingException("include_in_all in multi fields is not allowed. Found the include_in_all in field [" + name + "] which is within a multi field.");
} else {
builder.includeInAll(nodeBooleanValue("include_in_all", propNode, parserContext));
}
builder.includeInAll(nodeBooleanValue("include_in_all", propNode, parserContext));
iterator.remove();
} else if (propName.equals("similarity")) {
SimilarityProvider similarityProvider = resolveSimilarity(parserContext, name, propNode.toString());