Try remove reset

apache · Jan 30, 2025 · 1cfe436 · 1cfe436
1 parent d76f12a
commit 1cfe436
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/...c/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ArrayRowHandler.java b/...c/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ArrayRowHandler.java
@@ -42,11 +42,6 @@ private ArrayRowHandler() {}
         row[field] = val;
     }
 
-    /** */
-    @Override public void resetRow(Object[] row) {
-        Arrays.fill(row, null);
-    }
-
     /** */
     @Override public Object[] copyRow(Object[] row) {
         Object[] copy = new Object[row.length];
@@ -70,6 +65,8 @@ private ArrayRowHandler() {}
     @Override public RowFactory<Object[]> factory(Type... types) {
         int rowLen = types.length;
 
+        Object[] row = new Object[rowLen];
+
         return new RowFactory<Object[]>() {
             /** {@inheritDoc} */
             @Override public RowHandler<Object[]> handler() {
@@ -78,7 +75,9 @@ private ArrayRowHandler() {}
 
             /** {@inheritDoc} */
             @Override public Object[] create() {
-                return new Object[rowLen];
+                Arrays.fill(row, null);
+
+                return row;
             }
 
             /** {@inheritDoc} */

diff --git a/...te/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/RowHandler.java b/...te/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/RowHandler.java
@@ -34,9 +34,6 @@ public interface RowHandler<Row> {
     /** */
     void set(int field, Row row, Object val);
 
-    /** Reset values all fields of the row to {@code null}. */
-    void resetRow(Row row);
-
     /** Creates a copy of the row. */
     Row copyRow(Row row);
 

diff --git a/...org/apache/ignite/internal/processors/query/calcite/exec/exp/agg/AccumulatorsFactory.java b/...org/apache/ignite/internal/processors/query/calcite/exec/exp/agg/AccumulatorsFactory.java
@@ -239,10 +239,10 @@ private WrapperPrototype(AggregateCall call) {
             return new Function<Row, Row>() {
                 final RowHandler<Row> hnd = ctx.rowHandler();
 
-                final Row out = hnd.factory(ctx.getTypeFactory(), inputRowType).create();
+                final RowHandler.RowFactory<Row> rowFac = hnd.factory(ctx.getTypeFactory(), inputRowType);
 
                 @Override public Row apply(Row in) {
-                    hnd.resetRow(out);
+                    Row out = rowFac.create();
 
                     for (int i = 0; i < hnd.columnCount(in); ++i) {
                         Object val = hnd.get(i, in);