[ES|QL] Render aggregate_metric_double

Author: limotova

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/CompositeBlock.java

@@ -96,7 +96,11 @@ public int getFirstValueIndex(int position) {
 
  @Override
  public int getValueCount(int position) {
- return blocks[0].getValueCount(position);
+ int max = 0;
+ for (var block : blocks) {
+ max = Math.max(max, block.getValueCount(position));
+ }
+ return max;
  }
 
  @Override

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

@@ -819,7 +819,12 @@ public enum Cap {
  * Fixes a series of issues with inlinestats which had an incomplete implementation after lookup and inlinestats
  * were refactored.
  */
- INLINESTATS_V3(EsqlPlugin.INLINESTATS_FEATURE_FLAG);
+ INLINESTATS_V3(EsqlPlugin.INLINESTATS_FEATURE_FLAG),
+
+ /**
+ * Support for rendering aggregate_metric_double type
+ */
+ AGGREGATE_METRIC_DOUBLE_RENDERING(AGGREGATE_METRIC_DOUBLE_FEATURE_FLAG);
 
  private final boolean enabled;
 

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/PositionToXContent.java

@@ -10,9 +10,11 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.compute.data.AggregateMetricDoubleBlockBuilder;
 import org.elasticsearch.compute.data.Block;
 import org.elasticsearch.compute.data.BooleanBlock;
 import org.elasticsearch.compute.data.BytesRefBlock;
+import org.elasticsearch.compute.data.CompositeBlock;
 import org.elasticsearch.compute.data.DoubleBlock;
 import org.elasticsearch.compute.data.IntBlock;
 import org.elasticsearch.compute.data.LongBlock;
@@ -25,6 +27,7 @@
 import java.io.IOException;
 
 import static org.elasticsearch.xpack.esql.core.util.NumericUtils.unsignedLongAsNumber;
+import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.aggregateMetricDoubleToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.dateTimeToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.ipToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.nanoTimeToString;
@@ -148,8 +151,23 @@ protected XContentBuilder valueToXContent(XContentBuilder builder, ToXContent.Pa
  return builder.value(versionToString(val));
  }
  };
- // TODO: Add implementation for aggregate_metric_double
- case NULL, AGGREGATE_METRIC_DOUBLE -> new PositionToXContent(block) {
+ case AGGREGATE_METRIC_DOUBLE -> new PositionToXContent(block) {
+ @Override
+ protected XContentBuilder valueToXContent(XContentBuilder builder, ToXContent.Params params, int valueIndex)
+ throws IOException {
+ CompositeBlock compositeBlock = (CompositeBlock) block;
+ var minBlock = compositeBlock.getBlock(AggregateMetricDoubleBlockBuilder.Metric.MIN.getIndex());
+ var maxBlock = compositeBlock.getBlock(AggregateMetricDoubleBlockBuilder.Metric.MAX.getIndex());
+ var sumBlock = compositeBlock.getBlock(AggregateMetricDoubleBlockBuilder.Metric.SUM.getIndex());
+ var countBlock = compositeBlock.getBlock(AggregateMetricDoubleBlockBuilder.Metric.COUNT.getIndex());
+ Double minVal = minBlock.isNull(valueIndex) ? null : ((DoubleBlock) minBlock).getDouble(valueIndex);
+ Double maxVal = maxBlock.isNull(valueIndex) ? null : ((DoubleBlock) maxBlock).getDouble(valueIndex);
+ Double sumVal = sumBlock.isNull(valueIndex) ? null : ((DoubleBlock) sumBlock).getDouble(valueIndex);
+ Integer countVal = countBlock.isNull(valueIndex) ? null : ((IntBlock) countBlock).getInt(valueIndex);
+ return builder.value(aggregateMetricDoubleToString(maxVal, minVal, sumVal, countVal));
+ }
+ };
+ case NULL -> new PositionToXContent(block) {
  @Override
  protected XContentBuilder valueToXContent(XContentBuilder builder, ToXContent.Params params, int valueIndex)
  throws IOException {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/ResponseValueUtils.java

@@ -11,9 +11,11 @@
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.collect.Iterators;
 import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.compute.data.AggregateMetricDoubleBlockBuilder;
 import org.elasticsearch.compute.data.Block;
 import org.elasticsearch.compute.data.BooleanBlock;
 import org.elasticsearch.compute.data.BytesRefBlock;
+import org.elasticsearch.compute.data.CompositeBlock;
 import org.elasticsearch.compute.data.DoubleBlock;
 import org.elasticsearch.compute.data.IntBlock;
 import org.elasticsearch.compute.data.LongBlock;
@@ -30,6 +32,7 @@
 import java.util.List;
 
 import static org.elasticsearch.xpack.esql.core.util.NumericUtils.unsignedLongAsNumber;
+import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.aggregateMetricDoubleToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.dateTimeToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.ipToString;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.nanoTimeToString;
@@ -132,7 +135,19 @@ private static Object valueAt(DataType dataType, Block block, int offset, BytesR
  case GEO_POINT, GEO_SHAPE, CARTESIAN_POINT, CARTESIAN_SHAPE -> spatialToString(
  ((BytesRefBlock) block).getBytesRef(offset, scratch)
  );
- case UNSUPPORTED, AGGREGATE_METRIC_DOUBLE -> (String) null;
+ case AGGREGATE_METRIC_DOUBLE -> {
+ CompositeBlock compositeBlock = (CompositeBlock) block;
+ var minBlock = compositeBlock.getBlock(AggregateMetricDoubleBlockBuilder.Metric.MIN.getIndex());
+ var maxBlock = compositeBlock.getBlock(AggregateMetricDoubleBlockBuilder.Metric.MAX.getIndex());
+ var sumBlock = compositeBlock.getBlock(AggregateMetricDoubleBlockBuilder.Metric.SUM.getIndex());
+ var countBlock = compositeBlock.getBlock(AggregateMetricDoubleBlockBuilder.Metric.COUNT.getIndex());
+ Double minVal = minBlock.isNull(offset) ? null : ((DoubleBlock) minBlock).getDouble(offset);
+ Double maxVal = maxBlock.isNull(offset) ? null : ((DoubleBlock) maxBlock).getDouble(offset);
+ Double sumVal = sumBlock.isNull(offset) ? null : ((DoubleBlock) sumBlock).getDouble(offset);
+ Integer countVal = countBlock.isNull(offset) ? null : ((IntBlock) countBlock).getInt(offset);
+ yield aggregateMetricDoubleToString(maxVal, minVal, sumVal, countVal);
+ }
+ case UNSUPPORTED -> (String) null;
  case SOURCE -> {
  BytesRef val = ((BytesRefBlock) block).getBytesRef(offset, scratch);
  try {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeConverter.java

@@ -58,6 +58,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.StringJoiner;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
@@ -664,6 +665,23 @@ public static long booleanToUnsignedLong(boolean number) {
  return number ? ONE_AS_UNSIGNED_LONG : ZERO_AS_UNSIGNED_LONG;
  }
 
+ public static String aggregateMetricDoubleToString(Double maxVal, Double minVal, Double sumVal, Integer countVal) {
+ final StringJoiner joiner = new StringJoiner(", ");
+ if (maxVal != null) {
+ joiner.add("\"max\": " + maxVal);
+ }
+ if (minVal != null) {
+ joiner.add("\"min\": " + minVal);
+ }
+ if (sumVal != null) {
+ joiner.add("\"sum\": " + sumVal);
+ }
+ if (countVal != null) {
+ joiner.add("\"value_count\": " + countVal);
+ }
+ return "{ " + joiner + " }";
+ }
+
  public enum EsqlConverter implements Converter {
 
  STRING_TO_DATE_PERIOD(x -> EsqlDataTypeConverter.parseTemporalAmount(x, DataType.DATE_PERIOD)),

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml

@@ -445,6 +445,29 @@ stats on aggregate_metric_double missing min and max:
  - match: {values.0.2: 1.0}
  - match: {values.0.3: 10}
 
+---
+render aggregate_metric_double when missing min and max:
+ - requires:
+ test_runner_features: [ capabilities ]
+ capabilities:
+ - method: POST
+ path: /_query
+ parameters: [ ]
+ capabilities: [ aggregate_metric_double_rendering ]
+ reason: "Support for rendering aggregate_metric_doubles"
+ - do:
+ allowed_warnings_regex:
+ - "No limit defined, adding default limit of \\[.*\\]"
+ esql.query:
+ body:
+ query: 'FROM test4 | KEEP agg_metric'
+
+ - length: {values: 1}
+ - length: {values.0: 1}
+ - match: {columns.0.name: "agg_metric"}
+ - match: {columns.0.type: "aggregate_metric_double"}
+ - match: {values.0.0: '{ "sum": 1, "value_count": 10 }'}
+
 ---
 from index pattern unsupported counter:
  - requires:

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_unsupported_types.yml

@@ -119,8 +119,8 @@ unsupported:
  - method: POST
  path: /_query
  parameters: [ ]
- capabilities: [ aggregate_metric_double ]
- reason: "support for aggregate_metric_double type"
+ capabilities: [ aggregate_metric_double_rendering ]
+ reason: "support for rendering aggregate_metric_double type"
 
  - do:
  allowed_warnings_regex:
@@ -190,7 +190,7 @@ unsupported:
  - match: { columns.28.type: integer }
 
  - length: { values: 1 }
- - match: { values.0.0: null }
+ - match: { values.0.0: '{ "max": 3.0, "min": 1.0, "sum": 10.1, "value_count": 5 }' }
  - match: { values.0.1: null }
  - match: { values.0.2: null }
  - match: { values.0.3: "2015-01-01T12:10:30.123456789Z" }