iter

Author: martijnvg

modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/timeseries/TimeSeriesAggregationBuilder.java

@@ -80,7 +80,7 @@ protected AggregatorFactory doBuild(
         AggregatorFactory parent,
         AggregatorFactories.Builder subFactoriesBuilder
     ) throws IOException {
-        boolean expectTsidBucketInOrder = parent instanceof DateHistogramAggregatorFactory;
+        boolean expectTsidBucketInOrder = parent == null || parent instanceof DateHistogramAggregatorFactory;
         return new TimeSeriesAggregationFactory(name, keyed, context, parent, subFactoriesBuilder, metadata, expectTsidBucketInOrder);
     }
 

modules/aggregations/src/test/java/org/elasticsearch/aggregations/bucket/timeseries/TimeSeriesAggregatorTests.java

@@ -112,6 +112,11 @@ private void timeSeriesTestCase(
         System.arraycopy(fieldTypes, 0, newFieldTypes, 2, fieldTypes.length);
 
         testCase(buildIndex, verify, new AggTestConfig(builder, newFieldTypes).withQuery(query));
+        // TODO: ensure implementation class differently
+        debugTestCase(builder, query, buildIndex, (internalAggregation, aClass, stringMapMap) -> {
+            assertThat(aClass, equalTo(TimeSeriesInOrderAggregator.class));
+            verify.accept((InternalTimeSeries) internalAggregation);
+        }, fieldTypes);
     }
 
 }