Skip to content

Ignore null value for range field (#27845) #28116

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

Merged
merged 2 commits into from
Jan 10, 2018
Merged

Ignore null value for range field (#27845) #28116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63afdbd
Ignore null value for range field (#27845)
liketic Jan 6, 2018
c02d8b2
Add unit test
liketic Jan 9, 2018
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
4 changes: 3 additions & 1 deletion core/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,9 @@ protected void parseCreateField(ParseContext context, List<IndexableField> field
} else {
XContentParser parser = context.parser();
final XContentParser.Token start = parser.currentToken();
if (start == XContentParser.Token.START_OBJECT) {
if (start == XContentParser.Token.VALUE_NULL) {
return;
} else if (start == XContentParser.Token.START_OBJECT) {
RangeFieldType fieldType = fieldType();
RangeType rangeType = fieldType.rangeType;
String fieldName = null;
Expand Down
9 changes: 9 additions & 0 deletions core/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,15 @@ protected void doTestNullValue(String type) throws IOException {
+ InetAddresses.toAddrString(InetAddresses.forString("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"));
}
assertThat(storedField.stringValue(), containsString(strVal));

// test null range
doc = mapper.parse(SourceToParse.source("test", "type", "1", XContentFactory.jsonBuilder()
.startObject()
.nullField("field")
.endObject()
.bytes(),
XContentType.JSON));
assertNull(doc.rootDoc().get("field"));
}

public void testNoBounds() throws Exception {
Expand Down
12 changes: 12 additions & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/test/range/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ setup:
id: 3
body: { "integer_range" : { "gte": 4, "lte": 5 } }

- do:
index:
index: test
type: doc
id: 4
body: { "integer_range" : null }

- do:
indices.refresh: {}
Expand Down Expand Up @@ -79,6 +85,12 @@ setup:

- match: { hits.total: 0 }

- do:
search:
body: { "query" : { "match_all": {} } }

- match: { hits.total: 4 }

---
"Long range":

Expand Down