Merge pull request #29 from opendatasoft/bug/sc-41672/v1-facets-endpoint-is-sometimes-very-slow

Store Rounding.Prepared instead of recomputing it for each value

Author: Hugo Mercier

src/main/java/org/opendatasoft/elasticsearch/search/aggregations/bucket/DateHierarchyAggregationBuilder.java

@@ -75,15 +75,28 @@ public IntervalConfig(Rounding.DateTimeUnit dateTimeUnit, String format) {
         }
     }
 
-    public List<RoundingInfo> buildRoundings() {
-        List<RoundingInfo> roundings = new ArrayList<>();
+    public static class PreparedRounding {
+        final RoundingInfo roundingInfo;
+        final Rounding.Prepared prepared;
+
+        public PreparedRounding(RoundingInfo roundingInfo, Rounding.Prepared prepared) {
+            this.roundingInfo = roundingInfo;
+            this.prepared = prepared;
+        }
+    }
+
+    public List<PreparedRounding> buildRoundings() {
+        List<PreparedRounding> roundings = new ArrayList<>();
 
         ZoneId timeZone = timeZone() == null ? ZoneOffset.UTC: timeZone();
 
-        for (String interval: INTERVAL_CONFIG.keySet()) {
-            roundings.add(new RoundingInfo(interval, createRounding(INTERVAL_CONFIG.get(interval).dateTimeUnit),
+        long now = System.currentTimeMillis();
+        for (String interval : INTERVAL_CONFIG.keySet()) {
+            RoundingInfo ri = new RoundingInfo(interval, createRounding(INTERVAL_CONFIG.get(interval).dateTimeUnit),
                     new DocValueFormat.DateTime(DateFormatter.forPattern(INTERVAL_CONFIG.get(interval).format), timeZone,
-                            DateFieldMapper.Resolution.MILLISECONDS)));
+                            DateFieldMapper.Resolution.MILLISECONDS));
+            roundings.add(new PreparedRounding(ri, ri.rounding.prepareForUnknown()));
+
             if (interval.equals(interval())) {
                 break;
             }
@@ -344,13 +357,13 @@ protected ValuesSourceAggregatorFactory innerBuild(AggregationContext context,
                                                        Builder subFactoriesBuilder) throws IOException {
 
 
-        final List<RoundingInfo> roundingsInfo = buildRoundings();
+        final List<PreparedRounding> preparedRoundings = buildRoundings();
 
         return new DateHierarchyAggregatorFactory(
                 name,
                 config,
                 order,
-                roundingsInfo,
+                preparedRoundings,
                 minDocCount,
                 bucketCountThresholds,
                 context,

src/main/java/org/opendatasoft/elasticsearch/search/aggregations/bucket/DateHierarchyAggregator.java

@@ -4,6 +4,7 @@
 import org.apache.lucene.index.SortedNumericDocValues;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.common.Rounding;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
@@ -40,14 +41,14 @@ public DateHierarchyAggregator(String name,
                                    BucketOrder order,
                                    long minDocCount,
                                    BucketCountThresholds bucketCountThresholds,
-                                   List<DateHierarchyAggregationBuilder.RoundingInfo> roundingsInfo,
+                                   List<DateHierarchyAggregationBuilder.PreparedRounding> preparedRoundings,
                                    Aggregator parent,
                                    CardinalityUpperBound cardinalityUpperBound,
                                    Map<String,  Object> metadata
     ) throws IOException {
         super(name, factories, context, parent, cardinalityUpperBound, metadata);
         this.valuesSource = valuesSource;
-        this.roundingsInfo = roundingsInfo;
+        this.preparedRoundings = preparedRoundings;
         this.minDocCount = minDocCount;
         bucketOrds =  new BytesRefHash(1, context.bigArrays());
         this.bucketCountThresholds = bucketCountThresholds;
@@ -143,7 +144,7 @@ public boolean equals(Object obj) {
     private final BucketOrder order;
     private final long minDocCount;
     private final BucketCountThresholds bucketCountThresholds;
-    private final List<DateHierarchyAggregationBuilder.RoundingInfo> roundingsInfo;
+    private final List<DateHierarchyAggregationBuilder.PreparedRounding> preparedRoundings;
     protected final Comparator<InternalPathHierarchy.InternalBucket> partiallyBuiltBucketComparator;
 
     /**
@@ -158,6 +159,7 @@ public LeafBucketCollector getLeafCollector(LeafReaderContext ctx, LeafBucketCol
             return LeafBucketCollector.NO_OP_COLLECTOR;
         }
         final SortedNumericDocValues values = valuesSource.longValues(ctx);
+
         return new LeafBucketCollectorBase(sub, values) {
 
             @Override
@@ -169,11 +171,9 @@ public void collect(int doc, long bucket) throws IOException {
                     for (int i = 0; i < valuesCount; ++i) {
                         long value = values.nextValue();
                         String path = "";
-                        for (DateHierarchyAggregationBuilder.RoundingInfo roundingInfo: roundingsInfo) {
-                            // A little hacky: Add a microsecond to avoid collision between min dates interval
-                            // Since interval cannot be set to microsecond, it is not a problem
-                            long roundedValue = roundingInfo.rounding.round(value);
-                            path += roundingInfo.format.format(roundedValue).toString();
+                        for (DateHierarchyAggregationBuilder.PreparedRounding preparedRounding: preparedRoundings) {
+                            long roundedValue = preparedRounding.prepared.round(value);
+                            path += preparedRounding.roundingInfo.format.format(roundedValue).toString();
                             long bucketOrd = bucketOrds.add(new BytesRef(path));
                             if (bucketOrd < 0) { // already seen
                                 bucketOrd = -1 - bucketOrd;

src/main/java/org/opendatasoft/elasticsearch/search/aggregations/bucket/DateHierarchyAggregatorFactory.java

@@ -30,13 +30,13 @@ class DateHierarchyAggregatorFactory extends ValuesSourceAggregatorFactory {
 
     private long minDocCount;
     private BucketOrder order;
-    private List<DateHierarchyAggregationBuilder.RoundingInfo> roundingsInfo;
+    private List<DateHierarchyAggregationBuilder.PreparedRounding> preparedRoundings;
     private final DateHierarchyAggregator.BucketCountThresholds bucketCountThresholds;
 
     DateHierarchyAggregatorFactory(String name,
                                    ValuesSourceConfig config,
                                    BucketOrder order,
-                                   List<DateHierarchyAggregationBuilder.RoundingInfo> roundingsInfo,
+                                   List<DateHierarchyAggregationBuilder.PreparedRounding> preparedRoundings,
                                    long minDocCount,
                                    DateHierarchyAggregator.BucketCountThresholds bucketCountThresholds,
                                    AggregationContext context,
@@ -46,7 +46,7 @@ class DateHierarchyAggregatorFactory extends ValuesSourceAggregatorFactory {
     ) throws IOException {
         super(name, config, context, parent, subFactoriesBuilder, metadata);
         this.order = order;
-        this.roundingsInfo = roundingsInfo;
+        this.preparedRoundings = preparedRoundings;
         this.minDocCount = minDocCount;
         this.bucketCountThresholds = bucketCountThresholds;
     }
@@ -99,7 +99,7 @@ protected Aggregator doCreateInternal(Aggregator parent, CardinalityUpperBound c
         bucketCountThresholds.ensureValidity();
         return new DateHierarchyAggregator(
                 name, factories, context, (ValuesSource.Numeric) config.getValuesSource(),
-                order, minDocCount, bucketCountThresholds, roundingsInfo, parent, cardinality, metadata);
+                order, minDocCount, bucketCountThresholds, preparedRoundings, parent, cardinality, metadata);
     }
 }