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

Do not throw exception when flat_object field is explicitly null #15375

Merged
merged 4 commits into from
Aug 26, 2024
Merged

Do not throw exception when flat_object field is explicitly null #15375

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b416205
Do not throw exception when flat_object field is explicitly null
msfroh Aug 23, 2024
0a952c3
Fix unit test
msfroh Aug 23, 2024
3d6e908
Add changelog entry
msfroh Aug 26, 2024
0539f08
Merge branch 'main' into do_not_throw_on_null_flat_object
msfroh Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions rest-api-spec/src/main/resources/rest-api-spec/test/index/100_partial_flat_object.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,16 @@ setup:
} ]
}
}

- do:
msfroh marked this conversation as resolved.
Show resolved Hide resolved
index:
index: test_partial_flat_object
id: 4
body: {
"issue": {
"number": 999,
"labels": null
}
}
- do:
indices.refresh:
index: test_partial_flat_object
Expand Down Expand Up @@ -135,7 +144,7 @@ teardown:
}
}

- length: { hits.hits: 3 }
- length: { hits.hits: 4 }

# Match Query with exact dot path.
- do:
Expand Down
6 changes: 1 addition & 5 deletions server/src/main/java/org/opensearch/index/mapper/FlatObjectFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,11 +568,7 @@ protected void parseCreateField(ParseContext context) throws IOException {
if (context.externalValueSet()) {
String value = context.externalValue().toString();
parseValueAddFields(context, value, fieldType().name());
} else if (context.parser().currentToken() == XContentParser.Token.VALUE_NULL) {
context.parser().nextToken(); // This triggers an exception in DocumentParser.
// We could remove the above nextToken() call to skip the null value, but the existing
// behavior (since 2.7) throws the exception.
} else {
} else if (context.parser().currentToken() != XContentParser.Token.VALUE_NULL) {
JsonToStringXContentParser jsonToStringParser = new JsonToStringXContentParser(
NamedXContentRegistry.EMPTY,
DeprecationHandler.IGNORE_DEPRECATIONS,
Expand Down
8 changes: 4 additions & 4 deletions server/src/test/java/org/opensearch/index/mapper/FlatObjectFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.hamcrest.core.StringContains.containsString;

public class FlatObjectFieldMapperTests extends MapperTestCase {
private static final String FIELD_TYPE = "flat_object";
Expand Down Expand Up @@ -133,9 +132,10 @@ public void testDefaults() throws Exception {

public void testNullValue() throws IOException {
DocumentMapper mapper = createDocumentMapper(fieldMapping(this::minimalMapping));
MapperParsingException e = expectThrows(MapperParsingException.class, () -> mapper.parse(source(b -> b.nullField("field"))));
assertThat(e.getMessage(), containsString("object mapping for [_doc] tried to parse field [field] as object"));

ParsedDocument parsedDocument = mapper.parse(source(b -> b.nullField("field")));
assertEquals(1, parsedDocument.docs().size());
IndexableField[] fields = parsedDocument.rootDoc().getFields("field");
assertEquals(0, fields.length);
}

@Override
Expand Down
Loading