You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/05/17 12:16:37 UTC
[iotdb] 02/04: Merge branch 'master' into alignedAggregateScanOp
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch alignedAggregateScanOp
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4a0af20cb0d6e95c42a00d804ff54ec26175ddf6
Merge: 88c9d5ef52 c76113ac45
Author: Alima777 <wx...@gmail.com>
AuthorDate: Tue May 17 16:38:58 2022 +0800
Merge branch 'master' into alignedAggregateScanOp
.../resources/conf/iotdb-confignode.properties | 4 +-
.../confignode/client/AsyncDataNodeClientPool.java | 128 ++++++-
.../iotdb/confignode/conf/ConfigNodeConf.java | 4 +-
.../consensus/request/write/CreateRegionsReq.java | 32 +-
.../request/write/RegisterDataNodeReq.java | 22 +-
...deLocationsResp.java => DataNodeInfosResp.java} | 18 +-
.../iotdb/confignode/manager/ConfigManager.java | 4 +-
.../iotdb/confignode/manager/NodeManager.java | 40 +--
.../iotdb/confignode/manager/PartitionManager.java | 64 ++--
.../iotdb/confignode/manager/load/LoadManager.java | 267 ++++++---------
.../manager/load/balancer/RegionBalancer.java | 94 +++++-
.../allocator/CopySetRegionAllocator.java | 25 +-
.../{ => balancer}/allocator/IRegionAllocator.java | 6 +-
.../confignode/persistence/ClusterSchemaInfo.java | 27 +-
.../iotdb/confignode/persistence/NodeInfo.java | 79 +++--
.../confignode/persistence/PartitionInfo.java | 107 ++++--
.../impl/DeleteStorageGroupProcedure.java | 13 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 13 +-
.../consensus/request/ConfigRequestSerDeTest.java | 9 +-
.../iotdb/confignode/persistence/NodeInfoTest.java | 12 +-
.../confignode/persistence/PartitionInfoTest.java | 54 ++-
.../thrift/ConfigNodeRPCServiceProcessorTest.java | 37 ++-
.../ratis/ApplicationStateMachineProxy.java | 9 +
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 41 ++-
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 42 ++-
.../iotdb/db/integration/IoTDBRestartIT.java | 101 ++++--
.../main/assembly/resources/conf/iotdb-metric.yml | 3 +
.../iotdb/metrics/DoNothingMetricService.java | 10 +
.../org/apache/iotdb/metrics/MetricService.java | 13 +
.../apache/iotdb/metrics/config/MetricConfig.java | 11 +
.../commons/utils/ThriftCommonsSerDeUtils.java | 19 ++
.../resources/conf/iotdb-engine.properties | 4 -
.../src/assembly/resources/sbin/stop-datanode.bat | 2 +
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 31 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 326 ++++++++++++++----
.../org/apache/iotdb/db/client/ConfigNodeInfo.java | 158 +++++++++
.../iotdb/db/client/DataNodeClientPoolFactory.java | 18 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 11 -
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 7 -
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 38 ---
.../compaction/cross/CrossSpaceCompactionTask.java | 9 +-
.../compaction/inner/InnerSpaceCompactionTask.java | 16 +-
.../impl/ReadPointCompactionPerformer.java | 7 +-
.../compaction/task/AbstractCompactionTask.java | 7 +-
.../db/engine/storagegroup/TsFileProcessor.java | 54 ++-
.../metadata/cache/DataNodeLastCacheManager.java | 81 +++++
.../db/metadata/cache/DataNodeSchemaCache.java | 34 ++
.../iotdb/db/metadata/cache/SchemaCacheEntry.java | 19 ++
.../iotdb/db/mpp/aggregation/Accumulator.java | 3 +-
.../iotdb/db/mpp/aggregation/Aggregator.java | 39 ++-
.../iotdb/db/mpp/aggregation/AvgAccumulator.java | 38 ++-
.../iotdb/db/mpp/aggregation/CountAccumulator.java | 8 +-
.../db/mpp/aggregation/ExtremeAccumulator.java | 23 +-
.../db/mpp/aggregation/FirstValueAccumulator.java | 25 +-
.../mpp/aggregation/FirstValueDescAccumulator.java | 12 +-
.../db/mpp/aggregation/LastValueAccumulator.java | 32 +-
.../mpp/aggregation/LastValueDescAccumulator.java | 48 +--
.../db/mpp/aggregation/MaxTimeAccumulator.java | 24 +-
.../db/mpp/aggregation/MaxTimeDescAccumulator.java | 17 +-
.../db/mpp/aggregation/MaxValueAccumulator.java | 22 +-
.../db/mpp/aggregation/MinTimeAccumulator.java | 20 +-
.../db/mpp/aggregation/MinTimeDescAccumulator.java | 2 +-
.../db/mpp/aggregation/MinValueAccumulator.java | 22 +-
.../iotdb/db/mpp/aggregation/SumAccumulator.java | 34 +-
.../timerangeiterator/AggrWindowIterator.java | 172 ++++++++++
.../timerangeiterator/ITimeRangeIterator.java | 58 ++++
.../timerangeiterator/PreAggrWindowIterator.java | 169 ++++++++++
.../PreAggrWindowWithNaturalMonthIterator.java | 143 ++++++++
.../SingleTimeWindowIterator.java | 7 +-
.../TimeRangeIteratorFactory.java | 73 ++++
.../operator/process/AggregateOperator.java | 90 ++++-
.../execution/operator/process/FilterOperator.java | 25 +-
.../operator/process/RawDataAggregateOperator.java | 194 +++++++++++
.../operator/process/TransformOperator.java | 45 ++-
.../source/SeriesAggregateScanOperator.java | 107 +++---
.../db/mpp/execution/schedule/DriverScheduler.java | 2 +-
.../org/apache/iotdb/db/mpp/plan/Coordinator.java | 8 +-
.../apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 1 +
.../mpp/plan/analyze/ClusterPartitionFetcher.java | 51 +--
.../execution/config/AuthorizerConfigTask.java | 37 ++-
.../mpp/plan/execution/config/ConfigExecution.java | 14 +-
.../execution/config/CountStorageGroupTask.java | 16 +-
.../execution/config/DeleteStorageGroupTask.java | 17 +-
.../db/mpp/plan/execution/config/IConfigTask.java | 8 +-
.../plan/execution/config/SetStorageGroupTask.java | 19 +-
.../db/mpp/plan/execution/config/SetTTLTask.java | 20 +-
.../execution/config/ShowStorageGroupTask.java | 20 +-
.../db/mpp/plan/execution/config/ShowTTLTask.java | 20 +-
.../db/mpp/plan/parser/StatementGenerator.java | 39 +--
.../db/mpp/plan/planner/DistributionPlanner.java | 51 ++-
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 91 ++++-
.../db/mpp/plan/planner/plan/node/PlanVisitor.java | 2 +-
.../planner/plan/node/process/AggregationNode.java | 64 +++-
.../plan/node/process/GroupByLevelNode.java | 6 +-
.../node/source/SeriesAggregationScanNode.java | 12 +-
.../plan/parameter/AggregationDescriptor.java | 61 +++-
.../planner/plan/parameter/AggregationStep.java | 44 ++-
.../iotdb/db/query/expression/Expression.java | 19 +-
.../query/expression/binary/BinaryExpression.java | 64 +++-
.../db/query/expression/leaf/ConstantOperand.java | 26 ++
.../query/expression/leaf/TimeSeriesOperand.java | 38 +++
.../db/query/expression/leaf/TimestampOperand.java | 33 ++
.../query/expression/multi/FunctionExpression.java | 115 +++++++
.../db/query/expression/unary/UnaryExpression.java | 50 +++
.../db/query/udf/core/executor/UDTFExecutor.java | 27 ++
.../query/udf/core/layer/EvaluationDAGBuilder.java | 25 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 24 +-
.../apache/iotdb/db/service/metrics/Metric.java | 20 +-
.../iotdb/db/service/metrics/MetricsService.java | 19 ++
.../db/service/metrics/ProcessMetricsMonitor.java | 148 +++++++++
.../db/service/metrics/SysRunMetricsMonitor.java | 134 ++++++++
.../thrift/impl/DataNodeTSIServiceImpl.java | 60 +++-
.../db/service/thrift/impl/TSServiceImpl.java | 3 +-
.../db/metadata/cache/DataNodeSchemaCacheTest.java | 69 ++++
.../iotdb/db/mpp/aggregation/AccumulatorTest.java | 116 +++++--
.../db/mpp/aggregation/TimeRangeIteratorTest.java | 298 +++++++++++++++++
.../db/mpp/execution/ConfigExecutionTest.java | 16 +-
.../execution/operator/AggregateOperatorTest.java | 321 ++++++++++++++++++
.../operator/RawDataAggregateOperatorTest.java | 368 +++++++++++++++++++++
.../operator/SeriesAggregateScanOperatorTest.java | 25 +-
.../node/process/AggregationNodeSerdeTest.java | 228 +++++++++++++
thrift-commons/src/main/thrift/common.thrift | 5 +-
.../src/main/thrift/confignode.thrift | 11 +-
.../apache/iotdb/tsfile/read/common/TimeRange.java | 20 +-
.../write/writer/RestorableTsFileIOWriter.java | 37 +--
125 files changed, 5423 insertions(+), 1081 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesAggregateScanOperator.java
index d5ce7f47fc,92010c87ec..cb50a86cb1
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesAggregateScanOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesAggregateScanOperator.java
@@@ -33,10 -34,10 +34,8 @@@ import org.apache.iotdb.tsfile.read.com
import org.apache.iotdb.tsfile.read.common.block.TsBlock;
import org.apache.iotdb.tsfile.read.common.block.TsBlock.TsBlockSingleColumnIterator;
import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder;
- import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder;
- import org.apache.iotdb.tsfile.read.common.block.column.TimeColumnBuilder;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
-import com.google.common.util.concurrent.ListenableFuture;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;