Skip to content

Fix offsets in DateHistogramBuilder #6216

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

Closed
wants to merge 1 commit into from
Closed

Fix offsets in DateHistogramBuilder #6216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions ...ain/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public class DateHistogramBuilder extends ValuesSourceAggregationBuilder<DateHis
private String postZone;
private boolean preZoneAdjustLargeInterval;
private String format;
long preOffset = 0;
long postOffset = 0;
private Object preOffset;
private Object postOffset;
float factor = 1.0f;

public DateHistogramBuilder(String name) {
Expand Down Expand Up @@ -94,6 +94,16 @@ public DateHistogramBuilder postOffset(long postOffset) {
return this;
}

public DateHistogramBuilder preOffset( DateHistogram.Interval preOffset ) {
this.preOffset = preOffset;
return this;
}

public DateHistogramBuilder postOffset( DateHistogram.Interval postOffset ) {
this.postOffset = postOffset;
return this;
}

public DateHistogramBuilder factor(float factor) {
this.factor = factor;
return this;
Expand Down Expand Up @@ -153,11 +163,17 @@ protected XContentBuilder doInternalXContent(XContentBuilder builder, Params par
builder.field("pre_zone_adjust_large_interval", true);
}

if (preOffset != 0) {
if (preOffset != null) {
if (preOffset instanceof Number) {
preOffset = TimeValue.timeValueMillis(((Number) preOffset).longValue()).toString();
}
builder.field("pre_offset", preOffset);
}

if (postOffset != 0) {
if (postOffset != null) {
if (postOffset instanceof Number) {
postOffset = TimeValue.timeValueMillis(((Number) postOffset).longValue()).toString();
}
builder.field("post_offset", postOffset);
}

Expand Down
111 changes: 111 additions & 0 deletions src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,117 @@ public void singleValuedField() throws Exception {
assertThat(bucket.getDocCount(), equalTo(3l));
}

@Test
public void singleValuedField_WithLongOffsets() throws Exception {
SearchResponse response;
response = client().prepareSearch("idx")
.addAggregation(dateHistogram("histo").field("date")
.interval(DateHistogram.Interval.DAY)
.preOffset(1000*60*60*24*2)
.postOffset(-1000*60*60*24))
.execute().actionGet();

assertSearchResponse(response);


DateHistogram histo = response.getAggregations().get("histo");
assertThat(histo, notNullValue());
assertThat(histo.getName(), equalTo("histo"));
assertThat(histo.getBuckets().size(), equalTo(6));

long key = new DateTime(2012, 1, 3, 0, 0, DateTimeZone.UTC).getMillis();
DateHistogram.Bucket bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));

key = new DateTime(2012, 2, 3, 0, 0, DateTimeZone.UTC).getMillis();
bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));

key = new DateTime(2012, 2, 16, 0, 0, DateTimeZone.UTC).getMillis();
bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));

key = new DateTime(2012, 3, 3, 0, 0, DateTimeZone.UTC).getMillis();
bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));

key = new DateTime(2012, 3, 16, 0, 0, DateTimeZone.UTC).getMillis();
bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));

key = new DateTime(2012, 3, 24, 0, 0, DateTimeZone.UTC).getMillis();
bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));
}

@Test
public void singleValuedField_WithIntervalOffsets() throws Exception {
SearchResponse response;
response = client().prepareSearch("idx")
.addAggregation(dateHistogram("histo").field("date")
.interval(DateHistogram.Interval.DAY)
.preOffset(DateHistogram.Interval.days(2))
.postOffset(DateHistogram.Interval.days(-1)))
.execute().actionGet();

assertSearchResponse(response);


DateHistogram histo = response.getAggregations().get("histo");
assertThat(histo, notNullValue());
assertThat(histo.getName(), equalTo("histo"));
assertThat(histo.getBuckets().size(), equalTo(6));

long key = new DateTime(2012, 1, 3, 0, 0, DateTimeZone.UTC).getMillis();
DateHistogram.Bucket bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));

key = new DateTime(2012, 2, 3, 0, 0, DateTimeZone.UTC).getMillis();
bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));

key = new DateTime(2012, 2, 16, 0, 0, DateTimeZone.UTC).getMillis();
bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));

key = new DateTime(2012, 3, 3, 0, 0, DateTimeZone.UTC).getMillis();
bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));

key = new DateTime(2012, 3, 16, 0, 0, DateTimeZone.UTC).getMillis();
bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));

key = new DateTime(2012, 3, 24, 0, 0, DateTimeZone.UTC).getMillis();
bucket = histo.getBucketByKey(key);
assertThat(bucket, notNullValue());
assertThat(bucket.getKeyAsNumber().longValue(), equalTo(key));
assertThat(bucket.getDocCount(), equalTo(1l));
}


@Test
public void singleValuedField_WithPostTimeZone() throws Exception {
SearchResponse response;
Expand Down