Fix #545 combined datehistogram interval is deprecated

gisaia · Sep 6, 2021 · 637bb30 · 637bb30
1 parent e2c10c1
commit 637bb30
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/arlas-core/src/main/java/io/arlas/server/core/impl/elastic/services/ElasticFluidSearch.java b/arlas-core/src/main/java/io/arlas/server/core/impl/elastic/services/ElasticFluidSearch.java
@@ -564,7 +564,11 @@ private DateHistogramAggregationBuilder buildDateHistogramAggregation(Aggregatio
             default:
                 throw new InvalidParameterException(INVALID_DATE_UNIT);
         }
-        dateHistogramAggregationBuilder = dateHistogramAggregationBuilder.dateHistogramInterval(intervalUnit);
+        if ((Integer)aggregationModel.interval.value > 1) {
+            dateHistogramAggregationBuilder = dateHistogramAggregationBuilder.fixedInterval(intervalUnit);
+        } else {
+            dateHistogramAggregationBuilder = dateHistogramAggregationBuilder.calendarInterval(intervalUnit);
+        }
         //get the field, format, collect_field, collect_fct, order, on
         dateHistogramAggregationBuilder = (DateHistogramAggregationBuilder) setAggregationParameters(aggregationModel, dateHistogramAggregationBuilder);
         dateHistogramAggregationBuilder = (DateHistogramAggregationBuilder) setHitsToFetch(aggregationModel, dateHistogramAggregationBuilder);