Add scale to aggregation content, fix :run

axw · Dec 20, 2023 · 80732a7 · 80732a7
1 parent 171598e
commit 80732a7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/x-pack/plugin/mapper-exponential-histogram/build.gradle b/x-pack/plugin/mapper-exponential-histogram/build.gradle
@@ -11,14 +11,12 @@ esplugin {
   name 'exponential-histogram'
   description 'Module for the exponential-histogram field type.'
   classname 'org.elasticsearch.xpack.exponentialhistogram.ExponentialHistogramMapperPlugin'
-  extendedPlugins = ['x-pack-core', 'analytics']
+  extendedPlugins = ['x-pack-core']
 }
 base {
   archivesName = 'x-pack-exponential-histogram'
 }
 
 dependencies {
   compileOnly project(path: xpackModule('core'))
-  compileOnly project(path: xpackModule('analytics'))
-  //testImplementation project(path: ':x-pack:plugin:analytics')
 }
diff --git a/...g/elasticsearch/xpack/exponentialhistogram/agg/ExponentialHistogramAggregatorFactory.java b/...g/elasticsearch/xpack/exponentialhistogram/agg/ExponentialHistogramAggregatorFactory.java
@@ -19,7 +19,6 @@
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
 import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
-import org.elasticsearch.xpack.analytics.aggregations.support.AnalyticsValuesSourceType;
 import org.elasticsearch.xpack.exponentialhistogram.ExponentialHistogramValuesSourceType;
 
 import java.io.IOException;

diff --git a/...n/java/org/elasticsearch/xpack/exponentialhistogram/agg/InternalExponentialHistogram.java b/...n/java/org/elasticsearch/xpack/exponentialhistogram/agg/InternalExponentialHistogram.java
@@ -222,6 +222,7 @@ public Object getProperty(List<String> path) {
 
     @Override
     public XContentBuilder doXContentBody(XContentBuilder builder, Params params) throws IOException {
+        builder.field("scale", getCurrentScale());
         builder.startArray(CommonFields.BUCKETS.getPreferredName());
         for (Bucket bucket : getBuckets()) {
             builder.startObject()