Skip to content

Commit b64ad03

Browse files
author
石源
committed
fix #821 date_histogram offset
1 parent 2ed7e98 commit b64ad03

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.nlpcn</groupId>
55
<artifactId>elasticsearch-sql</artifactId>
6-
<version>6.5.1.0</version>
6+
<version>6.5.1.1</version>
77
<packaging>jar</packaging>
88
<description>Query elasticsearch using SQL</description>
99
<name>elasticsearch-sql</name>

src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,9 @@ private DateHistogramAggregationBuilder dateHistogram(MethodField field) throws
521521
dateHistogram.extendedBounds(new ExtendedBounds(bounds[0], bounds[1]));
522522
}
523523
break;
524+
case "offset":
525+
dateHistogram.offset(value);
526+
break;
524527

525528
case "alias":
526529
case "nested":

src/test/java/org/nlpcn/es4sql/AggregationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ public void countGroupByRange() throws IOException, SqlParseException, SQLFeatur
371371
*/
372372
@Test
373373
public void countGroupByDateTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
374-
String result = MainTestSuite.getSearchDao().explain("select insert_time from online group by date_histogram(field='insert_time','interval'='1.5h','format'='yyyy-MM','min_doc_count'=5) ").explain().toString();
375-
Assert.assertTrue(result.replaceAll("\\s+", "").contains("{\"date_histogram\":{\"field\":\"insert_time\",\"format\":\"yyyy-MM\",\"interval\":\"1.5h\",\"offset\":0,\"order\":{\"_key\":\"asc\"},\"keyed\":false,\"min_doc_count\":5}"));
374+
String result = MainTestSuite.getSearchDao().explain("select insert_time from online group by date_histogram(field='insert_time','interval'='1.5h','format'='yyyy-MM','min_doc_count'=5,'offset'='+8h') ").explain().toString();
375+
Assert.assertTrue(result.replaceAll("\\s+", "").contains("{\"date_histogram\":{\"field\":\"insert_time\",\"format\":\"yyyy-MM\",\"interval\":\"1.5h\",\"offset\":28800000,\"order\":{\"_key\":\"asc\"},\"keyed\":false,\"min_doc_count\":5}"));
376376
}
377377

378378
@Test

0 commit comments

Comments
 (0)