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

small fix following rebase on master

This commit is contained in:
Colin Goodheart-Smithe 2016-05-09 10:55:15 +01:00
parent 66d0bdab0c
commit 0c449fee4a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java
View File

@ -464,8 +464,7 @@ final class DocumentParser {
context.path().remove(); context.path().remove();
} else { } else {
// TODO: why Strings.splitStringToArray instead of String.split? final String[] paths = currentFieldName.split("\\.");
final String[] paths = Strings.splitStringToArray(currentFieldName, '.');
currentFieldName = paths[paths.length - 1]; currentFieldName = paths[paths.length - 1];
Tuple<Integer, ObjectMapper> parentMapperTuple = getDynamicParentMapper(context, paths, mapper); Tuple<Integer, ObjectMapper> parentMapperTuple = getDynamicParentMapper(context, paths, mapper);
ObjectMapper parentMapper = parentMapperTuple.v2(); ObjectMapper parentMapper = parentMapperTuple.v2();
@ -509,8 +508,7 @@ final class DocumentParser {
} }
} else { } else {
// TODO: why Strings.splitStringToArray instead of String.split? final String[] paths = arrayFieldName.split("\\.");
final String[] paths = Strings.splitStringToArray(arrayFieldName, '.');
arrayFieldName = paths[paths.length - 1]; arrayFieldName = paths[paths.length - 1];
lastFieldName = arrayFieldName; lastFieldName = arrayFieldName;
Tuple<Integer, ObjectMapper> parentMapperTuple = getDynamicParentMapper(context, paths, parentMapper); Tuple<Integer, ObjectMapper> parentMapperTuple = getDynamicParentMapper(context, paths, parentMapper);
@ -574,8 +572,7 @@ final class DocumentParser {
parseObjectOrField(context, mapper); parseObjectOrField(context, mapper);
} else { } else {
// TODO: why Strings.splitStringToArray instead of String.split? final String[] paths = currentFieldName.split("\\.");
final String[] paths = Strings.splitStringToArray(currentFieldName, '.');
currentFieldName = paths[paths.length - 1]; currentFieldName = paths[paths.length - 1];
Tuple<Integer, ObjectMapper> parentMapperTuple = getDynamicParentMapper(context, paths, parentMapper); Tuple<Integer, ObjectMapper> parentMapperTuple = getDynamicParentMapper(context, paths, parentMapper);
parentMapper = parentMapperTuple.v2(); parentMapper = parentMapperTuple.v2();