Skip to content

Commit 0d473a9

Browse files
Cool6689Cool6689
committed
refactor: update package structure for statistical aggregation accumulators
1 parent 9255685 commit 0d473a9

17 files changed

Lines changed: 48 additions & 232 deletions

File tree

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CentralMomentAccumulator.java renamed to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/aggregation/CentralMomentAccumulator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* limitations under the License.
1313
*/
1414

15-
package org.apache.iotdb.db.queryengine.execution.aggregation;
15+
package org.apache.iotdb.calc.execution.aggregation;
1616

1717
import org.apache.tsfile.block.column.Column;
1818
import org.apache.tsfile.block.column.ColumnBuilder;

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CorrelationAccumulator.java renamed to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/aggregation/CorrelationAccumulator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.iotdb.db.queryengine.execution.aggregation;
20+
package org.apache.iotdb.calc.execution.aggregation;
2121

2222
import org.apache.tsfile.block.column.Column;
2323
import org.apache.tsfile.block.column.ColumnBuilder;

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CovarianceAccumulator.java renamed to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/aggregation/CovarianceAccumulator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.iotdb.db.queryengine.execution.aggregation;
20+
package org.apache.iotdb.calc.execution.aggregation;
2121

2222
import org.apache.tsfile.block.column.Column;
2323
import org.apache.tsfile.block.column.ColumnBuilder;

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/RegressionAccumulator.java renamed to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/aggregation/RegressionAccumulator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* limitations under the License.
1313
*/
1414

15-
package org.apache.iotdb.db.queryengine.execution.aggregation;
15+
package org.apache.iotdb.calc.execution.aggregation;
1616

1717
import org.apache.tsfile.block.column.Column;
1818
import org.apache.tsfile.block.column.ColumnBuilder;

‎iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AccumulatorFactory.java‎

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919

2020
package org.apache.iotdb.calc.execution.operator.source.relational.aggregation;
2121

22+
import org.apache.iotdb.calc.execution.aggregation.CentralMomentAccumulator;
23+
import org.apache.iotdb.calc.execution.aggregation.CorrelationAccumulator;
24+
import org.apache.iotdb.calc.execution.aggregation.CovarianceAccumulator;
25+
import org.apache.iotdb.calc.execution.aggregation.RegressionAccumulator;
2226
import org.apache.iotdb.calc.execution.aggregation.VarianceAccumulator;
2327
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator;
2428
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.BlobGroupedApproxMostFrequentAccumulator;
@@ -30,9 +34,12 @@
3034
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileAccumulator;
3135
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileWithWeightAccumulator;
3236
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedAvgAccumulator;
37+
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedCentralMomentAccumulator;
38+
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedCorrelationAccumulator;
3339
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedCountAccumulator;
3440
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedCountAllAccumulator;
3541
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedCountIfAccumulator;
42+
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedCovarianceAccumulator;
3643
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedExtremeAccumulator;
3744
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedFirstAccumulator;
3845
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedFirstByAccumulator;
@@ -43,6 +50,7 @@
4350
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedMinAccumulator;
4451
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedMinByAccumulator;
4552
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedModeAccumulator;
53+
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedRegressionAccumulator;
4654
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedSumAccumulator;
4755
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedUserDefinedAggregateAccumulator;
4856
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator;
@@ -55,46 +63,6 @@
5563
import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager;
5664
import org.apache.iotdb.commons.queryengine.plan.udf.TableUDFUtils;
5765
import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer;
58-
import org.apache.iotdb.db.queryengine.execution.aggregation.CentralMomentAccumulator;
59-
import org.apache.iotdb.db.queryengine.execution.aggregation.CorrelationAccumulator;
60-
import org.apache.iotdb.db.queryengine.execution.aggregation.CovarianceAccumulator;
61-
import org.apache.iotdb.db.queryengine.execution.aggregation.RegressionAccumulator;
62-
import org.apache.iotdb.db.queryengine.execution.aggregation.VarianceAccumulator;
63-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator;
64-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.BlobGroupedApproxMostFrequentAccumulator;
65-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.BooleanGroupedApproxMostFrequentAccumulator;
66-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.DoubleGroupedApproxMostFrequentAccumulator;
67-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.FloatGroupedApproxMostFrequentAccumulator;
68-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator;
69-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedApproxCountDistinctAccumulator;
70-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAvgAccumulator;
71-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedCentralMomentAccumulator;
72-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedCorrelationAccumulator;
73-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedCountAccumulator;
74-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedCountAllAccumulator;
75-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedCountIfAccumulator;
76-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedCovarianceAccumulator;
77-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedExtremeAccumulator;
78-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedFirstAccumulator;
79-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedFirstByAccumulator;
80-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedLastAccumulator;
81-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedLastByAccumulator;
82-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedMaxAccumulator;
83-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedMaxByAccumulator;
84-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedMinAccumulator;
85-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedMinByAccumulator;
86-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedModeAccumulator;
87-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedRegressionAccumulator;
88-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedSumAccumulator;
89-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedUserDefinedAggregateAccumulator;
90-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator;
91-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator;
92-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator;
93-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory;
94-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash;
95-
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
96-
import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager;
97-
import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils;
9866
import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments;
9967
import org.apache.iotdb.udf.api.relational.AggregateFunction;
10068

‎iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableCentralMomentAccumulator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* limitations under the License.
1313
*/
1414

15-
package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation;
15+
package org.apache.iotdb.calc.execution.operator.source.relational.aggregation;
1616

17-
import org.apache.iotdb.db.queryengine.execution.aggregation.CentralMomentAccumulator;
17+
import org.apache.iotdb.calc.execution.aggregation.CentralMomentAccumulator;
1818

1919
import org.apache.tsfile.block.column.Column;
2020
import org.apache.tsfile.block.column.ColumnBuilder;

‎iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableCorrelationAccumulator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* limitations under the License.
1313
*/
1414

15-
package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation;
15+
package org.apache.iotdb.calc.execution.operator.source.relational.aggregation;
1616

17-
import org.apache.iotdb.db.queryengine.execution.aggregation.CorrelationAccumulator;
17+
import org.apache.iotdb.calc.execution.aggregation.CorrelationAccumulator;
1818

1919
import org.apache.tsfile.block.column.Column;
2020
import org.apache.tsfile.block.column.ColumnBuilder;

‎iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableCovarianceAccumulator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* limitations under the License.
1313
*/
1414

15-
package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation;
15+
package org.apache.iotdb.calc.execution.operator.source.relational.aggregation;
1616

17-
import org.apache.iotdb.db.queryengine.execution.aggregation.CovarianceAccumulator;
17+
import org.apache.iotdb.calc.execution.aggregation.CovarianceAccumulator;
1818

1919
import org.apache.tsfile.block.column.Column;
2020
import org.apache.tsfile.block.column.ColumnBuilder;

‎iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableRegressionAccumulator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* limitations under the License.
1313
*/
1414

15-
package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation;
15+
package org.apache.iotdb.calc.execution.operator.source.relational.aggregation;
1616

17-
import org.apache.iotdb.db.queryengine.execution.aggregation.RegressionAccumulator;
17+
import org.apache.iotdb.calc.execution.aggregation.RegressionAccumulator;
1818

1919
import org.apache.tsfile.block.column.Column;
2020
import org.apache.tsfile.block.column.ColumnBuilder;

‎iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedCentralMomentAccumulator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped;
20+
package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped;
2121

22-
import org.apache.iotdb.db.queryengine.execution.aggregation.CentralMomentAccumulator;
23-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask;
24-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray;
25-
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray;
22+
import org.apache.iotdb.calc.execution.aggregation.CentralMomentAccumulator;
23+
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask;
24+
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray;
25+
import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray;
2626

2727
import org.apache.tsfile.block.column.Column;
2828
import org.apache.tsfile.block.column.ColumnBuilder;

0 commit comments

Comments
 (0)