Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't parse unmapped array field when dynamic is set to false #85082

Merged
merged 6 commits into from
Mar 28, 2022
Merged

Don't parse unmapped array field when dynamic is set to false #85082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
63b7d99
Don't parse unmapped array field when dynamic is set to false
javanna Mar 17, 2022
19e0352
Merge branch 'main' into fix/dynamicfalse_skipchildren
javanna Mar 18, 2022
25b94db
Merge branch 'main' into fix/dynamicfalse_skipchildren
javanna Mar 23, 2022
2a49a70
add tests for array parsing with dynamic set to false
javanna Mar 23, 2022
97d3abf
fix test
javanna Mar 23, 2022
271e377
Merge branch 'main' into fix/dynamicfalse_skipchildren
javanna Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,8 +438,7 @@ private static void parseArray(DocumentParserContext context, ObjectMapper paren
if (dynamic == ObjectMapper.Dynamic.STRICT) {
throw new StrictDynamicMappingException(parentMapper.fullPath(), lastFieldName);
} else if (dynamic == ObjectMapper.Dynamic.FALSE) {
// TODO: shouldn't this skip, not parse?
parseNonDynamicArray(context, parentMapper, lastFieldName, lastFieldName);
context.parser().skipChildren();
} else {
Mapper objectMapperFromTemplate = dynamic.getDynamicFieldsBuilder().createObjectMapperFromTemplate(context, lastFieldName);
if (objectMapperFromTemplate == null) {
Expand Down
82 changes: 82 additions & 0 deletions server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,4 +820,86 @@ public void testDottedFieldDynamicFalse() throws IOException {

assertNull(doc.dynamicMappingsUpdate());
}

public void testArraysDynamicFalse() throws IOException {
DocumentMapper defaultMapper = createDocumentMapper(
dynamicMapping("false", b -> b.startObject("myarray").field("type", "keyword").endObject())
);

ParsedDocument doc = defaultMapper.parse(source(b -> {
b.array("unmapped", "unknown1", "unknown2");
b.array("myarray", "array1", "array2");
}));

assertThat(doc.rootDoc().getFields("myarray"), arrayWithSize(4));
assertThat(doc.rootDoc().getFields("unmapped"), arrayWithSize(0));
assertNull(doc.dynamicMappingsUpdate());
}

public void testArraysOfObjectsRootDynamicFalse() throws IOException {
DocumentMapper defaultMapper = createDocumentMapper(
dynamicMapping(
"false",
b -> b.startObject("objects")
.startObject("properties")
.startObject("subfield")
.field("type", "keyword")
.endObject()
.endObject()
.endObject()
)
);

ParsedDocument doc = defaultMapper.parse(source(b -> {
b.startArray("objects");
b.startObject().field("subfield", "sub").field("unmapped", "unmapped").endObject();
b.endArray();
b.startArray("unmapped");
b.startObject().field("subfield", "unmapped").endObject();
b.endArray();
}));

assertThat(doc.rootDoc().getFields("objects.subfield"), arrayWithSize(2));
assertThat(doc.rootDoc().getFields("objects.unmapped"), arrayWithSize(0));
assertThat(doc.rootDoc().getFields("unmapped.subfield"), arrayWithSize(0));
assertNull(doc.dynamicMappingsUpdate());
}

public void testArraysOfObjectsDynamicFalse() throws IOException {
DocumentMapper defaultMapper = createDocumentMapper(
dynamicMapping(
"true",
b -> b.startObject("objects")
.field("dynamic", false)
.startObject("properties")
.startObject("subfield")
.field("type", "keyword")
.endObject()
.endObject()
.endObject()
)
);

ParsedDocument doc = defaultMapper.parse(source(b -> {
b.startArray("objects");
b.startObject().field("subfield", "sub").field("unmapped", "unmapped").endObject();
b.endArray();
b.field("myfield", 2);
}));

assertThat(doc.rootDoc().getFields("myfield"), arrayWithSize(2));
assertThat(doc.rootDoc().getFields("objects.subfield"), arrayWithSize(2));
assertThat(doc.rootDoc().getFields("objects.unmapped"), arrayWithSize(0));
assertEquals(XContentHelper.stripWhitespace("""
{
"_doc": {
"dynamic":"true",
"properties":{
"myfield":{
"type":"long"
}
}
}
}"""), Strings.toString(doc.dynamicMappingsUpdate()));
}
}