polish code

Author: jan-elastic

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ChangePointStates.java

@@ -20,6 +20,7 @@
 import org.elasticsearch.compute.data.LongBlock;
 import org.elasticsearch.compute.operator.DriverContext;
 import org.elasticsearch.core.Releasable;
+import org.elasticsearch.core.Releasables;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
@@ -37,7 +38,14 @@
 
 public class ChangePointStates {
 
-    public static class SingleState implements Releasable {
+    record TimeAndValue(long timestamp, double value) implements Comparable<TimeAndValue> {
+        @Override
+        public int compareTo(TimeAndValue other) {
+            return Long.compare(timestamp, other.timestamp);
+        }
+    }
+
+    static class SingleState implements Releasable {
         private final BigArrays bigArrays;
         private int count;
         private LongArray timestamps;
@@ -67,38 +75,38 @@ void add(LongBlock timestamps, DoubleBlock values) {
         }
 
         void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) {
-            blocks[offset] = toTimestampsBlock(timestamps, driverContext.blockFactory());
-            blocks[offset + 1] = toValuesBlock(values, driverContext.blockFactory());
+            blocks[offset] = buildTimestampsBlock(driverContext.blockFactory());
+            blocks[offset + 1] = buildValuesBlock(driverContext.blockFactory());
         }
 
-        Block toTimestampsBlock(LongArray arr, BlockFactory blockFactory) {
-            if (arr.size() == 0) {
+        private Block buildTimestampsBlock(BlockFactory blockFactory) {
+            if (timestamps.size() == 0) {
                 return blockFactory.newConstantNullBlock(1);
             }
             if (values.size() == 1) {
-                return blockFactory.newConstantLongBlockWith(arr.get(0), 1);
+                return blockFactory.newConstantLongBlockWith(timestamps.get(0), 1);
             }
-            try (LongBlock.Builder builder = blockFactory.newLongBlockBuilder((int) arr.size())) {
+            try (LongBlock.Builder builder = blockFactory.newLongBlockBuilder((int) timestamps.size())) {
                 builder.beginPositionEntry();
                 for (int id = 0; id < count; id++) {
-                    builder.appendLong(arr.get(id));
+                    builder.appendLong(timestamps.get(id));
                 }
                 builder.endPositionEntry();
                 return builder.build();
             }
         }
 
-        Block toValuesBlock(DoubleArray arr, BlockFactory blockFactory) {
-            if (arr.size() == 0) {
+        private Block buildValuesBlock(BlockFactory blockFactory) {
+            if (values.size() == 0) {
                 return blockFactory.newConstantNullBlock(1);
             }
             if (values.size() == 1) {
-                return blockFactory.newConstantDoubleBlockWith(arr.get(0), 1);
+                return blockFactory.newConstantDoubleBlockWith(values.get(0), 1);
             }
-            try (DoubleBlock.Builder builder = blockFactory.newDoubleBlockBuilder((int) arr.size())) {
+            try (DoubleBlock.Builder builder = blockFactory.newDoubleBlockBuilder((int) values.size())) {
                 builder.beginPositionEntry();
                 for (int id = 0; id < count; id++) {
-                    builder.appendDouble(arr.get(id));
+                    builder.appendDouble(values.get(id));
                 }
                 builder.endPositionEntry();
                 return builder.build();
@@ -142,21 +150,13 @@ Block toBlock(BlockFactory blockFactory) {
             return blockFactory.newConstantBytesRefBlockWith(toBytesRef(), 1);
         }
 
-        record TimeAndValue(long timestamp, double value) implements Comparable<TimeAndValue> {
-            @Override
-            public int compareTo(TimeAndValue other) {
-                return Long.compare(timestamp, other.timestamp);
-            }
-        }
-
         @Override
         public void close() {
-            timestamps.close();
-            values.close();
+            Releasables.close(timestamps, values);
         }
     }
 
-    public static class GroupingState implements Releasable {
+    static class GroupingState implements Releasable {
         private final BigArrays bigArrays;
         private final Map<Integer, SingleState> states;
 
@@ -190,8 +190,8 @@ void combineState(int groupId, GroupingState otherState, int otherGroupId) {
         }
 
         void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) {
-            blocks[offset] = toTimestampsBlock(driverContext.blockFactory(), selected);
-            blocks[offset + 1] = toValuesBlock(driverContext.blockFactory(), selected);
+            blocks[offset] = buildTimestampsBlock(driverContext.blockFactory(), selected);
+            blocks[offset + 1] = buildValuesBlock(driverContext.blockFactory(), selected);
         }
 
         Block evaluateFinal(IntVector selected, BlockFactory blockFactory) {
@@ -204,7 +204,7 @@ Block evaluateFinal(IntVector selected, BlockFactory blockFactory) {
             }
         }
 
-        Block toTimestampsBlock(BlockFactory blockFactory, IntVector selected) {
+        private Block buildTimestampsBlock(BlockFactory blockFactory, IntVector selected) {
             if (states.isEmpty()) {
                 return blockFactory.newConstantNullBlock(selected.getPositionCount());
             }
@@ -237,7 +237,7 @@ Block toTimestampsBlock(BlockFactory blockFactory, IntVector selected) {
             }
         }
 
-        Block toValuesBlock(BlockFactory blockFactory, IntVector selected) {
+        private Block buildValuesBlock(BlockFactory blockFactory, IntVector selected) {
             if (states.isEmpty()) {
                 return blockFactory.newConstantNullBlock(selected.getPositionCount());
             }
@@ -274,9 +274,7 @@ void enableGroupIdTracking(SeenGroupIds seenGroupIds) {}
 
         @Override
         public void close() {
-            for (SingleState state : states.values()) {
-                state.close();
-            }
+            Releasables.close(states.values());
         }
     }
 }