spotless

JonasKunz · JonasKunz · commit b991e5b2a82a · 2025-09-03T12:00:32.000+02:00
diff --git a/libs/exponential-histogram/src/main/java/module-info.java b/libs/exponential-histogram/src/main/java/module-info.java
@@ -21,5 +21,6 @@
     requires org.elasticsearch.xcontent;
     requires org.apache.lucene.core;
     requires org.elasticsearch.base;
+
     exports org.elasticsearch.exponentialhistogram;
 }
diff --git a/libs/exponential-histogram/src/main/java/org/elasticsearch/exponentialhistogram/ExponentialHistogram.java b/libs/exponential-histogram/src/main/java/org/elasticsearch/exponentialhistogram/ExponentialHistogram.java
@@ -201,6 +201,7 @@ static int hashCode(ExponentialHistogram histogram) {
         // the value count is typically available as a cached value and doesn't involve iterating over all buckets
         return hash;
     }
+
     /**
      * Default toString implementation for exponential histograms.
      * @param histogram the histogram to convert to string
@@ -232,7 +233,7 @@ static String toString(ExponentialHistogram histogram) {
             sb.append("]");
         }
         sb.append("}");
-        return  sb.toString();
+        return sb.toString();
     }
 
     private static void appendsBucketsAsString(StringBuilder out, BucketIterator it) {
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/BlockUtils.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/BlockUtils.java
@@ -249,7 +249,7 @@ private static Block constantBlock(BlockFactory blockFactory, ElementType type,
             case BOOLEAN -> blockFactory.newConstantBooleanBlockWith((boolean) val, size);
             case AGGREGATE_METRIC_DOUBLE -> blockFactory.newConstantAggregateMetricDoubleBlock((AggregateMetricDoubleLiteral) val, size);
             case FLOAT -> blockFactory.newConstantFloatBlockWith((float) val, size);
-            case EXPONENTIAL_HISTOGRAM ->  blockFactory.newConstantExponentialHistogramBlock((ExponentialHistogram) val, size);
+            case EXPONENTIAL_HISTOGRAM -> blockFactory.newConstantExponentialHistogramBlock((ExponentialHistogram) val, size);
             default -> throw new UnsupportedOperationException("unsupported element type [" + type + "]");
         };
     }
@@ -303,7 +303,8 @@ yield new AggregateMetricDoubleLiteral(
                     aggBlock.countBlock().getInt(offset)
                 );
             }
-            case EXPONENTIAL_HISTOGRAM -> ExponentialHistogram.merge( //TODO: do a cleaner copy with builder here
+            case EXPONENTIAL_HISTOGRAM -> ExponentialHistogram.merge(
+                // TODO: do a cleaner copy with builder here
                 100,
                 ExponentialHistogramCircuitBreaker.noop(),
                 ((ExponentialHistogramArrayBlock) block).getExponentialHistogram(offset)
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/ExponentialHistogramArrayBlock.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/ExponentialHistogramArrayBlock.java
@@ -8,7 +8,6 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.RamUsageEstimator;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.core.ReleasableIterator;
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockBuilderCopyFromTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockBuilderCopyFromTests.java
@@ -27,7 +27,11 @@ public class BlockBuilderCopyFromTests extends ESTestCase {
     public static List<Object[]> params() {
         List<Object[]> params = new ArrayList<>();
         for (ElementType e : ElementType.values()) {
-            if (e == ElementType.UNKNOWN || e == ElementType.NULL || e == ElementType.DOC || e == ElementType.COMPOSITE || e == ElementType.EXPONENTIAL_HISTOGRAM) {
+            if (e == ElementType.UNKNOWN
+                || e == ElementType.NULL
+                || e == ElementType.DOC
+                || e == ElementType.COMPOSITE
+                || e == ElementType.EXPONENTIAL_HISTOGRAM) {
                 continue;
             }
             for (boolean nullAllowed : new boolean[] { false, true }) {
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockBuilderTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockBuilderTests.java
@@ -184,7 +184,7 @@ public void testCrankyConstantBlock() {
                     builder.copyFrom(random.block(), 0, random.block().getPositionCount());
                     try (Block built = builder.build()) {
                         Vector vector = built.asVector();
-                        if (vector != null) { //some types don't support vectors, e.g. AggregateMetricDouble and ExponentialHistogram
+                        if (vector != null) { // some types don't support vectors, e.g. AggregateMetricDouble and ExponentialHistogram
                             assertThat(vector.isConstant(), is(true));
                         }
                         assertThat(built, equalTo(random.block()));
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/CompositeBlockTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/CompositeBlockTests.java
@@ -21,7 +21,11 @@ public class CompositeBlockTests extends ComputeTestCase {
 
     static List<ElementType> supportedSubElementTypes = Arrays.stream(ElementType.values())
         .filter(
-            e -> e != ElementType.COMPOSITE && e != ElementType.UNKNOWN && e != ElementType.DOC && e != ElementType.AGGREGATE_METRIC_DOUBLE&& e != ElementType.EXPONENTIAL_HISTOGRAM
+            e -> e != ElementType.COMPOSITE
+                && e != ElementType.UNKNOWN
+                && e != ElementType.DOC
+                && e != ElementType.AGGREGATE_METRIC_DOUBLE
+                && e != ElementType.EXPONENTIAL_HISTOGRAM
         )
         .toList();
 
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/topn/TopNOperatorTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/topn/TopNOperatorTests.java
@@ -1025,7 +1025,11 @@ public void testRandomMultiValuesTopN() {
 
         for (int type = 0; type < blocksCount; type++) {
             ElementType e = randomValueOtherThanMany(
-                t -> t == ElementType.UNKNOWN || t == ElementType.DOC || t == COMPOSITE || t == AGGREGATE_METRIC_DOUBLE || t == EXPONENTIAL_HISTOGRAM,
+                t -> t == ElementType.UNKNOWN
+                    || t == ElementType.DOC
+                    || t == COMPOSITE
+                    || t == AGGREGATE_METRIC_DOUBLE
+                    || t == EXPONENTIAL_HISTOGRAM,
                 () -> randomFrom(ElementType.values())
             );
             elementTypes.add(e);
diff --git a/x-pack/plugin/esql/compute/test/src/main/java/org/elasticsearch/compute/test/RandomBlock.java b/x-pack/plugin/esql/compute/test/src/main/java/org/elasticsearch/compute/test/RandomBlock.java
@@ -20,7 +20,6 @@
 import org.elasticsearch.compute.data.IntBlock;
 import org.elasticsearch.compute.data.LongBlock;
 import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
-import org.elasticsearch.exponentialhistogram.ExponentialHistogramCircuitBreaker;
 import org.elasticsearch.geo.GeometryTestUtils;
 import org.elasticsearch.geo.ShapeTestUtils;
 import org.elasticsearch.geometry.Point;
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvAssert.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvAssert.java
@@ -12,9 +12,9 @@
 import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.compute.data.AggregateMetricDoubleBlockBuilder;
 import org.elasticsearch.compute.data.Page;
+import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
 import org.elasticsearch.geometry.utils.Geohash;
 import org.elasticsearch.h3.H3;
-import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
 import org.elasticsearch.logging.Logger;
 import org.elasticsearch.search.DocValueFormat;
 import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileUtils;
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestUtils.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestUtils.java
@@ -27,9 +27,9 @@
 import org.elasticsearch.core.Releasables;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.core.Tuple;
+import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
 import org.elasticsearch.geometry.utils.Geohash;
 import org.elasticsearch.h3.H3;
-import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
 import org.elasticsearch.logging.Logger;
 import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileUtils;
 import org.elasticsearch.test.VersionUtils;
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java
@@ -37,11 +37,7 @@
 import org.elasticsearch.core.PathUtils;
 import org.elasticsearch.core.SuppressForbidden;
 import org.elasticsearch.core.Tuple;
-import org.elasticsearch.exponentialhistogram.AbstractExponentialHistogram;
 import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
-import org.elasticsearch.exponentialhistogram.ExponentialHistogramCircuitBreaker;
-import org.elasticsearch.exponentialhistogram.ReleasableExponentialHistogram;
-import org.elasticsearch.exponentialhistogram.ZeroBucket;
 import org.elasticsearch.geo.GeometryTestUtils;
 import org.elasticsearch.geo.ShapeTestUtils;
 import org.elasticsearch.geometry.utils.Geohash;
@@ -138,7 +134,6 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.jar.JarInputStream;
-import java.util.stream.DoubleStream;
 import java.util.zip.ZipEntry;
 
 import static java.util.Collections.emptyList;
@@ -151,7 +146,6 @@
 import static org.elasticsearch.test.ESTestCase.randomBoolean;
 import static org.elasticsearch.test.ESTestCase.randomByte;
 import static org.elasticsearch.test.ESTestCase.randomDouble;
-import static org.elasticsearch.test.ESTestCase.randomDoubles;
 import static org.elasticsearch.test.ESTestCase.randomFloat;
 import static org.elasticsearch.test.ESTestCase.randomFrom;
 import static org.elasticsearch.test.ESTestCase.randomInt;
@@ -902,7 +896,7 @@ public static Literal randomLiteral(DataType type) {
     }
 
     private static ExponentialHistogram randomExponentialHistogram() {
-        //TODO: implement properly with an actual histogram from random data
+        // TODO: implement properly with an actual histogram from random data
         return ExponentialHistogram.empty();
     }
 
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/JsonBackedExponentialHistogram.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/JsonBackedExponentialHistogram.java
@@ -88,19 +88,19 @@ public double max() {
 
     @Override
     public ZeroBucket zeroBucket() {
-        //TODO: implement
+        // TODO: implement
         return ZeroBucket.minimalEmpty();
     }
 
     @Override
     public Buckets positiveBuckets() {
-        //TODO: implement
+        // TODO: implement
         return ExponentialHistogram.empty().positiveBuckets();
     }
 
     @Override
     public Buckets negativeBuckets() {
-        //TODO: implement
+        // TODO: implement
         return ExponentialHistogram.empty().negativeBuckets();
     }
 
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/WriteableExponentialHistogram.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/WriteableExponentialHistogram.java
@@ -20,7 +20,6 @@
 import org.elasticsearch.exponentialhistogram.ZeroBucket;
 
 import java.io.IOException;
-;
 
 /**
  * A wrapper around ExponentialHistogram to make it writeable to @link StreamOutput},
@@ -106,7 +105,7 @@ public TransportVersion getMinimalSupportedVersion() {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeByte((byte)scale());
+        out.writeByte((byte) scale());
         out.writeDouble(sum());
         out.writeDouble(min());
         out.writeDouble(max());
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/ResponseValueUtils.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/ResponseValueUtils.java
@@ -35,8 +35,8 @@
 import static org.elasticsearch.xpack.esql.core.util.NumericUtils.unsignedLongAsNumber;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.aggregateMetricDoubleBlockToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.dateTimeToString;
-import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.geoGridToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.exponentialHistogramBlockToString;
+import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.geoGridToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.ipToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.nanoTimeToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.spatialToString;
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java
@@ -500,7 +500,8 @@ private PhysicalOperation planTopN(TopNExec topNExec, LocalExecutionPlannerConte
                 case BOOLEAN, NULL, BYTE, SHORT, INTEGER, LONG, DOUBLE, FLOAT, HALF_FLOAT, DATETIME, DATE_NANOS, DATE_PERIOD, TIME_DURATION,
                     OBJECT, SCALED_FLOAT, UNSIGNED_LONG, DOC_DATA_TYPE, TSID_DATA_TYPE -> TopNEncoder.DEFAULT_SORTABLE;
                 case GEO_POINT, CARTESIAN_POINT, GEO_SHAPE, CARTESIAN_SHAPE, COUNTER_LONG, COUNTER_INTEGER, COUNTER_DOUBLE, SOURCE,
-                    AGGREGATE_METRIC_DOUBLE, DENSE_VECTOR, GEOHASH, GEOTILE, GEOHEX, EXPONENTIAL_HISTOGRAM -> TopNEncoder.DEFAULT_UNSORTABLE;
+                    AGGREGATE_METRIC_DOUBLE, DENSE_VECTOR, GEOHASH, GEOTILE, GEOHEX, EXPONENTIAL_HISTOGRAM ->
+                    TopNEncoder.DEFAULT_UNSORTABLE;
                 // unsupported fields are encoded as BytesRef, we'll use the same encoder; all values should be null at this point
                 case PARTIAL_AGG, UNSUPPORTED -> TopNEncoder.UNSUPPORTED;
             };
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeConverter.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeConverter.java
@@ -23,10 +23,10 @@
 import org.elasticsearch.compute.data.ExponentialHistogramBlock;
 import org.elasticsearch.compute.data.IntBlock;
 import org.elasticsearch.core.Booleans;
-import org.elasticsearch.geometry.utils.Geohash;
-import org.elasticsearch.h3.H3;
 import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
 import org.elasticsearch.exponentialhistogram.ExponentialHistogramXContent;
+import org.elasticsearch.geometry.utils.Geohash;
+import org.elasticsearch.h3.H3;
 import org.elasticsearch.search.DocValueFormat;
 import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileUtils;
 import org.elasticsearch.xcontent.XContentBuilder;
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java
@@ -65,7 +65,7 @@ public class CaseTests extends AbstractScalarFunctionTestCase {
             t.addAll(
                 DataType.UNDER_CONSTRUCTION.keySet()
                     .stream()
-                    .filter(type -> type != DataType.EXPONENTIAL_HISTOGRAM) //TODO: implement
+                    .filter(type -> type != DataType.EXPONENTIAL_HISTOGRAM) // TODO: implement
                     .filter(type -> type != DataType.AGGREGATE_METRIC_DOUBLE && type != DataType.DENSE_VECTOR)
                     .toList()
             );

Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,6 @@`
`21`	`21`	`requires org.elasticsearch.xcontent;`
`22`	`22`	`requires org.apache.lucene.core;`
`23`	`23`	`requires org.elasticsearch.base;`
	`24`	`+`
`24`	`25`	`exports org.elasticsearch.exponentialhistogram;`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,7 @@ static int hashCode(ExponentialHistogram histogram) {`
`201`	`201`	`// the value count is typically available as a cached value and doesn't involve iterating over all buckets`
`202`	`202`	`return hash;`
`203`	`203`	`}`
	`204`	`+`
`204`	`205`	`/**`
`205`	`206`	`* Default toString implementation for exponential histograms.`
`206`	`207`	`* @param histogram the histogram to convert to string`
`@@ -232,7 +233,7 @@ static String toString(ExponentialHistogram histogram) {`
`232`	`233`	`sb.append("]");`
`233`	`234`	`}`
`234`	`235`	`sb.append("}");`
`235`		`- return sb.toString();`
	`236`	`+ return sb.toString();`
`236`	`237`	`}`
`237`	`238`
`238`	`239`	`private static void appendsBucketsAsString(StringBuilder out, BucketIterator it) {`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public void testCrankyConstantBlock() {`
`184`	`184`	`builder.copyFrom(random.block(), 0, random.block().getPositionCount());`
`185`	`185`	`try (Block built = builder.build()) {`
`186`	`186`	`Vector vector = built.asVector();`
`187`		`- if (vector != null) { //some types don't support vectors, e.g. AggregateMetricDouble and ExponentialHistogram`
	`187`	`+ if (vector != null) { // some types don't support vectors, e.g. AggregateMetricDouble and ExponentialHistogram`
`188`	`188`	`assertThat(vector.isConstant(), is(true));`
`189`	`189`	`}`
`190`	`190`	`assertThat(built, equalTo(random.block()));`