honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-09 06:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't detect source's XContentType in DocumentParser.parseDocument() (#26880)

Browse Source 
DocumentParser.parseDocument() auto detects the XContentType of the
document to parse, but this information is already provided by SourceToParse.
This commit is contained in:
Tanguy Leroux 2017-10-10 15:31:56 +02:00 committed by GitHub
parent c03f0c89af
commit 6658ff0fd6
4 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.FormatDateTimeFormatter;
import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.mapper.DynamicTemplate.XContentFieldType; import org.elasticsearch.index.mapper.DynamicTemplate.XContentFieldType;
import org.elasticsearch.index.mapper.KeywordFieldMapper.KeywordFieldType; import org.elasticsearch.index.mapper.KeywordFieldMapper.KeywordFieldType;
@ -58,9 +59,10 @@ final class DocumentParser {
final Mapping mapping = docMapper.mapping(); final Mapping mapping = docMapper.mapping();
final ParseContext.InternalParseContext context; final ParseContext.InternalParseContext context;
try (XContentParser parser = XContentHelper.createParser(docMapperParser.getXContentRegistry(), source.source())) { final XContentType xContentType = source.getXContentType();
context = new ParseContext.InternalParseContext(indexSettings.getSettings(),
docMapperParser, docMapper, source, parser); try (XContentParser parser = XContentHelper.createParser(docMapperParser.getXContentRegistry(), source.source(), xContentType)) {
context = new ParseContext.InternalParseContext(indexSettings.getSettings(), docMapperParser, docMapper, source, parser);
validateStart(parser); validateStart(parser);
internalParseDocument(mapping, context, parser); internalParseDocument(mapping, context, parser);
validateEnd(parser); validateEnd(parser);
@ -74,8 +76,7 @@ final class DocumentParser {
reverseOrder(context); reverseOrder(context);
ParsedDocument doc = parsedDocument(source, context, createDynamicUpdate(mapping, docMapper, context.getDynamicMappers())); return parsedDocument(source, context, createDynamicUpdate(mapping, docMapper, context.getDynamicMappers()));
return doc;
} }
private static void internalParseDocument(Mapping mapping, ParseContext.InternalParseContext context, XContentParser parser) throws IOException { private static void internalParseDocument(Mapping mapping, ParseContext.InternalParseContext context, XContentParser parser) throws IOException {
@ -89,7 +90,7 @@ final class DocumentParser {
// entire type is disabled // entire type is disabled
parser.skipChildren(); parser.skipChildren();
} else if (emptyDoc == false) { } else if (emptyDoc == false) {
parseObjectOrNested(context, mapping.root, true); parseObjectOrNested(context, mapping.root);
} }
for (MetadataFieldMapper metadataMapper : mapping.metadataMappers) { for (MetadataFieldMapper metadataMapper : mapping.metadataMappers) {
@ -338,7 +339,7 @@ final class DocumentParser {
return parent.mappingUpdate(mapper); return parent.mappingUpdate(mapper);
} }
static void parseObjectOrNested(ParseContext context, ObjectMapper mapper, boolean atRoot) throws IOException { static void parseObjectOrNested(ParseContext context, ObjectMapper mapper) throws IOException {
if (mapper.isEnabled() == false) { if (mapper.isEnabled() == false) {
context.parser().skipChildren(); context.parser().skipChildren();
return; return;
@ -467,7 +468,7 @@ final class DocumentParser {
private static void parseObjectOrField(ParseContext context, Mapper mapper) throws IOException { private static void parseObjectOrField(ParseContext context, Mapper mapper) throws IOException {
if (mapper instanceof ObjectMapper) { if (mapper instanceof ObjectMapper) {
parseObjectOrNested(context, (ObjectMapper) mapper, false); parseObjectOrNested(context, (ObjectMapper) mapper);
} else { } else {
FieldMapper fieldMapper = (FieldMapper)mapper; FieldMapper fieldMapper = (FieldMapper)mapper;
Mapper update = fieldMapper.parse(context); Mapper update = fieldMapper.parse(context);
@ -481,14 +482,13 @@ final class DocumentParser {
private static void parseObject(final ParseContext context, ObjectMapper mapper, String currentFieldName) throws IOException { private static void parseObject(final ParseContext context, ObjectMapper mapper, String currentFieldName) throws IOException {
assert currentFieldName != null; assert currentFieldName != null;
Mapper objectMapper = getMapper(mapper, currentFieldName); final String[] paths = splitAndValidatePath(currentFieldName);
Mapper objectMapper = getMapper(mapper, currentFieldName, paths);
if (objectMapper != null) { if (objectMapper != null) {
context.path().add(currentFieldName); context.path().add(currentFieldName);
parseObjectOrField(context, objectMapper); parseObjectOrField(context, objectMapper);
context.path().remove(); context.path().remove();
} else { } else {
final String[] paths = splitAndValidatePath(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();
@ -518,7 +518,9 @@ final class DocumentParser {
private static void parseArray(ParseContext context, ObjectMapper parentMapper, String lastFieldName) throws IOException { private static void parseArray(ParseContext context, ObjectMapper parentMapper, String lastFieldName) throws IOException {
String arrayFieldName = lastFieldName; String arrayFieldName = lastFieldName;
Mapper mapper = getMapper(parentMapper, lastFieldName);
final String[] paths = splitAndValidatePath(arrayFieldName);
Mapper mapper = getMapper(parentMapper, lastFieldName, paths);
if (mapper != null) { if (mapper != null) {
// There is a concrete mapper for this field already. Need to check if the mapper // There is a concrete mapper for this field already. Need to check if the mapper
// expects an array, if so we pass the context straight to the mapper and if not // expects an array, if so we pass the context straight to the mapper and if not
@ -529,8 +531,6 @@ final class DocumentParser {
parseNonDynamicArray(context, parentMapper, lastFieldName, arrayFieldName); parseNonDynamicArray(context, parentMapper, lastFieldName, arrayFieldName);
} }
} else { } else {
final String[] paths = splitAndValidatePath(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);
@ -589,12 +589,12 @@ final class DocumentParser {
if (currentFieldName == null) { if (currentFieldName == null) {
throw new MapperParsingException("object mapping [" + parentMapper.name() + "] trying to serialize a value with no field associated with it, current value [" + context.parser().textOrNull() + "]"); throw new MapperParsingException("object mapping [" + parentMapper.name() + "] trying to serialize a value with no field associated with it, current value [" + context.parser().textOrNull() + "]");
} }
Mapper mapper = getMapper(parentMapper, currentFieldName);
final String[] paths = splitAndValidatePath(currentFieldName);
Mapper mapper = getMapper(parentMapper, currentFieldName, paths);
if (mapper != null) { if (mapper != null) {
parseObjectOrField(context, mapper); parseObjectOrField(context, mapper);
} else { } else {
final String[] paths = splitAndValidatePath(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();
@ -607,7 +607,7 @@ final class DocumentParser {
private static void parseNullValue(ParseContext context, ObjectMapper parentMapper, String lastFieldName) throws IOException { private static void parseNullValue(ParseContext context, ObjectMapper parentMapper, String lastFieldName) throws IOException {
// we can only handle null values if we have mappings for them // we can only handle null values if we have mappings for them
Mapper mapper = getMapper(parentMapper, lastFieldName); Mapper mapper = getMapper(parentMapper, lastFieldName, splitAndValidatePath(lastFieldName));
if (mapper != null) { if (mapper != null) {
// TODO: passing null to an object seems bogus? // TODO: passing null to an object seems bogus?
parseObjectOrField(context, mapper); parseObjectOrField(context, mapper);
@ -893,7 +893,7 @@ final class DocumentParser {
break; break;
case FALSE: case FALSE:
// Should not dynamically create any more mappers so return the last mapper // Should not dynamically create any more mappers so return the last mapper
return new Tuple<Integer, ObjectMapper>(pathsAdded, parent); return new Tuple<>(pathsAdded, parent);
} }
} }
@ -901,7 +901,7 @@ final class DocumentParser {
pathsAdded++; pathsAdded++;
parent = mapper; parent = mapper;
} }
return new Tuple<Integer, ObjectMapper>(pathsAdded, mapper); return new Tuple<>(pathsAdded, mapper);
} }
// find what the dynamic setting is given the current parse context and parent // find what the dynamic setting is given the current parse context and parent
@ -929,8 +929,7 @@ final class DocumentParser {
} }
// looks up a child mapper, but takes into account field names that expand to objects // looks up a child mapper, but takes into account field names that expand to objects
static Mapper getMapper(ObjectMapper objectMapper, String fieldName) { private static Mapper getMapper(ObjectMapper objectMapper, String fieldName, String[] subfields) {
String[] subfields = splitAndValidatePath(fieldName);
for (int i = 0; i < subfields.length - 1; ++i) { for (int i = 0; i < subfields.length - 1; ++i) {
Mapper mapper = objectMapper.getMapper(subfields[i]); Mapper mapper = objectMapper.getMapper(subfields[i]);
if (mapper == null || (mapper instanceof ObjectMapper) == false) { if (mapper == null || (mapper instanceof ObjectMapper) == false) {

5
core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java
View File

@ -217,7 +217,7 @@ public class DynamicMappingTests extends ESSingleNodeTestCase {
ParseContext.InternalParseContext ctx = new ParseContext.InternalParseContext(settings, parser, mapper, source, xContentParser); ParseContext.InternalParseContext ctx = new ParseContext.InternalParseContext(settings, parser, mapper, source, xContentParser);
assertEquals(XContentParser.Token.START_OBJECT, ctx.parser().nextToken()); assertEquals(XContentParser.Token.START_OBJECT, ctx.parser().nextToken());
ctx.parser().nextToken(); ctx.parser().nextToken();
DocumentParser.parseObjectOrNested(ctx, mapper.root(), true); DocumentParser.parseObjectOrNested(ctx, mapper.root());
Mapping mapping = DocumentParser.createDynamicUpdate(mapper.mapping(), mapper, ctx.getDynamicMappers()); Mapping mapping = DocumentParser.createDynamicUpdate(mapper.mapping(), mapper, ctx.getDynamicMappers());
return mapping == null ? null : mapping.root(); return mapping == null ? null : mapping.root();
} }
@ -639,8 +639,7 @@ public class DynamicMappingTests extends ESSingleNodeTestCase {
.field("baz", (double) 3.2f) // double that can be accurately represented as a float .field("baz", (double) 3.2f) // double that can be accurately represented as a float
.field("quux", "3.2") // float detected through numeric detection .field("quux", "3.2") // float detected through numeric detection
.endObject().bytes(); .endObject().bytes();
ParsedDocument parsedDocument = mapper.parse(SourceToParse.source("index", "type", "id", source, ParsedDocument parsedDocument = mapper.parse(SourceToParse.source("index", "type", "id", source, builder.contentType()));
XContentType.JSON));
Mapping update = parsedDocument.dynamicMappingsUpdate(); Mapping update = parsedDocument.dynamicMappingsUpdate();
assertNotNull(update); assertNotNull(update);
assertThat(((FieldMapper) update.root().getMapper("foo")).fieldType().typeName(), equalTo("float")); assertThat(((FieldMapper) update.root().getMapper("foo")).fieldType().typeName(), equalTo("float"));

2
core/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java
View File

@ -65,7 +65,7 @@ public class SourceFieldMapperTests extends ESSingleNodeTestCase {
doc = documentMapper.parse(SourceToParse.source("test", "type", "1", XContentFactory.smileBuilder().startObject() doc = documentMapper.parse(SourceToParse.source("test", "type", "1", XContentFactory.smileBuilder().startObject()
.field("field", "value") .field("field", "value")
.endObject().bytes(), .endObject().bytes(),
XContentType.JSON)); XContentType.SMILE));
assertThat(XContentFactory.xContentType(doc.source()), equalTo(XContentType.SMILE)); assertThat(XContentFactory.xContentType(doc.source()), equalTo(XContentType.SMILE));
} }

4
modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java
View File

@ -805,10 +805,10 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
jsonBuilder().startObject().field("field1", "b").endObject().bytes(), XContentType.JSON))) jsonBuilder().startObject().field("field1", "b").endObject().bytes(), XContentType.JSON)))
.add(client().prepareSearch("test") .add(client().prepareSearch("test")
.setQuery(new PercolateQueryBuilder("query", .setQuery(new PercolateQueryBuilder("query",
yamlBuilder().startObject().field("field1", "c").endObject().bytes(), XContentType.JSON))) yamlBuilder().startObject().field("field1", "c").endObject().bytes(), XContentType.YAML)))
.add(client().prepareSearch("test") .add(client().prepareSearch("test")
.setQuery(new PercolateQueryBuilder("query", .setQuery(new PercolateQueryBuilder("query",
smileBuilder().startObject().field("field1", "b c").endObject().bytes(), XContentType.JSON))) smileBuilder().startObject().field("field1", "b c").endObject().bytes(), XContentType.SMILE)))
.add(client().prepareSearch("test") .add(client().prepareSearch("test")
.setQuery(new PercolateQueryBuilder("query", .setQuery(new PercolateQueryBuilder("query",
jsonBuilder().startObject().field("field1", "d").endObject().bytes(), XContentType.JSON))) jsonBuilder().startObject().field("field1", "d").endObject().bytes(), XContentType.JSON)))