Remove unnecessary code for initial PR

JonasKunz · JonasKunz · commit 1a4c296e5093 · 2025-08-26T15:30:55.000+02:00
diff --git a/libs/exponential-histogram/build.gradle b/libs/exponential-histogram/build.gradle
@@ -12,14 +12,11 @@
 apply plugin: 'elasticsearch.build'
 
 dependencies {
-  implementation project(':libs:x-content')
   api project(':libs:core')
   api project(':libs:x-content')
   api "org.apache.lucene:lucene-core:${versions.lucene}"
 
-  testImplementation(project(":test:framework")) {
-    exclude group: 'org.elasticsearch', module: 'exponential-histogram'
-  }
+  testImplementation(project(":test:framework"))
   testImplementation('ch.obermuhlner:big-math:2.3.2')
   testImplementation('org.apache.commons:commons-math3:3.6.1')
   testImplementation project(':libs:x-content:impl')
diff --git a/libs/exponential-histogram/src/main/java/org/elasticsearch/exponentialhistogram/EmptyExponentialHistogram.java b/libs/exponential-histogram/src/main/java/org/elasticsearch/exponentialhistogram/EmptyExponentialHistogram.java
@@ -52,11 +52,6 @@ public OptionalLong maxBucketIndex() {
         public long valueCount() {
             return 0;
         }
-
-        @Override
-        public int bucketCount() {
-            return 0;
-        }
     }
 
     @Override
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
@@ -114,8 +114,6 @@ interface Buckets {
          */
         long valueCount();
 
-        int bucketCount();
-
     }
 
     static ExponentialHistogram empty() {
diff --git a/libs/exponential-histogram/src/main/java/org/elasticsearch/exponentialhistogram/FixedCapacityExponentialHistogram.java b/libs/exponential-histogram/src/main/java/org/elasticsearch/exponentialhistogram/FixedCapacityExponentialHistogram.java
@@ -242,11 +242,6 @@ public long valueCount() {
             }
             return cachedValueSum;
         }
-
-        @Override
-        public int bucketCount() {
-            return numBuckets;
-        }
     }
 
 }
diff --git a/server/build.gradle b/server/build.gradle
@@ -38,7 +38,6 @@ dependencies {
   api project(":libs:plugin-analysis-api")
   api project(':libs:grok')
   api project(":libs:tdigest")
-  api project(":libs:exponential-histogram")
   implementation project(":libs:simdvec")
   implementation project(":libs:entitlement")
 
diff --git a/server/src/main/java/module-info.java b/server/src/main/java/module-info.java
@@ -30,7 +30,6 @@
     requires org.elasticsearch.plugin.analysis;
     requires org.elasticsearch.grok;
     requires org.elasticsearch.tdigest;
-    requires org.elasticsearch.exponentialhistogram;
     requires org.elasticsearch.simdvec;
     requires org.elasticsearch.entitlement;
 
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/BlockLoader.java b/server/src/main/java/org/elasticsearch/index/mapper/BlockLoader.java
@@ -15,7 +15,6 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.Releasable;
-import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
 import org.elasticsearch.search.fetch.StoredFieldsSpec;
 import org.elasticsearch.search.lookup.Source;
 
@@ -463,8 +462,6 @@ interface BlockFactory {
         SortedSetOrdinalsBuilder sortedSetOrdinalsBuilder(SortedSetDocValues ordinals, int count);
 
         AggregateMetricDoubleBuilder aggregateMetricDoubleBuilder(int count);
-
-        ExponentialHistogramBuilder exponentialHistogramBuilder(int count);
     }
 
     /**
@@ -579,10 +576,4 @@ interface AggregateMetricDoubleBuilder extends Builder {
 
         IntBuilder count();
     }
-
-    interface ExponentialHistogramBuilder extends Builder {
-
-        ExponentialHistogramBuilder append(ExponentialHistogram value);
-
-    }
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/TestBlock.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/TestBlock.java
@@ -13,8 +13,6 @@
 import org.apache.lucene.index.SortedDocValues;
 import org.apache.lucene.index.SortedSetDocValues;
 import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
-import org.elasticsearch.exponentialhistogram.ExponentialHistogramCircuitBreaker;
 import org.hamcrest.Matcher;
 
 import java.io.IOException;
@@ -324,24 +322,6 @@ public SortedSetOrdinalBuilder appendOrd(int value) {
             public BlockLoader.AggregateMetricDoubleBuilder aggregateMetricDoubleBuilder(int expectedSize) {
                 return new AggregateMetricDoubleBlockBuilder(expectedSize);
             }
-
-            @Override
-            public BlockLoader.ExponentialHistogramBuilder exponentialHistogramBuilder(int expectedSize) {
-                class ExponentialHistogramBuilder extends TestBlock.Builder implements BlockLoader.ExponentialHistogramBuilder {
-                    private ExponentialHistogramBuilder() {
-                        super(expectedSize);
-                    }
-
-                    @Override
-                    public BlockLoader.ExponentialHistogramBuilder append(ExponentialHistogram value) {
-                        //TODO: clean up the copying here?
-                        int numBuckets = value.negativeBuckets().bucketCount() + value.positiveBuckets().bucketCount();
-                        add(ExponentialHistogram.merge(numBuckets, ExponentialHistogramCircuitBreaker.noop(), value));
-                        return this;
-                    }
-                }
-                return new ExponentialHistogramBuilder();
-            }
         };
     }
 
diff --git a/x-pack/plugin/esql/build.gradle b/x-pack/plugin/esql/build.gradle
@@ -42,6 +42,7 @@ dependencies {
   implementation project('compute:ann')
   implementation project(':libs:dissect')
   implementation project(':libs:grok')
+  implementation project(':libs:exponential-histogram')
   api "org.apache.lucene:lucene-spatial3d:${versions.lucene}"
   api project(":libs:h3")
   implementation project('arrow')
diff --git a/x-pack/plugin/esql/compute/build.gradle b/x-pack/plugin/esql/compute/build.gradle
@@ -16,6 +16,7 @@ dependencies {
   compileOnly project(xpackModule('ml'))
   annotationProcessor project('gen')
   implementation 'com.carrotsearch:hppc:0.8.1'
+  implementation project(':libs:exponential-histogram')
 
   testImplementation(project(':modules:analysis-common'))
   testImplementation(project(':test:framework'))
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
@@ -24,7 +24,7 @@ public final class ExponentialHistogramArrayBlock extends AbstractNonThreadSafeR
 
     private static final long SHALLOW_SIZE = RamUsageEstimator.shallowSizeOfInstance(ExponentialHistogramArrayBlock.class);
 
-    //TODO: Add AggregateMetricDoubleBlock for min/max/sum/count
+    // TODO: Add AggregateMetricDoubleBlock for min/max/sum/count
     private final BytesRefBlock encodedHistograms;
 
     public ExponentialHistogramArrayBlock(BytesRefBlock encodedHistograms) {
@@ -164,19 +164,15 @@ public long ramBytesUsed() {
         return bytes;
     }
 
-    void copyInto(
-        BytesRefBlock.Builder encodedHistogramsBuilder,
-        int beginInclusive,
-        int endExclusive
-    ) {
+    void copyInto(BytesRefBlock.Builder encodedHistogramsBuilder, int beginInclusive, int endExclusive) {
         encodedHistogramsBuilder.copyFrom(this.encodedHistograms, beginInclusive, endExclusive);
     }
 
     private class BlockBackedHistogram implements ExponentialHistogram {
 
         private static final long SIZE = RamUsageEstimator.shallowSizeOfInstance(BlockBackedHistogram.class);
 
-        //TODO: encode all of the ExponentialHistogram data except for min/max/sum/count
+        // TODO: encode all of the ExponentialHistogram data except for min/max/sum/count
         private static final int SCALE_OFFSET = 0;
 
         private final ByteBuffer data;
@@ -218,19 +214,19 @@ public int scale() {
 
         @Override
         public ZeroBucket zeroBucket() {
-            //TODO: implement
+            // TODO: implement
             return ZeroBucket.minimalEmpty();
         }
 
         @Override
         public ExponentialHistogram.Buckets positiveBuckets() {
-            //TODO: implement
+            // TODO: implement
             return ExponentialHistogram.empty().positiveBuckets();
         }
 
         @Override
         public ExponentialHistogram.Buckets negativeBuckets() {
-            //TODO: implement
+            // TODO: implement
             return ExponentialHistogram.empty().negativeBuckets();
         }
 
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/ExponentialHistogramBlockBuilder.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/ExponentialHistogramBlockBuilder.java
@@ -11,9 +11,8 @@
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.Releasables;
 import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
-import org.elasticsearch.index.mapper.BlockLoader;
 
-public class ExponentialHistogramBlockBuilder implements BlockLoader.ExponentialHistogramBuilder, Block.Builder {
+public class ExponentialHistogramBlockBuilder implements Block.Builder {
 
     private final BytesRefBlock.Builder encodedHistogramsBuilder;
 
@@ -26,7 +25,6 @@ public class ExponentialHistogramBlockBuilder implements BlockLoader.Exponential
         this.tempScratch = new BytesRef(new byte[256], 0, 256);
     }
 
-    @Override
     public ExponentialHistogramBlockBuilder append(@Nullable ExponentialHistogram value) {
         if (value == null) {
             appendNull();
@@ -62,7 +60,7 @@ public ExponentialHistogramBlockBuilder endPositionEntry() {
     @Override
     public Block.Builder copyFrom(Block block, int beginInclusive, int endExclusive) {
         if (block.areAllValuesNull()) {
-            for (int i= beginInclusive; i < endExclusive; i++) {
+            for (int i = beginInclusive; i < endExclusive; i++) {
                 appendNull();
             }
         } else {
@@ -74,7 +72,7 @@ public Block.Builder copyFrom(Block block, int beginInclusive, int endExclusive)
 
     @Override
     public Block.Builder mvOrdering(Block.MvOrdering mvOrdering) {
-        //TODO: does this need implementation?
+        // TODO: does this need implementation?
         return this;
     }
 
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/read/DelegatingBlockLoaderFactory.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/read/DelegatingBlockLoaderFactory.java
@@ -18,7 +18,6 @@
 import org.elasticsearch.compute.data.IntVector;
 import org.elasticsearch.compute.data.OrdinalBytesRefVector;
 import org.elasticsearch.core.Releasables;
-import org.elasticsearch.compute.data.ExponentialHistogramBlockBuilder;
 import org.elasticsearch.index.mapper.BlockLoader;
 
 public abstract class DelegatingBlockLoaderFactory implements BlockLoader.BlockFactory {
@@ -128,9 +127,4 @@ public BlockLoader.SortedSetOrdinalsBuilder sortedSetOrdinalsBuilder(SortedSetDo
     public BlockLoader.AggregateMetricDoubleBuilder aggregateMetricDoubleBuilder(int count) {
         return factory.newAggregateMetricDoubleBlockBuilder(count);
     }
-
-    @Override
-    public ExponentialHistogramBlockBuilder exponentialHistogramBuilder(int count) {
-        return factory.newExponentialHistogramBlockBuilder(count);
-    }
 }
diff --git a/x-pack/plugin/esql/compute/test/src/main/java/org/elasticsearch/compute/test/BlockTestUtils.java b/x-pack/plugin/esql/compute/test/src/main/java/org/elasticsearch/compute/test/BlockTestUtils.java
@@ -63,7 +63,8 @@ public static Object randomValue(ElementType e) {
             case NULL -> null;
             case COMPOSITE -> throw new IllegalArgumentException("can't make random values for composite");
             case AGGREGATE_METRIC_DOUBLE -> throw new IllegalArgumentException("can't make random values for aggregate_metric_double");
-            case EXPONENTIAL_HISTOGRAM -> throw new IllegalArgumentException("can't make random values for exponential_histogram"); //TODO: implement
+            case EXPONENTIAL_HISTOGRAM -> throw new IllegalArgumentException("can't make random values for exponential_histogram"); // TODO:
+                                                                                                                                    // implement
             case UNKNOWN -> throw new IllegalArgumentException("can't make random values for [" + e + "]");
         };
     }
diff --git a/x-pack/plugin/esql/qa/testFixtures/build.gradle b/x-pack/plugin/esql/qa/testFixtures/build.gradle
@@ -9,6 +9,7 @@ dependencies {
   implementation project(':client:rest')
   implementation project(':libs:logging')
   implementation project(':test:framework')
+  implementation project(":libs:exponential-histogram")
   api(testArtifact(project(xpackModule('esql-core'))))
   implementation project(':server')
   implementation "net.sf.supercsv:super-csv:${versions.supercsv}"
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
@@ -44,7 +44,6 @@
 import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.CARTESIAN;
 import static org.elasticsearch.xpack.esql.core.util.SpatialCoordinateTypes.GEO;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.aggregateMetricDoubleLiteralToString;
-import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.exponentialHistogramBlockToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.exponentialHistogramToString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
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
@@ -55,7 +55,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
-import static org.elasticsearch.common.Strings.delimitedListToStringArray;
 import static org.elasticsearch.common.logging.LoggerMessageFormat.format;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.reader;
 import static org.elasticsearch.xpack.esql.SpecReader.shouldSkipLine;
@@ -141,7 +140,7 @@ void append(String stringValue) {
                         return;
                     }
                     stringValue = mvStrings[0];
-                } else if (stringValue.matches(".*"+COMMA_ESCAPING_REGEX+".*")) {// multi-value field
+                } else if (stringValue.matches(".*" + COMMA_ESCAPING_REGEX + ".*")) {// multi-value field
                     builderWrapper().builder().beginPositionEntry();
 
                     String[] arrayOfValues = stringValue.split(COMMA_ESCAPING_REGEX, -1);
@@ -493,10 +492,7 @@ public enum Type {
             AggregateMetricDoubleBlockBuilder.AggregateMetricDoubleLiteral.class
         ),
         DENSE_VECTOR(Float::parseFloat, Float.class, false),
-        EXPONENTIAL_HISTOGRAM(
-            x -> x == null ? null : JsonBackedExponentialHistogram.createFromJson(x),
-            ExponentialHistogram.class
-        ),
+        EXPONENTIAL_HISTOGRAM(x -> x == null ? null : JsonBackedExponentialHistogram.createFromJson(x), ExponentialHistogram.class),
         UNSUPPORTED(Type::convertUnsupported, Void.class);
 
         private static Void convertUnsupported(String s) {
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
@@ -871,10 +871,9 @@ public static Literal randomLiteral(DataType type) {
                 }
             }
             case DENSE_VECTOR -> Arrays.asList(randomArray(10, 10, i -> new Float[10], ESTestCase::randomFloat));
-            //TODO: implement
-            case UNSUPPORTED, EXPONENTIAL_HISTOGRAM, OBJECT, DOC_DATA_TYPE, TSID_DATA_TYPE, PARTIAL_AGG -> throw new IllegalArgumentException(
-                "can't make random values for [" + type.typeName() + "]"
-            );
+            // TODO: implement
+            case UNSUPPORTED, EXPONENTIAL_HISTOGRAM, OBJECT, DOC_DATA_TYPE, TSID_DATA_TYPE, PARTIAL_AGG ->
+                throw new IllegalArgumentException("can't make random values for [" + type.typeName() + "]");
         }, type);
     }
 
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
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/PositionToXContent.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/PositionToXContent.java
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/nulls/Coalesce.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/nulls/Coalesce.java
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/AggregateMapper.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/AggregateMapper.java
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
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java
diff --git a/x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/CompressedExponentialHistogram.java b/x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/CompressedExponentialHistogram.java
diff --git a/x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/ExponentialHistogramFieldMapper.java b/x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/ExponentialHistogramFieldMapper.java

Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,6 @@ public OptionalLong maxBucketIndex() {`
`52`	`52`	`public long valueCount() {`
`53`	`53`	`return 0;`
`54`	`54`	`}`
`55`		`-`
`56`		`- @Override`
`57`		`- public int bucketCount() {`
`58`		`- return 0;`
`59`		`- }`
`60`	`55`	`}`
`61`	`56`
`62`	`57`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,6 @@ interface Buckets {`
`114`	`114`	`*/`
`115`	`115`	`long valueCount();`
`116`	`116`
`117`		`- int bucketCount();`
`118`		`-`
`119`	`117`	`}`
`120`	`118`
`121`	`119`	`static ExponentialHistogram empty() {`
Original file line number	Diff line number	Diff line change
`@@ -242,11 +242,6 @@ public long valueCount() {`
`242`	`242`	`}`
`243`	`243`	`return cachedValueSum;`
`244`	`244`	`}`
`245`		`-`
`246`		`- @Override`
`247`		`- public int bucketCount() {`
`248`		`- return numBuckets;`
`249`		`- }`
`250`	`245`	`}`
`251`	`246`
`252`	`247`	`}`