This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/addQueryIT in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2d43e6476b3eec14ddcdfc32cff851a7f3ca0098 Merge: ab071d105d 462c0c2c8c Author: Minghui Liu <[email protected]> AuthorDate: Fri Jun 17 10:36:03 2022 +0800 Merge remote-tracking branch 'origin/master' into lmh/addQueryIT .../resources/conf/iotdb-confignode.properties | 2 +- .../client/ConfigNodeClientPoolFactory.java | 4 +- .../client/handlers/HeartbeatHandler.java | 1 - .../{ConfigNodeConf.java => ConfigNodeConfig.java} | 8 +- .../confignode/conf/ConfigNodeDescriptor.java | 4 +- .../confignode/conf/ConfigNodeStartupCheck.java | 4 +- .../iotdb/confignode/manager/ConfigManager.java | 14 +- .../iotdb/confignode/manager/ConsensusManager.java | 8 +- .../apache/iotdb/confignode/manager/Manager.java | 2 + .../iotdb/confignode/manager/NodeManager.java | 8 +- .../iotdb/confignode/manager/PartitionManager.java | 8 +- .../iotdb/confignode/manager/ProcedureManager.java | 11 +- .../iotdb/confignode/manager/load/LoadManager.java | 83 +- .../manager/load/heartbeat/HeartbeatCache.java | 74 +- .../manager/load/heartbeat/HeartbeatPackage.java | 1 + .../manager/load/heartbeat/HeartbeatWindow.java | 51 - .../load/heartbeat/IHeartbeatStatistic.java | 19 +- .../iotdb/confignode/persistence/NodeInfo.java | 74 +- .../iotdb/confignode/persistence/UDFInfo.java | 4 +- .../persistence/partition/PartitionInfo.java | 124 +- .../partition/StorageGroupPartitionTable.java | 85 +- .../iotdb/confignode/service/ConfigNode.java | 11 +- .../service/thrift/ConfigNodeRPCService.java | 4 +- .../thrift/ConfigNodeRPCServiceProcessor.java | 2 +- .../consensus/request/ConfigRequestSerDeTest.java | 2 +- .../iotdb/confignode/persistence/NodeInfoTest.java | 4 +- .../thrift/ConfigNodeRPCServiceProcessorTest.java | 33 +- .../multileader/MultiLeaderConsensus.java | 10 +- .../consensus/standalone/StandAloneConsensus.java | 10 +- .../{standalone => }/EmptyStateMachine.java | 3 +- .../{standalone => multileader}/RecoveryTest.java | 16 +- .../iotdb/consensus/standalone/RecoveryTest.java | 1 + .../standalone/StandAloneConsensusTest.java | 1 + docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 26 +- docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 26 +- example/rest-java-example/pom.xml | 49 + .../main/java/org/apache/iotdb/HttpExample.java | 141 + .../main/java/org/apache/iotdb/HttpsExample.java | 144 + .../src/main/java/org/apache/iotdb/SSLClient.java | 83 + ...Apache IoTDB ConfigNode Dashboard v0.14.0.json} | 802 ++---- .../Apache IoTDB DataNode Dashboard v0.14.0.json} | 107 +- .../Apache IoTDB Dashboard v0.13.1.json | 0 .../Apache IoTDB Dashboard v0.14.0.json | 0 integration-test/import-control.xml | 23 +- ...gregationWithoutValueFilterWithDeletion2IT.java | 55 +- ...ggregationWithoutValueFilterWithDeletionIT.java | 177 +- .../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 2748 ++++++++++++++++++++ ...upByQueryWithoutValueFilterWithDeletion2IT.java | 42 +- ...oupByQueryWithoutValueFilterWithDeletionIT.java | 260 +- .../db/it/aligned/IoTDBInsertAlignedValuesIT.java | 25 +- .../db/it/udf/BuiltinAggregationFunctionEnum.java | 58 + .../BuiltinTimeSeriesGeneratingFunctionEnum.java | 87 + .../iotdb/db/it/udf/IoTDBUDFManagementIT.java | 336 +++ .../it/{ => udf}/IoTDBUDTFBuiltinFunctionIT.java | 20 +- .../IoTDBSyntaxConventionIdentifierIT.java | 5 + .../iotdb/db/integration/IoTDBUDFManagementIT.java | 398 --- .../IoTDBAggregationWithoutValueFilter2IT.java | 65 - .../IoTDBAggregationWithoutValueFilterIT.java | 456 ---- ...gregationWithoutValueFilterWithDeletion2IT.java | 82 - .../integration/aligned/IoTDBAlignByDevice2IT.java | 67 - .../integration/aligned/IoTDBAlignByDeviceIT.java | 1623 ------------ .../IoTDBGroupByQueryWithoutValueFilter2IT.java | 65 - .../IoTDBGroupByQueryWithoutValueFilterIT.java | 1128 -------- .../apache/iotdb/commons/cluster/NodeStatus.java | 25 +- .../org/apache/iotdb/commons/utils/FileUtils.java | 2 +- .../apache/iotdb/commons/utils/NodeUrlUtils.java | 6 +- .../iotdb/commons/utils/NodeUrlUtilsTest.java | 8 +- .../utils/ThriftConfigNodeSerDeUtilsTest.java | 3 +- .../resources/conf/iotdb-engine.properties | 2 +- .../assembly/resources/conf/iotdb-rest.properties | 3 + .../iotdb/db/conf/rest/IoTDBRestServiceConfig.java | 11 + .../db/conf/rest/IoTDBRestServiceDescriptor.java | 3 + .../org/apache/iotdb/db/engine/StorageEngine.java | 2 +- .../iotdb/db/engine/storagegroup/DataRegion.java | 13 +- .../metadata/MeasurementAlreadyExistException.java | 28 +- .../iotdb/db/localconfignode/LocalConfigNode.java | 4 +- .../localconfignode/LocalDataPartitionTable.java | 8 +- .../iotdb/db/metadata/LocalSchemaProcessor.java | 5 +- .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 19 +- .../db/metadata/schemaregion/SchemaEngine.java | 4 +- .../metadata/visitor/SchemaExecutionVisitor.java | 163 +- .../iotdb/db/mpp/aggregation/AvgAccumulator.java | 3 + .../iotdb/db/mpp/aggregation/CountAccumulator.java | 3 + .../db/mpp/aggregation/ExtremeAccumulator.java | 3 + .../db/mpp/aggregation/FirstValueAccumulator.java | 3 + .../db/mpp/aggregation/LastValueAccumulator.java | 3 + .../db/mpp/aggregation/MaxTimeAccumulator.java | 3 + .../db/mpp/aggregation/MaxValueAccumulator.java | 3 + .../db/mpp/aggregation/MinTimeAccumulator.java | 3 + .../db/mpp/aggregation/MinValueAccumulator.java | 3 + .../iotdb/db/mpp/aggregation/SumAccumulator.java | 3 + .../iotdb/db/mpp/common/header/DatasetHeader.java | 4 + .../db/mpp/common/schematree/PathPatternTree.java | 276 +- .../execution/datatransfer/DataBlockManager.java | 6 +- .../operator/schema/SchemaFetchScanOperator.java | 2 +- .../AlignedSeriesAggregationScanOperator.java | 10 +- .../source/SeriesAggregationScanOperator.java | 8 +- .../org/apache/iotdb/db/mpp/plan/Coordinator.java | 3 + .../apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 104 +- .../mpp/plan/analyze/ClusterPartitionFetcher.java | 4 +- .../db/mpp/plan/analyze/ClusterSchemaFetcher.java | 141 +- .../db/mpp/plan/analyze/ExpressionAnalyzer.java | 16 +- .../mpp/plan/analyze/StandaloneSchemaFetcher.java | 20 +- .../iotdb/db/mpp/plan/constant/StatementType.java | 3 +- .../mpp/plan/execution/config/ConfigExecution.java | 4 +- .../db/mpp/plan/execution/config/FlushTask.java | 6 +- .../mpp/plan/execution/config/ShowClusterTask.java | 5 +- ...utor.java => StandaloneConfigTaskExecutor.java} | 14 +- .../iotdb/db/mpp/plan/parser/ASTVisitor.java | 12 +- .../db/mpp/plan/planner/LogicalPlanBuilder.java | 31 +- .../iotdb/db/mpp/plan/planner/LogicalPlanner.java | 30 +- .../plan/planner/distribution/SourceRewriter.java | 6 +- .../mpp/plan/planner/plan/node/PlanNodeType.java | 6 +- .../db/mpp/plan/planner/plan/node/PlanVisitor.java | 5 + .../write/InternalCreateTimeSeriesNode.java | 155 ++ .../source/AlignedSeriesAggregationScanNode.java | 2 +- .../plan/parameter/AggregationDescriptor.java | 65 +- .../plan/parameter/GroupByLevelDescriptor.java | 7 +- .../db/mpp/plan/scheduler/ClusterScheduler.java | 20 +- .../db/mpp/plan/statement/StatementVisitor.java | 8 +- .../mpp/plan/statement/crud/InsertStatement.java | 29 + .../InternalCreateTimeSeriesStatement.java} | 40 +- .../statement/internal/SchemaFetchStatement.java | 2 +- .../db/mpp/plan/statement/sys/FlushStatement.java | 13 +- .../iotdb/db/protocol/mqtt/MPPPublishHandler.java | 163 ++ .../apache/iotdb/db/protocol/rest/RestService.java | 13 +- .../java/org/apache/iotdb/db/service/DataNode.java | 16 +- .../org/apache/iotdb/db/service/MQTTService.java | 12 +- .../iotdb/db/service/metrics/enums/Metric.java | 7 +- .../iotdb/db/wal/buffer/AbstractWALBuffer.java | 8 +- .../org/apache/iotdb/db/wal/buffer/IWALBuffer.java | 3 + .../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 30 +- .../org/apache/iotdb/db/wal/io/ILogWriter.java | 3 +- .../java/org/apache/iotdb/db/wal/io/LogWriter.java | 3 +- .../java/org/apache/iotdb/db/wal/node/WALNode.java | 19 +- .../mpp/common/schematree/PathPatternTreeTest.java | 10 +- .../schema/SchemaFetchScanOperatorTest.java | 4 +- .../plan/analyze/AggregationDescriptorTest.java | 20 +- .../db/mpp/plan/plan/QueryLogicalPlanUtil.java | 90 +- .../distribution/AggregationDistributionTest.java | 24 +- .../metadata/read/SchemaFetchScanNodeTest.java | 9 +- .../node/process/AggregationNodeSerdeTest.java | 36 +- .../node/process/GroupByLevelNodeSerdeTest.java | 6 +- .../source/SeriesAggregationScanNodeSerdeTest.java | 2 +- .../iotdb/db/protocol/mqtt/PublishHandlerTest.java | 7 +- server/src/test/resources/iotdb-rest.properties | 3 + .../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 + session/src/test/resources/iotdb-rest.properties | 3 + thrift-commons/src/main/thrift/common.thrift | 13 +- 149 files changed, 5960 insertions(+), 5725 deletions(-)
