changes

Author: limotova

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

@@ -55,12 +55,12 @@ public static AggregateMetricDoubleBlock fromCompositeBlock(CompositeBlock block
         return new AggregateMetricDoubleBlock(min, max, sum, count);
     }
 
-    public static CompositeBlock toCompositeBlock(AggregateMetricDoubleBlock block) {
+    public CompositeBlock asCompositeBlock() {
         final Block[] blocks = new Block[4];
-        blocks[AggregateMetricDoubleBlockBuilder.Metric.MIN.getIndex()] = block.minBlock();
-        blocks[AggregateMetricDoubleBlockBuilder.Metric.MAX.getIndex()] = block.maxBlock();
-        blocks[AggregateMetricDoubleBlockBuilder.Metric.SUM.getIndex()] = block.sumBlock();
-        blocks[AggregateMetricDoubleBlockBuilder.Metric.COUNT.getIndex()] = block.countBlock();
+        blocks[AggregateMetricDoubleBlockBuilder.Metric.MIN.getIndex()] = minBlock;
+        blocks[AggregateMetricDoubleBlockBuilder.Metric.MAX.getIndex()] = maxBlock;
+        blocks[AggregateMetricDoubleBlockBuilder.Metric.SUM.getIndex()] = sumBlock;
+        blocks[AggregateMetricDoubleBlockBuilder.Metric.COUNT.getIndex()] = countBlock;
         return new CompositeBlock(blocks);
     }
 
@@ -146,7 +146,7 @@ public boolean mayHaveMultivaluedFields() {
 
     @Override
     public boolean doesHaveMultivaluedFields() {
-        if (false == Stream.of(minBlock, maxBlock, sumBlock, countBlock).anyMatch(Block::mayHaveMultivaluedFields)) {
+        if (Stream.of(minBlock, maxBlock, sumBlock, countBlock).noneMatch(Block::mayHaveMultivaluedFields)) {
             return false;
         }
         return Stream.of(minBlock, maxBlock, sumBlock, countBlock).anyMatch(Block::doesHaveMultivaluedFields);

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

@@ -346,7 +346,7 @@ static Block[] buildAll(Block.Builder... builders) {
     static void writeTypedBlock(Block block, StreamOutput out) throws IOException {
         if (out.getTransportVersion().before(TransportVersions.AGGREGATE_METRIC_DOUBLE_BLOCK)
             && block instanceof AggregateMetricDoubleBlock aggregateMetricDoubleBlock) {
-            block = AggregateMetricDoubleBlock.toCompositeBlock(aggregateMetricDoubleBlock);
+            block = aggregateMetricDoubleBlock.asCompositeBlock();
         }
         block.elementType().writeTo(out);
         block.writeTo(out);

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToAggregateMetricDouble.java

@@ -141,14 +141,13 @@ private void appendValue(double value) {
         }
 
         private Block build() {
-            AggregateMetricDoubleBlock aggBlock;
             DoubleBlock doubleBlock = null;
             IntBlock countBlock = null;
             boolean success = false;
             try {
                 doubleBlock = valuesBuilder.build().asBlock();
                 countBlock = blockFactory.newConstantIntBlockWith(1, doubleBlock.getPositionCount());
-                aggBlock = new AggregateMetricDoubleBlock(doubleBlock, doubleBlock, doubleBlock, countBlock);
+                AggregateMetricDoubleBlock aggBlock = new AggregateMetricDoubleBlock(doubleBlock, doubleBlock, doubleBlock, countBlock);
                 doubleBlock.incRef();
                 doubleBlock.incRef();
                 success = true;