This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch metric in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c798767f44a6ae097b9e0bec1a8b14d5443f15e8 Merge: e611d8c2f94 27d265e597a Author: HTHou <[email protected]> AuthorDate: Tue Nov 28 14:35:19 2023 +0800 Merge branch 'master' of github.com:apache/iotdb into metric .../java/org/apache/iotdb/tsfile/TsFileRead.java | 4 +- .../org/apache/iotdb/db/it/utils/TestUtils.java | 49 ++ .../apache/iotdb/pipe/it/IoTDBPipeClusterIT.java | 189 +++-- .../pipe/it/IoTDBPipeConnectorParallelIT.java | 49 +- ...ipeDataSyncIT.java => IoTDBPipeDataSinkIT.java} | 132 ++-- .../it/{extractor => }/IoTDBPipeExtractorIT.java | 343 +++------ .../apache/iotdb/pipe/it/IoTDBPipeLifeCycleIT.java | 33 +- .../apache/iotdb/pipe/it/IoTDBPipeProtocolIT.java | 34 +- .../iotdb/spark/tsfile/NarrowConverter.scala | 2 +- .../apache/iotdb/spark/tsfile/WideConverter.scala | 2 +- .../async/AsyncDataNodeHeartbeatClientPool.java | 4 +- .../heartbeat/DataNodeHeartbeatHandler.java | 6 +- .../iotdb/confignode/manager/ConfigManager.java | 2 +- .../load/cache/node/NodeHeartbeatSample.java | 7 +- .../manager/load/cache/node/NodeStatistics.java | 4 +- .../manager/load/service/HeartbeatService.java | 8 +- .../iotdb/confignode/manager/node/NodeManager.java | 9 + .../manager/partition/PartitionManager.java | 21 + .../manager/partition/PartitionMetrics.java | 36 + .../manager/pipe/metric/PipeConfigNodeMetrics.java | 47 ++ .../manager/pipe/metric/PipeProcedureMetrics.java | 97 +++ .../manager/pipe/metric/PipeTaskInfoMetrics.java | 99 +++ .../manager/pipe/task/PipeTaskCoordinator.java | 18 + .../confignode/persistence/node/NodeInfo.java | 29 +- .../partition/DatabasePartitionTable.java | 29 + .../persistence/partition/PartitionInfo.java | 24 + .../confignode/persistence/pipe/PipeTaskInfo.java | 18 + .../impl/pipe/AbstractOperatePipeProcedureV2.java | 3 + .../procedure/impl/pipe/PipeTaskOperation.java | 24 +- .../iotdb/confignode/service/ConfigNode.java | 3 + .../router/priority/GreedyPriorityTest.java | 4 +- .../priority/LeaderPriorityBalancerTest.java | 4 +- .../manager/load/cache/NodeCacheTest.java | 8 +- .../apache/iotdb/consensus/config/RatisConfig.java | 2 +- ...ion.java => RatisReadUnavailableException.java} | 11 +- .../ratis/ApplicationStateMachineProxy.java | 17 +- .../iotdb/consensus/ratis/RatisConsensus.java | 32 +- .../apache/iotdb/consensus/ratis/utils/Utils.java | 8 +- .../iotdb/consensus/ratis/RecoverReadTest.java | 4 +- .../apache/iotdb/consensus/ratis/TestUtils.java | 4 +- .../db/consensus/SchemaRegionConsensusImpl.java | 1 + .../dataregion/DataRegionStateMachine.java | 13 +- .../iotdb/db/pipe/agent/task/PipeTaskAgent.java | 6 +- .../db/pipe/commit/PipeEventCommitManager.java | 6 +- .../iotdb/db/pipe/commit/PipeEventCommitter.java | 23 +- .../thrift/async/IoTDBThriftAsyncConnector.java | 6 + .../tsfile/TsFileInsertionDataContainer.java | 2 +- .../iotdb/db/pipe/metric/PipeConnectorMetrics.java | 22 + .../{PipeMetrics.java => PipeDataNodeMetrics.java} | 16 +- .../db/pipe/metric/PipeEventCommitMetrics.java | 141 ++++ .../pipe/metric/PipeWALInsertNodeCacheMetrics.java | 24 + .../subtask/connector/PipeConnectorSubtask.java | 6 + .../protocol/thrift/impl/ClientRPCServiceImpl.java | 8 +- .../impl/DataNodeInternalRPCServiceImpl.java | 8 +- .../db/queryengine/common/MPPQueryContext.java | 15 + .../common/schematree/ClusterSchemaTree.java | 8 +- .../queryengine/common/schematree/ISchemaTree.java | 11 +- .../fragment/FragmentInstanceContext.java | 30 +- .../fragment/FragmentInstanceManager.java | 2 +- .../operator/process/last/LastQueryUtil.java | 8 +- .../operator/schema/SchemaFetchScanOperator.java | 8 +- .../operator/source/AlignedSeriesScanUtil.java | 4 +- .../execution/operator/source/SeriesScanUtil.java | 8 +- .../db/queryengine/plan/analyze/Analysis.java | 14 +- .../queryengine/plan/analyze/AnalyzeVisitor.java | 123 ++-- .../plan/analyze/ExpressionAnalyzer.java | 217 ------ .../queryengine/plan/analyze/ExpressionUtils.java | 105 +-- .../queryengine/plan/analyze/PredicateUtils.java | 347 +++++++++ .../queryengine/plan/analyze/TemplatedAnalyze.java | 16 +- .../db/queryengine/plan/analyze/TemplatedInfo.java | 32 - .../analyze/cache/partition/PartitionCache.java | 12 +- .../analyze/schema/ClusterSchemaFetchExecutor.java | 17 +- .../plan/analyze/schema/ClusterSchemaFetcher.java | 13 +- .../plan/analyze/schema/ISchemaFetcher.java | 6 +- .../config/executor/ClusterConfigTaskExecutor.java | 3 +- .../memory/StatementMemorySourceVisitor.java | 3 +- .../db/queryengine/plan/expression/Expression.java | 5 + .../plan/expression/ExpressionFactory.java | 53 ++ .../plan/expression/ExpressionType.java | 3 +- .../expression/other/GroupByTimeExpression.java | 159 ++++ .../plan/expression/unary/InExpression.java | 15 +- .../plan/expression/unary/IsNullExpression.java | 5 - .../plan/expression/unary/LikeExpression.java | 84 +-- .../plan/expression/unary/LogicNotExpression.java | 5 - .../plan/expression/unary/NegationExpression.java | 5 - .../plan/expression/unary/RegularExpression.java | 31 +- .../plan/expression/unary/UnaryExpression.java | 2 - .../plan/expression/visitor/ExpressionVisitor.java | 5 + .../visitor/TransformToViewExpressionVisitor.java | 10 +- .../ConvertPredicateToTimeFilterVisitor.java | 241 +++++++ .../visitor/predicate/PredicateVisitor.java | 102 +++ .../visitor/predicate/ReversePredicateVisitor.java | 148 ++++ .../plan/optimization/LimitOffsetPushDown.java | 8 +- .../db/queryengine/plan/parser/ASTVisitor.java | 6 +- .../plan/planner/LocalExecutionPlanContext.java | 15 +- .../plan/planner/LogicalPlanBuilder.java | 72 +- .../plan/planner/LogicalPlanVisitor.java | 7 +- .../plan/planner/OperatorTreeGenerator.java | 121 ++-- .../plan/planner/TemplatedLogicalPlan.java | 2 - .../plan/planner/TemplatedLogicalPlanBuilder.java | 6 - .../distribution/DistributionPlanContext.java | 5 + .../SimpleFragmentParallelPlanner.java | 6 +- .../plan/planner/distribution/SourceRewriter.java | 26 +- .../distribution/WriteFragmentParallelPlanner.java | 6 +- .../plan/planner/plan/FragmentInstance.java | 41 +- .../plan/planner/plan/node/PlanGraphPrinter.java | 9 +- .../node/metedata/read/SchemaFetchScanNode.java | 17 +- .../plan/node/process/last/LastQueryNode.java | 45 +- .../plan/node/source/AlignedLastQueryScanNode.java | 8 +- .../source/AlignedSeriesAggregationScanNode.java | 51 +- .../plan/node/source/AlignedSeriesScanNode.java | 150 ++-- .../plan/node/source/LastQueryScanNode.java | 8 +- .../plan/node/source/LastSeriesSourceNode.java | 7 + .../node/source/SeriesAggregationScanNode.java | 51 +- .../node/source/SeriesAggregationSourceNode.java | 31 +- .../planner/plan/node/source/SeriesScanNode.java | 146 ++-- .../planner/plan/node/source/SeriesSourceNode.java | 4 +- .../planner/plan/node/write/DeleteDataNode.java | 2 +- .../planner/plan/parameter/SeriesScanOptions.java | 63 +- .../statement/internal/SchemaFetchStatement.java | 11 +- .../metadata/CreateContinuousQueryStatement.java | 4 +- .../apache/iotdb/db/schemaengine/SchemaEngine.java | 6 +- .../schemaengine/schemaregion/ISchemaRegion.java | 5 +- .../schemaregion/impl/SchemaRegionMemoryImpl.java | 9 +- .../schemaregion/impl/SchemaRegionPBTreeImpl.java | 9 +- .../mtree/impl/mem/MTreeBelowSGMemoryImpl.java | 14 +- .../mtree/impl/pbtree/MTreeBelowSGCachedImpl.java | 14 +- .../reader/impl/TimeseriesReaderWithViewFetch.java | 3 +- .../view/visitor/TransformToExpressionVisitor.java | 10 +- .../db/service/metrics/DataNodeMetricsHelper.java | 4 +- .../read/reader/chunk/MemAlignedPageReader.java | 4 +- .../read/reader/chunk/MemPageReader.java | 4 +- .../dataregion/wal/utils/WALInsertNodeCache.java | 10 + .../apache/iotdb/db/utils/TimeValuePairUtils.java | 62 -- .../dataregion/DataRegionStateMachineTest.java | 78 ++ .../schemaRegion/SchemaRegionBasicTest.java | 11 +- .../schemaRegion/SchemaRegionTemplateTest.java | 9 +- .../AlignedSeriesAggregationScanOperatorTest.java | 10 +- .../execution/operator/OperatorMemoryTest.java | 8 +- .../operator/RawDataAggregationOperatorTest.java | 5 +- .../SeriesAggregationScanOperatorTest.java | 10 +- .../operator/UpdateLastCacheOperatorTest.java | 2 +- .../schema/SchemaFetchScanOperatorTest.java | 4 +- .../ConvertPredicateToTimeFilterTest.java | 148 ++++ .../predicate/PredicateRemoveNotTest.java | 95 +++ .../CaseWhenThenExpressionTest.java | 2 +- .../db/queryengine/plan/analyze/AnalyzeTest.java | 26 +- .../plan/analyze/ExpressionAnalyzerTest.java | 2 +- .../plan/analyze/FakeSchemaFetcherImpl.java | 12 +- .../plan/analyze/QueryTimePartitionTest.java | 120 ++-- .../plan/optimization/TestPlanBuilder.java | 8 +- .../plan/plan/FragmentInstanceSerdeTest.java | 4 +- .../plan/plan/QueryLogicalPlanUtil.java | 43 +- .../AlignByDeviceOrderByLimitOffsetTest.java | 4 +- .../plan/plan/distribution/LastQueryTest.java | 2 +- .../queryengine/plan/plan/distribution/Util.java | 6 +- .../queryengine/plan/plan/distribution/Util2.java | 6 +- .../plan/plan/node/PlanGraphPrinterTest.java | 2 +- .../metadata/read/SchemaFetchMergeNodeTest.java | 1 + .../metadata/read/SchemaFetchScanNodeTest.java | 2 + .../node/process/AggregationNodeSerdeTest.java | 8 +- .../node/process/GroupByLevelNodeSerdeTest.java | 11 +- .../plan/node/process/GroupByTagNodeSerdeTest.java | 9 +- .../plan/plan/node/process/LimitNodeSerdeTest.java | 2 - .../plan/node/process/OffsetNodeSerdeTest.java | 2 - .../plan/plan/node/process/SortNodeSerdeTest.java | 2 - .../plan/node/process/TimeJoinNodeSerdeTest.java | 4 - .../source/SeriesAggregationScanNodeSerdeTest.java | 9 +- .../plan/node/source/SeriesScanNodeSerdeTest.java | 2 - .../AlignedSeriesScanLimitOffsetPushDownTest.java | 4 +- .../series/SeriesScanLimitOffsetPushDownTest.java | 4 +- .../apache/iotdb/commons/path/PathPatternTree.java | 8 + .../commons/pipe/task/meta/PipeMetaKeeper.java | 32 + .../viewExpression/unary/LikeViewExpression.java | 20 +- .../unary/RegularViewExpression.java | 24 +- .../iotdb/commons/service/metric/enums/Metric.java | 7 + .../apache/iotdb/commons/utils/SerializeUtils.java | 8 - .../apache/iotdb/tsfile/read/common/TimeRange.java | 2 +- .../read/expression/impl/GlobalTimeExpression.java | 12 +- .../expression/impl/SingleSeriesExpression.java | 11 +- .../read/filter/PredicateRemoveNotRewriter.java | 30 +- .../iotdb/tsfile/read/filter/TimeFilter.java | 321 --------- .../iotdb/tsfile/read/filter/ValueFilter.java | 164 ----- .../tsfile/read/filter/basic/BinaryFilter.java | 95 --- .../iotdb/tsfile/read/filter/basic/Filter.java | 158 +++- .../IDisableStatisticsTimeFilter.java} | 18 +- .../IDisableStatisticsValueFilter.java} | 18 +- .../IStatefulFilter.java} | 29 +- .../FilterType.java => basic/ITimeFilter.java} | 18 +- .../FilterType.java => basic/IValueFilter.java} | 23 +- .../OperatorType.java} | 54 +- .../tsfile/read/filter/basic/UnaryFilter.java | 97 --- .../tsfile/read/filter/factory/FilterFactory.java | 93 +-- .../tsfile/read/filter/factory/TimeFilter.java | 101 +++ .../tsfile/read/filter/factory/ValueFilter.java | 168 +++++ .../filter/operator/{AndFilter.java => And.java} | 54 +- .../iotdb/tsfile/read/filter/operator/Between.java | 168 ----- .../iotdb/tsfile/read/filter/operator/Eq.java | 115 --- .../read/filter/{ => operator}/GroupByFilter.java | 116 ++- .../filter/{ => operator}/GroupByMonthFilter.java | 171 +++-- .../iotdb/tsfile/read/filter/operator/Gt.java | 113 --- .../iotdb/tsfile/read/filter/operator/GtEq.java | 113 --- .../iotdb/tsfile/read/filter/operator/In.java | 153 ---- .../iotdb/tsfile/read/filter/operator/Like.java | 201 ------ .../iotdb/tsfile/read/filter/operator/Lt.java | 113 --- .../iotdb/tsfile/read/filter/operator/LtEq.java | 113 --- .../filter/operator/{NotFilter.java => Not.java} | 114 ++- .../iotdb/tsfile/read/filter/operator/NotEq.java | 115 --- .../filter/operator/{OrFilter.java => Or.java} | 144 ++-- .../iotdb/tsfile/read/filter/operator/Regexp.java | 199 ----- .../read/filter/operator/TimeFilterOperators.java | 615 ++++++++++++++++ .../read/filter/operator/ValueFilterOperators.java | 799 +++++++++++++++++++++ .../filter/operator/base/BinaryLogicalFilter.java} | 47 +- .../filter/operator/base/ColumnCompareFilter.java} | 34 +- .../base/ColumnPatternMatchFilter.java} | 33 +- .../base/ColumnRangeFilter.java} | 34 +- .../base/ColumnSetFilter.java} | 33 +- .../tsfile/read/reader/page/AlignedPageReader.java | 16 +- .../iotdb/tsfile/read/reader/page/PageReader.java | 18 +- .../iotdb/tsfile/utils/ReadWriteIOUtils.java | 55 +- .../org/apache/iotdb/tsfile/utils/RegexUtils.java | 92 +++ .../apache/iotdb/tsfile/read/ExpressionTest.java | 2 +- .../iotdb/tsfile/read/ReadInPartitionTest.java | 4 +- .../org/apache/iotdb/tsfile/read/ReadTest.java | 4 +- .../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 4 +- .../apache/iotdb/tsfile/read/TsFileReaderTest.java | 4 +- .../tsfile/read/filter/FilterSerializeTest.java | 36 +- .../tsfile/read/filter/GroupByFilterTest.java | 4 +- .../tsfile/read/filter/GroupByMonthFilterTest.java | 67 +- .../read/filter/IExpressionOptimizerTest.java | 2 + .../read/filter/MinTimeMaxTimeFilterTest.java | 9 +- .../iotdb/tsfile/read/filter/OperatorTest.java | 2 + .../filter/PredicateRemoveNotRewriterTest.java | 109 +-- .../tsfile/read/filter/StatisticsFilterTest.java | 4 +- .../read/query/executor/QueryExecutorTest.java | 4 +- .../read/query/timegenerator/ReadWriteTest.java | 4 +- .../timegenerator/TimeGeneratorReadEmptyTest.java | 4 +- .../timegenerator/TimeGeneratorReadWriteTest.java | 4 +- .../query/timegenerator/TimeGeneratorTest.java | 4 +- .../iotdb/tsfile/read/reader/ReaderTest.java | 4 +- .../src/main/thrift/confignode.thrift | 5 + .../src/main/thrift/datanode.thrift | 8 +- 242 files changed, 6062 insertions(+), 4850 deletions(-)
