honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-20 03:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes date range query using epoch with timezone (#21542)

Browse Source 
This change fixes the rnage query so that an exception is always thrown if the range query uses epoch time together with a time zone. Since epoch time is always UTC it should not be used with a time zone.

Closes #21501
This commit is contained in:
Colin Goodheart-Smithe 2016-11-16 09:11:04 +00:00 committed by GitHub
parent 00de8e07fc
commit c6c734dce1
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java
View File

@ -321,14 +321,6 @@ public class DateFieldMapper extends FieldMapper {
dateParser = this.dateMathParser; dateParser = this.dateMathParser;
} }
if (PointValues.size(reader, name()) == 0) {
// no points, so nothing matches
return Relation.DISJOINT;
}
long minValue = LongPoint.decodeDimension(PointValues.getMinPackedValue(reader, name()), 0);
long maxValue = LongPoint.decodeDimension(PointValues.getMaxPackedValue(reader, name()), 0);
long fromInclusive = Long.MIN_VALUE; long fromInclusive = Long.MIN_VALUE;
if (from != null) { if (from != null) {
fromInclusive = parseToMilliseconds(from, !includeLower, timeZone, dateParser, context); fromInclusive = parseToMilliseconds(from, !includeLower, timeZone, dateParser, context);
@ -351,6 +343,17 @@ public class DateFieldMapper extends FieldMapper {
} }
} }
// This check needs to be done after fromInclusive and toInclusive
// are resolved so we can throw an exception if they are invalid
// even if there are no points in the shard
if (PointValues.size(reader, name()) == 0) {
// no points, so nothing matches
return Relation.DISJOINT;
}
long minValue = LongPoint.decodeDimension(PointValues.getMinPackedValue(reader, name()), 0);
long maxValue = LongPoint.decodeDimension(PointValues.getMaxPackedValue(reader, name()), 0);
if (minValue >= fromInclusive && maxValue <= toInclusive) { if (minValue >= fromInclusive && maxValue <= toInclusive) {
return Relation.WITHIN; return Relation.WITHIN;
} else if (maxValue < fromInclusive || minValue > toInclusive) { } else if (maxValue < fromInclusive || minValue > toInclusive) {

7
core/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java
View File

@ -73,11 +73,12 @@ public class DateFieldTypeTests extends FieldTypeTestCase {
} }
public void testIsFieldWithinQueryEmptyReader() throws IOException { public void testIsFieldWithinQueryEmptyReader() throws IOException {
QueryRewriteContext context = new QueryRewriteContext(null, null, null, null, null, null, null, () -> nowInMillis);
IndexReader reader = new MultiReader(); IndexReader reader = new MultiReader();
DateFieldType ft = new DateFieldType(); DateFieldType ft = new DateFieldType();
ft.setName("my_date"); ft.setName("my_date");
assertEquals(Relation.DISJOINT, ft.isFieldWithinQuery(reader, "2015-10-12", "2016-04-03", assertEquals(Relation.DISJOINT, ft.isFieldWithinQuery(reader, "2015-10-12", "2016-04-03",
randomBoolean(), randomBoolean(), null, null, null)); randomBoolean(), randomBoolean(), null, null, context));
} }
private void doTestIsFieldWithinQuery(DateFieldType ft, DirectoryReader reader, private void doTestIsFieldWithinQuery(DateFieldType ft, DirectoryReader reader,
@ -128,7 +129,9 @@ public class DateFieldTypeTests extends FieldTypeTestCase {
// Fields with no value indexed. // Fields with no value indexed.
DateFieldType ft2 = new DateFieldType(); DateFieldType ft2 = new DateFieldType();
ft2.setName("my_date2"); ft2.setName("my_date2");
assertEquals(Relation.DISJOINT, ft2.isFieldWithinQuery(reader, "2015-10-09", "2016-01-02", false, false, null, null, null));
QueryRewriteContext context = new QueryRewriteContext(null, null, null, null, null, null, null, () -> nowInMillis);
assertEquals(Relation.DISJOINT, ft2.isFieldWithinQuery(reader, "2015-10-09", "2016-01-02", false, false, null, null, context));
IOUtils.close(reader, w, dir); IOUtils.close(reader, w, dir);
} }

1
core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java
View File

@ -1904,7 +1904,6 @@ public class SearchQueryIT extends ESIntegTestCase {
assertHitCount(client().prepareSearch("test").setSize(0).setQuery(rangeQuery("field").lte(-999999999999L)).get(), 3); assertHitCount(client().prepareSearch("test").setSize(0).setQuery(rangeQuery("field").lte(-999999999999L)).get(), 3);
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/21501")
public void testRangeQueryWithTimeZone() throws Exception { public void testRangeQueryWithTimeZone() throws Exception {
assertAcked(prepareCreate("test") assertAcked(prepareCreate("test")
.addMapping("type1", "date", "type=date", "num", "type=integer")); .addMapping("type1", "date", "type=date", "num", "type=integer"));