honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug: https://github.com/elastic/elasticsearch/issues/21710

Browse Source
This commit is contained in:
makeyang 2016-12-05 19:14:34 +08:00
parent 20177f6eee
commit 318ce6ab16
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -229,6 +229,9 @@ public class TypeParsers {
builder.indexOptions(nodeIndexOptionValue(propNode)); builder.indexOptions(nodeIndexOptionValue(propNode));
iterator.remove(); iterator.remove();
} else if (propName.equals("include_in_all")) { } 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);
}
builder.includeInAll(nodeBooleanValue("include_in_all", propNode, parserContext)); builder.includeInAll(nodeBooleanValue("include_in_all", propNode, parserContext));
iterator.remove(); iterator.remove();
} else if (propName.equals("similarity")) { } else if (propName.equals("similarity")) {