suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

优化es7.2以上版本的聚合查询

This commit is contained in:
zhou-hao 2021-01-13 16:22:18 +08:00
parent f7d030e69a
commit db91c5a98e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/service/reactive/ReactiveAggregationService.java
View File

@ -88,17 +88,17 @@ public class ReactiveAggregationService implements AggregationService {
builder.timeZone(ZoneId.systemDefault());
builder.order(BucketOrder.key(false));
if (timeGroup.getInterval() != null) {
Interval interval = timeGroup.getInterval();
String intervalString = interval.toString();
if (restClient.serverVersion().after(Version.V_7_2_0)) {
Interval interval = timeGroup.getInterval();
if (interval.isFixed()) {
builder.fixedInterval(new DateHistogramInterval(timeGroup.getInterval().toString()));
} else if (interval.isCalendar()) {
builder.calendarInterval(new DateHistogramInterval(timeGroup.getInterval().toString()));
if (DateHistogramAggregationBuilder.DATE_FIELD_UNITS.containsKey(intervalString)) {
builder.calendarInterval(new DateHistogramInterval(intervalString));
} else {
builder.dateHistogramInterval(new DateHistogramInterval(timeGroup.getInterval().toString()));
builder.fixedInterval(new DateHistogramInterval(intervalString));
// builder.dateHistogramInterval(new DateHistogramInterval(intervalString));
}
} else {
builder.dateHistogramInterval(new DateHistogramInterval(timeGroup.getInterval().toString()));
builder.dateHistogramInterval(new DateHistogramInterval(intervalString));
}
}