Skip to content

Extend nextDoc to delegate to the wrapped doc-value iterator for date_nanos #39176

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 5 commits into from
Feb 21, 2019
Merged

Extend nextDoc to delegate to the wrapped doc-value iterator for date_nanos #39176

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9078bf3
Extend nextDoc to delegate to the wrapped doc-value iterator for
iverase Feb 20, 2019
92da4b5
fix precommit
iverase Feb 20, 2019
e9dc945
fix precommit
iverase Feb 20, 2019
bcc7725
Add unit test on DateFieldTypeTests
iverase Feb 20, 2019
a5e85d0
clean up unit test
iverase Feb 21, 2019
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
5 changes: 5 additions & 0 deletions .../src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@ public long nextValue() throws IOException {
public int docValueCount() {
return dv.docValueCount();
}

@Override
public int nextDoc() throws IOException {
return dv.nextDoc();
}
};
}

Expand Down
43 changes: 43 additions & 0 deletions server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,4 +1561,47 @@ private void assertMultiSortResponse(int[] expectedDays, BucketOrder... order) {
private ZonedDateTime key(Histogram.Bucket bucket) {
return (ZonedDateTime) bucket.getKey();
}

/**
* See https://github.com/elastic/elasticsearch/issues/39107. Make sure we handle properly different
* timeZones.
*/
public void testDateNanosHistogram() throws Exception {
assertAcked(prepareCreate("nanos").addMapping("_doc", "date", "type=date_nanos").get());
indexRandom(true,
client().prepareIndex("nanos", "_doc", "1").setSource("date", "2000-01-01"));
indexRandom(true,
client().prepareIndex("nanos", "_doc", "2").setSource("date", "2000-01-02"));

//Search interval 24 hours
SearchResponse r = client().prepareSearch("nanos")
.addAggregation(dateHistogram("histo").field("date").
interval(1000 * 60 * 60 * 24).timeZone(ZoneId.of("Europe/Berlin")))
.addDocValueField("date")
.get();
assertSearchResponse(r);

Histogram histogram = r.getAggregations().get("histo");
List<? extends Bucket> buckets = histogram.getBuckets();
assertEquals(2, buckets.size());
assertEquals(946681200000L, ((ZonedDateTime)buckets.get(0).getKey()).toEpochSecond() * 1000);
assertEquals(1, buckets.get(0).getDocCount());
assertEquals(946767600000L, ((ZonedDateTime)buckets.get(1).getKey()).toEpochSecond() * 1000);
assertEquals(1, buckets.get(1).getDocCount());

r = client().prepareSearch("nanos")
.addAggregation(dateHistogram("histo").field("date")
.interval(1000 * 60 * 60 * 24).timeZone(ZoneId.of("UTC")))
.addDocValueField("date")
.get();
assertSearchResponse(r);

histogram = r.getAggregations().get("histo");
buckets = histogram.getBuckets();
assertEquals(2, buckets.size());
assertEquals(946684800000L, ((ZonedDateTime)buckets.get(0).getKey()).toEpochSecond() * 1000);
assertEquals(1, buckets.get(0).getDocCount());
assertEquals(946771200000L, ((ZonedDateTime)buckets.get(1).getKey()).toEpochSecond() * 1000);
assertEquals(1, buckets.get(1).getDocCount());
}
}