Merge remote-tracking branch 'romseygeek/benchmark/main-enabled-skippers' into benchmark/main-enabled-skippers

romseygeek · romseygeek · commit 6c05d0fe91c0 · 2025-10-09T11:58:51.000+01:00
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceType.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceType.java
@@ -317,8 +317,10 @@ public Function<Rounding, Rounding.Prepared> roundingPreparer(AggregationContext
                         }
                     } else if (dft.hasDocValuesSkipper()) {
                         log.trace("Attempting to apply skipper-based data rounding");
-                        range[0] = dft.resolution().roundDownToMillis(DocValuesSkipper.globalMinValue(context.searcher(), fieldContext.field()));
-                        range[1] = dft.resolution().roundDownToMillis(DocValuesSkipper.globalMaxValue(context.searcher(), fieldContext.field()));
+                        range[0] = dft.resolution()
+                            .roundDownToMillis(DocValuesSkipper.globalMinValue(context.searcher(), fieldContext.field()));
+                        range[1] = dft.resolution()
+                            .roundDownToMillis(DocValuesSkipper.globalMaxValue(context.searcher(), fieldContext.field()));
                     }
                     log.trace("Bounds after index bound date rounding: {}, {}", range[0], range[1]);
 
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java
@@ -429,7 +429,7 @@ public Function<byte[], Number> getPointReaderOrNull() {
      * is searchable and there aren't missing values or a script to confuse
      * the ordering.
      */
-     public boolean alignsWithSearchIndex() {
+    public boolean alignsWithSearchIndex() {
         boolean hasDocValuesSkipper = fieldType() instanceof DateFieldMapper.DateFieldType dft && dft.hasDocValuesSkipper();
         return script() == null
             && missing() == null

Original file line number	Diff line number	Diff line change
`@@ -317,8 +317,10 @@ public Function<Rounding, Rounding.Prepared> roundingPreparer(AggregationContext`
`317`	`317`	`}`
`318`	`318`	`} else if (dft.hasDocValuesSkipper()) {`
`319`	`319`	`log.trace("Attempting to apply skipper-based data rounding");`
`320`		`- range[0] = dft.resolution().roundDownToMillis(DocValuesSkipper.globalMinValue(context.searcher(), fieldContext.field()));`
`321`		`- range[1] = dft.resolution().roundDownToMillis(DocValuesSkipper.globalMaxValue(context.searcher(), fieldContext.field()));`
	`320`	`+ range[0] = dft.resolution()`
	`321`	`+ .roundDownToMillis(DocValuesSkipper.globalMinValue(context.searcher(), fieldContext.field()));`
	`322`	`+ range[1] = dft.resolution()`
	`323`	`+ .roundDownToMillis(DocValuesSkipper.globalMaxValue(context.searcher(), fieldContext.field()));`
`322`	`324`	`}`
`323`	`325`	`log.trace("Bounds after index bound date rounding: {}, {}", range[0], range[1]);`
`324`	`326`