small

dnhatn · dnhatn · commit fd6f71c107f9 · 2025-07-15T11:35:25.000-07:00
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxBytesRefAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxBytesRefAggregator.java
@@ -62,10 +62,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe
         }
     }
 
-    public static void combineStates(GroupingState state, int groupId, GroupingState otherState, int otherGroupId) {
-        state.combine(groupId, otherState, otherGroupId);
-    }
-
     public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) {
         return state.toBlock(selected, driverContext);
     }
@@ -83,12 +79,6 @@ public void add(int groupId, BytesRef value) {
             }
         }
 
-        public void combine(int groupId, GroupingState otherState, int otherGroupId) {
-            if (otherState.internalState.hasValue(otherGroupId)) {
-                add(groupId, otherState.internalState.get(otherGroupId));
-            }
-        }
-
         @Override
         public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) {
             internalState.toIntermediate(blocks, offset, selected, driverContext);
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxIpAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxIpAggregator.java
@@ -58,10 +58,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe
         }
     }
 
-    public static void combineStates(GroupingState state, int groupId, GroupingState otherState, int otherGroupId) {
-        state.combine(groupId, otherState, otherGroupId);
-    }
-
     public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) {
         return state.toBlock(selected, driverContext);
     }
@@ -80,12 +76,6 @@ public void add(int groupId, BytesRef value) {
             }
         }
 
-        public void combine(int groupId, GroupingState otherState, int otherGroupId) {
-            if (otherState.internalState.hasValue(otherGroupId)) {
-                add(groupId, otherState.internalState.get(otherGroupId, otherState.scratch));
-            }
-        }
-
         @Override
         public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) {
             internalState.toIntermediate(blocks, offset, selected, driverContext);
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinBytesRefAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinBytesRefAggregator.java
@@ -62,10 +62,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe
         }
     }
 
-    public static void combineStates(GroupingState state, int groupId, GroupingState otherState, int otherGroupId) {
-        state.combine(groupId, otherState, otherGroupId);
-    }
-
     public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) {
         return state.toBlock(selected, driverContext);
     }
@@ -83,12 +79,6 @@ public void add(int groupId, BytesRef value) {
             }
         }
 
-        public void combine(int groupId, GroupingState otherState, int otherGroupId) {
-            if (otherState.internalState.hasValue(otherGroupId)) {
-                add(groupId, otherState.internalState.get(otherGroupId));
-            }
-        }
-
         @Override
         public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) {
             internalState.toIntermediate(blocks, offset, selected, driverContext);
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinIpAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinIpAggregator.java
@@ -58,10 +58,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe
         }
     }
 
-    public static void combineStates(GroupingState state, int groupId, GroupingState otherState, int otherGroupId) {
-        state.combine(groupId, otherState, otherGroupId);
-    }
-
     public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) {
         return state.toBlock(selected, driverContext);
     }
@@ -80,12 +76,6 @@ public void add(int groupId, BytesRef value) {
             }
         }
 
-        public void combine(int groupId, GroupingState otherState, int otherGroupId) {
-            if (otherState.internalState.hasValue(otherGroupId)) {
-                add(groupId, otherState.internalState.get(otherGroupId, otherState.scratch));
-            }
-        }
-
         @Override
         public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) {
             internalState.toIntermediate(blocks, offset, selected, driverContext);
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/SumDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/SumDoubleAggregator.java
@@ -69,12 +69,6 @@ public static void combine(GroupingSumState current, int groupId, double v) {
         current.add(v, groupId);
     }
 
-    public static void combineStates(GroupingSumState current, int groupId, GroupingSumState state, int statePosition) {
-        if (state.hasValue(statePosition)) {
-            current.add(state.values.get(statePosition), state.deltas.get(statePosition), groupId);
-        }
-    }
-
     public static void combineIntermediate(GroupingSumState current, int groupId, double inValue, double inDelta, boolean seen) {
         if (seen) {
             current.add(inValue, inDelta, groupId);
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ValuesBooleanAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ValuesBooleanAggregator.java
@@ -66,19 +66,6 @@ public static void combineIntermediate(GroupingState state, int groupId, Boolean
         }
     }
 
-    public static void combineStates(GroupingState current, int currentGroupId, GroupingState state, int statePosition) {
-        long stateOffset = ((long) statePosition) << 1;
-        boolean seenFalse = state.values.get(stateOffset);
-        boolean seenTrue = state.values.get(stateOffset | 1);
-
-        if (seenFalse) {
-            combine(current, currentGroupId, false);
-        }
-        if (seenTrue) {
-            combine(current, currentGroupId, true);
-        }
-    }
-
     public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) {
         return state.toBlock(driverContext.blockFactory(), selected);
     }

Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- public static void combineStates(GroupingState state, int groupId, GroupingState otherState, int otherGroupId) {`
`66`		`- state.combine(groupId, otherState, otherGroupId);`
`67`		`- }`
`68`		`-`
`69`	`65`	`public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) {`
`70`	`66`	`return state.toBlock(selected, driverContext);`
`71`	`67`	`}`
`@@ -83,12 +79,6 @@ public void add(int groupId, BytesRef value) {`
`83`	`79`	`}`
`84`	`80`	`}`
`85`	`81`
`86`		`- public void combine(int groupId, GroupingState otherState, int otherGroupId) {`
`87`		`- if (otherState.internalState.hasValue(otherGroupId)) {`
`88`		`- add(groupId, otherState.internalState.get(otherGroupId));`
`89`		`- }`
`90`		`- }`
`91`		`-`
`92`	`82`	`@Override`
`93`	`83`	`public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) {`
`94`	`84`	`internalState.toIntermediate(blocks, offset, selected, driverContext);`
Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`- public static void combineStates(GroupingState state, int groupId, GroupingState otherState, int otherGroupId) {`
`62`		`- state.combine(groupId, otherState, otherGroupId);`
`63`		`- }`
`64`		`-`
`65`	`61`	`public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) {`
`66`	`62`	`return state.toBlock(selected, driverContext);`
`67`	`63`	`}`
`@@ -80,12 +76,6 @@ public void add(int groupId, BytesRef value) {`
`80`	`76`	`}`
`81`	`77`	`}`
`82`	`78`
`83`		`- public void combine(int groupId, GroupingState otherState, int otherGroupId) {`
`84`		`- if (otherState.internalState.hasValue(otherGroupId)) {`
`85`		`- add(groupId, otherState.internalState.get(otherGroupId, otherState.scratch));`
`86`		`- }`
`87`		`- }`
`88`		`-`
`89`	`79`	`@Override`
`90`	`80`	`public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) {`
`91`	`81`	`internalState.toIntermediate(blocks, offset, selected, driverContext);`
Original file line number	Diff line number	Diff line change
`@@ -66,19 +66,6 @@ public static void combineIntermediate(GroupingState state, int groupId, Boolean`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- public static void combineStates(GroupingState current, int currentGroupId, GroupingState state, int statePosition) {`
`70`		`- long stateOffset = ((long) statePosition) << 1;`
`71`		`- boolean seenFalse = state.values.get(stateOffset);`
`72`		`- boolean seenTrue = state.values.get(stateOffset \| 1);`
`73`		`-`
`74`		`- if (seenFalse) {`
`75`		`- combine(current, currentGroupId, false);`
`76`		`- }`
`77`		`- if (seenTrue) {`
`78`		`- combine(current, currentGroupId, true);`
`79`		`- }`
`80`		`- }`
`81`		`-`
`82`	`69`	`public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) {`
`83`	`70`	`return state.toBlock(driverContext.blockFactory(), selected);`
`84`	`71`	`}`