You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/12/20 01:31:57 UTC

[iotdb] branch lmh/addQueryMetrics updated (0f9a394911 -> 03c0c8195a)

This is an automated email from the ASF dual-hosted git repository.

hui pushed a change to branch lmh/addQueryMetrics
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from 0f9a394911 add addStatementExecutionLatency
     add bd8cfadd85 [IOTDB-5170] stop-confignode.bat, datanode will be closed at the same time (#8406)
     add a28c982a6b [IOTDB-5172] Fix SingleDeviceViewNode can't get outputColumnTypes when it's isolated
     add e68f560463 [IOTDB-5169] Add UserGuide for Order By in Align By Device (#8416)
     add 25ce90a4f4 Remove old IoTDB main class since it's deprecated (#8423)
     add e487d0706b Update metric doc (#8419)
     add 3ef60a5ff0 change oridnal to serialize (#8417)
     add 7ad27ce5e1 [IOTDB-5191] Rename RatisConfig.RatisConsensus (#8428)
     add 4a68677055 [IOTDB-5119] fix bug that M4 throws exception when the window is empty
     add 1f813a1535 [IOTDB-5190] Move Library-udf IT to integration-test (#8431)
     add cb871b4cf1 docker deploy for 1.0.0: dockerfiles,docker-compose files,support she… (#8393)
     add 50cc757c7e [IOTDB-5159] Refactor the structure of Cluster Deploy DOC (#8402)
     add 3355e28525 Fix verfiy phase not working in integration-test (#8436)
     add 3e48aaf1c9 [IOTDB-5183]Fix CI OOM (#8398)
     add fcc78b23d4 [IOTDB-5185] The old snapshot is not deleted after “ take snapshot ” is complete (#8427)
     add 07c42312c9 [IOTDB-5153] add snapshot transfer IT & UT for RatisConsensus (#8385)
     add 2de2096956 [IOTDB-5200] Fix IT in IoTDBOrderByWithAlignByDeviceIT
     add 616af5240b Fix IOTDBGroupByIT & IoTDBNullOperandIT (#8443)
     add 4dcd255ae8 [IOTDB-5199]fix NPE in StorageExector inLoading process (#8440)
     add 35c016f229 [IOTDB-5202] Show regions support database sql (#8450)
     add b40d7b1727 [IOTDB-5210] Fix closed TsFileSequenceReader still cached in FileReaderManager
     add 4a32eb8a77 [IOTDB-5061] Add initialize state check when create snapshot (#8447)
     add 4e06867e51 Update Write-Data.md (#8444)
     add 6c90a45b06 Update Write-Data.md (#8445)
     add 8b4b397f9e [IOTDB-5168] Refactor traverse of AbstractTreeVisitor to FA-based traverse (#8400)
     add 831a45e541 Ignore Failed IoTDBSnapshotTransferIT
     add 8e612b5323 [IOTDB-5201] Extracting getConfig from the registerDataNode interface (#8441)
     add d17d1e80d3 [IOTDB-5174] Use filename format such as NodeID-Index rather than Endpoint-Index to track follower sync progress (#8458)
     add 1361d28c10 add message in exception (#8449)
     add f6b3810b63 [IOTDB-5223] Check data directories cross-disk under RatisConsensus (#8469)
     add 64550d900f Perfect Cluster-Setup DOC (#8480)
     add e387cdfdd4 [IOTDB-5153] Fix dead lock in confignode (#8470)
     add 171b229695 [IOTDB-5222] Fix the load of metric related configuration (#8466)
     add 8f10abdb8b skip validating resource with file time index after compaction (#8473)
     add d426f7aaf5 Add sleep time in retry of pullAndCheckConfiguration (#8484)
     add 5126711dff [IOTDB-5209] Limit the read rate of compaction execution (#8461)
     add 752d7cf9a5 [IOTDB-4595] Add monitoring for compaction temporal files (#8414)
     add 3fbc9175bf Remove old cluster doc and update readme (#8486)
     add db7a0ef7be [IOTDB-5176] Change ratis snapshot dir with datadir  (#8489)
     add 1d76901486 [IOTDB-5125] Change default port and stop the process when port is already in use (#8442)
     add a39e06d652 [IOTDB-5225] Remove getAllMeasurement() method in ISchemaTree (#8479)
     add 510cce881c add instruction about how to allow large java file generated by Thrift in IDEA (#8490)
     add 939630c227 Fix grafana plugin CI (#8497)
     add d404c41795 [IOTDB-5121] Update registerUDF.sh and regsiterUDF.bat of library-udf (#8498)
     add 86919fb9f9 [IOTDB-5054] Fix errors in IoTDBPipeIT (#8438)
     add 263fcd40d6 Add the statistics of flush point (#8495)
     add 44fcb03428 Fix sonar check fail in IntoOperator
     add 5e37220a8a [IOTDB-5216] Fix order by timeseries doesn't take effect in aligned last query
     add a320b0280a [IOTDB-5212] Remove deprecated syntax in CQ
     add 97b10775ad Fix python ITs (#8502)
     add 483f0a5f35 [IOTDB-5117] Introduce MemoryDistributionCalculator for FragmentInstance (#8485)
     add 5965a7f10f Keep Session interface compatible (#8504)
     add 43319883cb [IOTDB-5233] Correct the message of unsupported thrift interface of schema template (#8506)
     add 4a59a2c914 [IOTDB-4816] Show Queries - support antlrParse & analyze process (#8467)
     add 688e1fed9c IoTDBClusterRegionLeaderBalancingIT (#8514)
     add aaf420318d [IOTDB-5224] SchemaRegion UT Framework (#8516)
     add b9033dcb5e [IOTDB-5236] Fix DeleteData Python API cannot work (#8511)
     add df6c60916d [IOTDB-5239] UT related to delete timeseries (#8522)
     add 968ff58e08 [IOTDB-5242] UT related to MetaUtils (#8521)
     add 3ed2d7349c Delete stale query code (#8478)
     new 25270fba30 Merge remote-tracking branch 'origin/master' into lmh/addQueryMetrics
     new 03c0c8195a spotless apply

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/main-unix.yml                    |    2 +-
 .github/workflows/main-win.yml                     |    2 +-
 .gitignore                                         |    3 +
 Jenkinsfile                                        |    2 +-
 README.md                                          |   48 +-
 README_ZH.md                                       |   52 +-
 .../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 |    6 +-
 .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4   |   18 +-
 .../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4  |   20 +-
 cli/src/assembly/resources/sbin/start-cli.bat      |    2 +-
 cli/src/assembly/resources/sbin/start-cli.sh       |    2 -
 client-py/iotdb/Session.py                         |   26 +-
 client-py/iotdb/utils/IoTDBRpcDataSet.py           |    2 +-
 client-py/tests/test_delete_data.py                |  162 ++
 .../assembly/resources/sbin/start-confignode.bat   |   55 +-
 .../assembly/resources/sbin/start-confignode.sh    |   22 +-
 .../assembly/resources/sbin/stop-confignode.bat    |    5 +-
 .../src/assembly/resources/sbin/stop-confignode.sh |   19 +-
 .../consensus/response/ConfigurationResp.java      |   66 +
 .../consensus/response/DataNodeRegisterResp.java   |   23 -
 .../iotdb/confignode/manager/ConfigManager.java    |   27 +
 .../iotdb/confignode/manager/ConsensusManager.java |    2 +-
 .../apache/iotdb/confignode/manager/IManager.java  |   10 +
 .../iotdb/confignode/manager/node/NodeManager.java |   21 +-
 .../persistence/executor/ConfigPlanExecutor.java   |    9 +-
 .../thrift/ConfigNodeRPCServiceProcessor.java      |   26 +-
 .../apache/iotdb/consensus/config/RatisConfig.java |   45 +-
 .../exception/RatisRequestFailedException.java     |    7 +-
 .../apache/iotdb/consensus/iot/IoTConsensus.java   |    6 +-
 .../consensus/iot/IoTConsensusServerImpl.java      |   27 +-
 .../iot/logdispatcher/IndexController.java         |   43 +-
 .../consensus/iot/logdispatcher/LogDispatcher.java |    3 +-
 .../apache/iotdb/consensus/ratis/RatisClient.java  |    6 +-
 .../iotdb/consensus/ratis/RatisConsensus.java      |   10 +-
 .../{IoTConsensusTest.java => ReplicateTest.java}  |    4 +-
 .../iot/{RecoveryTest.java => StabilityTest.java}  |   54 +-
 .../iot/logdispatcher/IndexControllerTest.java     |   37 +-
 .../iot/logdispatcher/SyncStatusTest.java          |   15 +-
 .../iotdb/consensus/iot/util/TestStateMachine.java |    2 +-
 .../iotdb/consensus/ratis/RatisConsensusTest.java  |   15 +-
 docker/ReadMe.md                                   |   30 +-
 docker/src/main/DockerCompose/do-docker-build.sh   |  134 +
 .../src/main/DockerCompose/docker-compose-1c1d.yml |   40 +-
 .../DockerCompose/docker-compose-cluster-1c2d.yml  |   69 +
 .../DockerCompose/docker-compose-cluster-3c3d.yml  |   60 +
 .../DockerCompose/docker-compose-host-3c3d.yml     |   58 +
 .../src/main/DockerCompose/entrypoint.sh           |   54 +-
 .../main/DockerCompose/replace-conf-from-env.sh    |   64 +
 .../src/main/Dockerfile-1.0.0-1c1d                 |   55 +-
 docker/src/main/Dockerfile-1.0.0-confignode        |   54 +
 docker/src/main/Dockerfile-1.0.0-datanode          |   56 +
 docs/Development/ContributeGuide.md                |   28 +-
 docs/UserGuide/Cluster/Cluster-Setup.md            |  545 ++--
 docs/UserGuide/Monitor-Alert/Metric-Tool.md        |  372 +--
 docs/UserGuide/Query-Data/Align-By.md              |    7 +-
 docs/UserGuide/Query-Data/Order-By.md              |  111 +-
 docs/UserGuide/Query-Data/Overview.md              |    3 +-
 docs/UserGuide/QuickStart/ClusterQuickStart.md     |  183 ++
 docs/UserGuide/QuickStart/WayToGetIoTDB.md         |  175 +-
 docs/UserGuide/Reference/Common-Config-Manual.md   |   16 +-
 docs/UserGuide/Write-Data/Write-Data.md            |    2 +-
 docs/zh/Development/ContributeGuide.md             |   11 -
 docs/zh/UserGuide/Cluster/Cluster-Setup.md         |  534 ++--
 docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md     |  311 +--
 docs/zh/UserGuide/Query-Data/Align-By.md           |    4 +
 docs/zh/UserGuide/Query-Data/Order-By.md           |  109 +-
 docs/zh/UserGuide/Query-Data/Overview.md           |    7 +-
 docs/zh/UserGuide/QuickStart/ClusterQuickStart.md  |  180 ++
 docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md      |  182 +-
 .../zh/UserGuide/Reference/Common-Config-Manual.md |   16 +-
 docs/zh/UserGuide/Write-Data/Write-Data.md         |    2 +-
 .../apache/iotdb/trigger/old/TriggerExample.java   |  147 --
 grafana-plugin/backend-compile.sh                  |    4 +-
 integration-test/import-control.xml                |    2 +
 integration-test/pom.xml                           |   19 +-
 .../java/org/apache/iotdb/it/env/AbstractEnv.java  |   54 +
 .../apache/iotdb/it/env/AbstractNodeWrapper.java   |    4 +-
 .../java/org/apache/iotdb/it/env/MppConfig.java    |    9 +-
 .../org/apache/iotdb/it/env/RemoteServerEnv.java   |   25 +
 .../org/apache/iotdb/itbase/env/BaseConfig.java    |    8 +-
 .../java/org/apache/iotdb/itbase/env/BaseEnv.java  |   10 +
 .../org/apache/iotdb/cli/it/AbstractScript.java    |  105 +
 .../apache/iotdb/cli/it}/StartClientScriptIT.java  |   71 +-
 .../confignode/it/IoTDBClusterAuthorityIT.java     |   62 +-
 .../it/IoTDBClusterRegionLeaderBalancingIT.java    |   25 +-
 .../confignode/it/IoTDBConfigNodeSnapshotIT.java   |    7 +-
 .../confignode/it/IoTDBSnapshotTransferIT.java     |  152 ++
 .../IoTDBOrderByWithAlignByDeviceIT.java           |   90 +-
 .../org/apache/iotdb/db/it/env/StandaloneEnv.java  |   25 +
 .../apache/iotdb/db/it/groupby/IOTDBGroupByIT.java |    6 +-
 .../iotdb/db/it/query/IoTDBNullOperandIT.java      |    3 +-
 .../org/apache/iotdb/db/it/sync/IoTDBPipeIT.java   |   14 +
 .../org/apache/iotdb/db/it/udf/IoTDBUDFM4IT.java   |   45 +-
 .../apache/iotdb/libudf/it/anomaly/AnomalyIT.java  |  783 +++---
 .../apache/iotdb/libudf/it/dmatch/DMatchIT.java    |  533 ++--
 .../iotdb/libudf/it/dprofile/DProfileIT.java       |  298 +--
 .../iotdb/libudf/it/dquality/DQualityIT.java       |  203 +-
 .../apache/iotdb/libudf/it/drepair/DRepairIT.java  |  160 +-
 .../iotdb/libudf/it/frequency/FrequencyIT.java     |  180 +-
 .../apache/iotdb/libudf/it/series/SeriesIT.java    |  319 +--
 .../apache/iotdb/libudf/it/string/StringIT.java    |  124 +-
 .../src/test/resources/logback-test.xml            |    2 +-
 .../iotdb/db/integration/IoTDBAuthorizationIT.java | 1127 ---------
 .../iotdb/db/integration/IoTDBCheckConfigIT.java   |    6 +-
 .../db/integration/IoTDBEngineTimeGeneratorIT.java |  291 ---
 .../iotdb/db/integration/IoTDBSelectIntoIT.java    |  787 ------
 .../db/integration/IoTDBSequenceDataQueryIT.java   |  329 ---
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java  |  444 ----
 .../aggregation/IoTDBUDFNestAggregationIT.java     |  774 ------
 .../IoTDBUserDefinedAggregationFunctionIT.java     |  732 ------
 .../db/integration/aligned/AlignedWriteUtil.java   |  149 --
 .../db/integration/aligned/IoTDBEmptyDataIT.java   |   78 -
 .../aligned/IoTDBGroupByFillQueryBigDataIT.java    |  192 --
 .../aligned/IoTDBGroupByFillQueryIT.java           |  989 --------
 .../aligned/IoTDBLoadExternalAlignedTsFileIT.java  | 1037 --------
 .../aligned/IoTDBRawQueryWithValueFilter2IT.java   |   65 -
 .../aligned/IoTDBRawQueryWithValueFilterIT.java    |  763 ------
 ...oTDBRawQueryWithValueFilterWithDeletion2IT.java |   82 -
 ...IoTDBRawQueryWithValueFilterWithDeletionIT.java |  778 ------
 .../db/integration/groupby/IoTDBGroupByFillIT.java | 2657 --------------------
 .../groupby/IoTDBGroupByFillMixPathsIT.java        |  479 ----
 .../groupby/IoTDBGroupByFillWithRangeIT.java       |  179 --
 .../groupby/IoTDBGroupByNaturalMonthFillIT.java    |  273 --
 integration/src/test/resources/logback-test.xml    |    2 +-
 .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java   |   42 -
 .../java/org/apache/iotdb/jdbc/ListDataSet.java    |   53 -
 library-udf/pom.xml                                |   50 +-
 library-udf/src/assembly/tools/register-UDF.bat    |    1 -
 library-udf/src/assembly/tools/register-UDF.sh     |    1 -
 .../metrics/config/MetricConfigDescriptor.java     |   16 +-
 .../iotdb/metrics/config/MetricConfigTest.java     |   28 +-
 .../resources/conf/iotdb-common.properties         |    4 +-
 .../src/assembly/resources/sbin/iotdb-common.sh    |  137 +
 .../iotdb/commons/partition/ExecutorType.java      |    4 -
 .../iotdb/commons/partition/StorageExecutor.java   |   11 +-
 .../org/apache/iotdb/commons/path/fa/IFAState.java |   21 +-
 .../iotdb/commons/path/fa/IFATransition.java       |   16 +-
 .../apache/iotdb/commons/path/fa/IPatternFA.java   |   75 +
 .../apache/iotdb/commons/path/fa/SimpleNFA.java    |  522 ++++
 .../commons/path/fa/match/IStateMatchInfo.java     |   79 +
 .../commons/path/fa/match/MatchedStateSet.java     |   68 +
 .../commons/path/fa/match/StateMultiMatchInfo.java |  120 +
 .../path/fa/match/StateSingleMatchInfo.java        |  103 +
 .../commons/schema/tree/AbstractTreeVisitor.java   |  804 +++---
 .../iotdb/commons/service/metric/enums/Metric.java |    1 +
 .../iotdb/commons/service/metric/enums/Tag.java    |    1 +
 .../apache/iotdb/commons/udf/builtin/UDTFM4.java   |  272 +-
 .../metadata/rocksdb/RocksDBBenchmarkEngine.java   |  139 +-
 .../metadata/tagSchemaRegion/TagSchemaRegion.java  |    9 +-
 .../tagSchemaRegion/TagSchemaRegionTest.java       |   18 +-
 .../src/assembly/resources/sbin/start-datanode.bat |  103 +-
 .../src/assembly/resources/sbin/start-datanode.sh  |   20 +-
 .../src/assembly/resources/sbin/stop-datanode.bat  |    8 +-
 .../src/assembly/resources/sbin/stop-datanode.sh   |   16 +-
 .../org/apache/iotdb/db/auth/AuthorityChecker.java |  131 -
 .../apache/iotdb/db/auth/AuthorizerManager.java    |    7 +-
 .../iotdb/db/auth/ClusterAuthorityFetcher.java     |   10 +-
 .../iotdb/db/auth/StandaloneAuthorityFetcher.java  |  125 -
 .../apache/iotdb/db/client/ConfigNodeClient.java   |   44 +
 .../ConfigNodeClientManager.java}                  |   32 +-
 .../iotdb/db/client/DataNodeInternalClient.java    |   15 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   26 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   13 +-
 .../org/apache/iotdb/db/conf/IoTDBStartCheck.java  |   47 +-
 .../db/conf/directories/DirectoryChecker.java      |   27 +
 .../db/consensus/DataRegionConsensusImpl.java      |    2 +-
 .../db/consensus/SchemaRegionConsensusImpl.java    |    2 +-
 .../iotdb/db/engine/TsFileMetricManager.java       |   54 +-
 .../engine/compaction/CompactionTaskManager.java   |   43 +-
 .../db/engine/compaction/CompactionUtils.java      |   22 +-
 .../utils/AlignedSeriesCompactionExecutor.java     |    8 +
 .../utils/NonAlignedSeriesCompactionExecutor.java  |    2 +
 .../utils/AlignedSeriesCompactionExecutor.java     |   15 +-
 .../utils/SingleSeriesCompactionExecutor.java      |   12 +-
 .../performer/impl/FastCompactionPerformer.java    |   16 +-
 .../impl/ReadChunkCompactionPerformer.java         |   11 +
 .../impl/ReadPointCompactionPerformer.java         |   19 +
 .../writer/AbstractCompactionWriter.java           |   14 +-
 .../writer/AbstractCrossCompactionWriter.java      |    9 +
 .../writer/AbstractInnerCompactionWriter.java      |    5 +
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |   23 +-
 .../iotdb/db/engine/storagegroup/DataRegion.java   |   65 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |    2 -
 .../trigger/sink/local/LocalIoTDBHandler.java      |   94 -
 .../iotdb/db/localconfignode/LocalConfigNode.java  |    9 +-
 .../db/localconfignode/LocalDataPartitionInfo.java |    1 +
 .../localconfignode/LocalDataPartitionTable.java   |    1 +
 .../localconfignode/LocalSchemaPartitionTable.java |    1 +
 .../iotdb/db/metadata/LocalSchemaProcessor.java    |    6 +-
 .../db/metadata/cache/DataNodeSchemaCache.java     |    3 +-
 .../iotdb/db/metadata/idtable/IDTableManager.java  |   27 +-
 .../iotdb/db/metadata/logfile/MLogReader.java      |   75 -
 .../iotdb/db/metadata/logfile/MLogWriter.java      |  254 --
 .../db/metadata/schemaregion/ISchemaRegion.java    |    9 +
 .../schemaregion/SchemaRegionMemoryImpl.java       |    6 +
 .../schemaregion/SchemaRegionSchemaFileImpl.java   |    6 +
 .../storagegroup/StorageGroupLogWriter.java        |   56 -
 .../storagegroup/StorageGroupSchemaManager.java    |  126 +-
 .../iotdb/db/metadata/template/Template.java       |   53 +-
 .../apache/iotdb/db/metadata/utils/MetaUtils.java  |   35 +-
 .../db/metadata/utils/ResourceByPathUtils.java     |   34 -
 .../db/mpp/aggregation/AccumulatorFactory.java     |    2 +-
 .../SlidingWindowAggregatorFactory.java            |    2 +-
 .../db/mpp/common/header/ColumnHeaderConstant.java |   12 +
 .../db/mpp/common/header/DatasetHeaderFactory.java |    4 +
 .../mpp/common/schematree/ClusterSchemaTree.java   |    1 -
 .../common/schematree/DeviceGroupSchemaTree.java   |    5 -
 .../db/mpp/common/schematree/ISchemaTree.java      |    2 -
 .../visitor/SchemaTreeDeviceVisitor.java           |    2 +-
 .../visitor/SchemaTreeMeasurementVisitor.java      |   76 +-
 .../schematree/visitor/SchemaTreeVisitor.java      |    5 -
 .../iotdb/db/mpp/execution/driver/Driver.java      |   31 +-
 .../exchange/IMPPDataExchangeManager.java          |    2 +
 .../db/mpp/execution/exchange/ISinkHandle.java     |    3 +
 .../db/mpp/execution/exchange/ISourceHandle.java   |    3 +
 .../db/mpp/execution/exchange/LocalSinkHandle.java |   11 +-
 .../mpp/execution/exchange/LocalSourceHandle.java  |    5 +
 .../execution/exchange/MPPDataExchangeManager.java |   21 +-
 .../mpp/execution/exchange/SharedTsBlockQueue.java |   59 +-
 .../db/mpp/execution/exchange/SinkHandle.java      |   50 +-
 .../db/mpp/execution/exchange/SourceHandle.java    |   62 +-
 .../mpp/execution/memory/LocalMemoryManager.java   |    2 +-
 .../iotdb/db/mpp/execution/memory/MemoryPool.java  |  206 +-
 .../operator/process/AbstractIntoOperator.java     |   11 +-
 .../process/last/LastQuerySortOperator.java        |   56 +-
 .../apache/iotdb/db/mpp/plan/analyze/Analysis.java |   20 +-
 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  |  211 +-
 .../apache/iotdb/db/mpp/plan/analyze/Analyzer.java |   10 +-
 .../db/mpp/plan/analyze/ExpressionAnalyzer.java    |   70 +
 .../iotdb/db/mpp/plan/analyze/SchemaValidator.java |    6 +-
 .../plan/analyze/StandalonePartitionFetcher.java   |  252 --
 .../mpp/plan/analyze/StandaloneSchemaFetcher.java  |  227 --
 .../db/mpp/plan/execution/QueryExecution.java      |   27 +-
 .../mpp/plan/execution/config/ConfigExecution.java |    7 +-
 .../executor/StandaloneConfigTaskExecutor.java     |  728 ------
 .../plan/execution/memory/MemorySourceHandle.java  |    3 +
 .../iotdb/db/mpp/plan/expression/Expression.java   |   27 -
 .../iotdb/db/mpp/plan/expression/ResultColumn.java |   61 -
 .../plan/expression/binary/BinaryExpression.java   |   96 -
 .../mpp/plan/expression/leaf/ConstantOperand.java  |   26 -
 .../db/mpp/plan/expression/leaf/NullOperand.java   |   27 -
 .../plan/expression/leaf/TimeSeriesOperand.java    |   31 -
 .../mpp/plan/expression/leaf/TimestampOperand.java |   27 -
 .../plan/expression/multi/FunctionExpression.java  |   49 -
 .../plan/expression/ternary/TernaryExpression.java |   50 -
 .../mpp/plan/expression/unary/UnaryExpression.java |   37 -
 .../iotdb/db/mpp/plan/parser/ASTVisitor.java       |   92 +-
 .../db/mpp/plan/planner/LocalExecutionPlanner.java |   30 +
 .../db/mpp/plan/planner/LogicalPlanBuilder.java    |    8 +-
 .../db/mpp/plan/planner/LogicalPlanVisitor.java    |    9 +
 .../plan/planner/MemoryDistributionCalculator.java |  490 ++++
 .../db/mpp/plan/planner/OperatorTreeGenerator.java |    6 +-
 .../planner/distribution/ExchangeNodeAdder.java    |    6 +-
 .../distribution/WriteFragmentParallelPlanner.java |    4 +-
 .../plan/node/process/SingleDeviceViewNode.java    |   59 +-
 .../plan/parameter/AggregationDescriptor.java      |    1 -
 .../planner/plan/parameter}/AggregationType.java   |    2 +-
 .../db/mpp/plan/scheduler/StandaloneScheduler.java |  222 --
 .../iotdb/db/mpp/plan/statement/AuthorType.java    |  122 +
 .../db/mpp/plan/statement/StatementVisitor.java    |    5 +
 .../db/mpp/plan/statement/component/SortKey.java   |    6 +-
 .../db/mpp/plan/statement/crud/QueryStatement.java |   15 +-
 .../db/mpp/plan/statement/sys/AuthorStatement.java |   12 +-
 .../plan/statement/sys/ShowQueriesStatement.java   |   74 +
 .../mpp/transformation/dag/builder/DAGBuilder.java |  116 -
 .../dag/input/QueryDataSetInputLayer.java          |   41 -
 .../protocol/influxdb/util/QueryResultUtils.java   |   90 -
 .../iotdb/db/protocol/mqtt/MPPPublishHandler.java  |   11 +-
 .../protocol/rest/impl/GrafanaApiServiceImpl.java  |   11 +-
 .../db/protocol/rest/impl/RestApiServiceImpl.java  |   11 +-
 .../main/java/org/apache/iotdb/db/qp/Planner.java  |  154 --
 .../apache/iotdb/db/qp/executor/IPlanExecutor.java |   55 -
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  946 -------
 .../org/apache/iotdb/db/qp/logical/Operator.java   |   13 -
 .../qp/logical/crud/AggregationQueryOperator.java  |  155 --
 .../db/qp/logical/crud/DeleteDataOperator.java     |   73 -
 .../db/qp/logical/crud/FillClauseComponent.java    |   49 -
 .../db/qp/logical/crud/FillQueryOperator.java      |   92 -
 .../db/qp/logical/crud/GroupByClauseComponent.java |   92 -
 .../logical/crud/GroupByFillClauseComponent.java   |   49 -
 .../qp/logical/crud/GroupByFillQueryOperator.java  |   80 -
 .../db/qp/logical/crud/GroupByQueryOperator.java   |  111 -
 .../iotdb/db/qp/logical/crud/InOperator.java       |  212 --
 .../iotdb/db/qp/logical/crud/InsertOperator.java   |   90 -
 .../db/qp/logical/crud/LastQueryOperator.java      |   64 -
 .../iotdb/db/qp/logical/crud/LikeOperator.java     |  134 -
 .../iotdb/db/qp/logical/crud/QueryOperator.java    |  421 ----
 .../iotdb/db/qp/logical/crud/RegexpOperator.java   |  133 -
 .../db/qp/logical/crud/SelectIntoOperator.java     |  133 -
 .../db/qp/logical/crud/UDAFQueryOperator.java      |  179 --
 .../db/qp/logical/crud/UDTFQueryOperator.java      |   48 -
 .../qp/logical/sys/ActivateTemplateOperator.java   |   51 -
 .../db/qp/logical/sys/AlterTimeSeriesOperator.java |  116 -
 .../iotdb/db/qp/logical/sys/AuthorOperator.java    |  233 --
 .../db/qp/logical/sys/ClearCacheOperator.java      |   39 -
 .../iotdb/db/qp/logical/sys/CountOperator.java     |   73 -
 .../sys/CreateAlignedTimeSeriesOperator.java       |  184 --
 .../logical/sys/CreateContinuousQueryOperator.java |  108 -
 .../db/qp/logical/sys/CreateFunctionOperator.java  |   59 -
 .../db/qp/logical/sys/CreateIndexOperator.java     |   84 -
 .../db/qp/logical/sys/CreatePipeOperator.java      |   61 -
 .../db/qp/logical/sys/CreatePipeSinkOperator.java  |   54 -
 .../db/qp/logical/sys/CreateTemplateOperator.java  |  108 -
 .../qp/logical/sys/CreateTimeSeriesOperator.java   |  127 -
 .../iotdb/db/qp/logical/sys/DataAuthOperator.java  |   51 -
 .../db/qp/logical/sys/DeletePartitionOperator.java |   61 -
 .../qp/logical/sys/DeleteStorageGroupOperator.java |   50 -
 .../qp/logical/sys/DeleteTimeSeriesOperator.java   |   51 -
 .../logical/sys/DropContinuousQueryOperator.java   |   50 -
 .../db/qp/logical/sys/DropFunctionOperator.java    |   50 -
 .../iotdb/db/qp/logical/sys/DropIndexOperator.java |   65 -
 .../iotdb/db/qp/logical/sys/DropPipeOperator.java  |   44 -
 .../db/qp/logical/sys/DropPipeSinkOperator.java    |   43 -
 .../db/qp/logical/sys/DropTemplateOperator.java    |   49 -
 .../iotdb/db/qp/logical/sys/FlushOperator.java     |   62 -
 .../iotdb/db/qp/logical/sys/KillQueryOperator.java |   52 -
 .../qp/logical/sys/LoadConfigurationOperator.java  |   52 -
 .../iotdb/db/qp/logical/sys/LoadDataOperator.java  |   54 -
 .../iotdb/db/qp/logical/sys/LoadFilesOperator.java |   92 -
 .../iotdb/db/qp/logical/sys/MergeOperator.java     |   44 -
 .../db/qp/logical/sys/RemoveFileOperator.java      |   49 -
 .../db/qp/logical/sys/SetStorageGroupOperator.java |   48 -
 .../db/qp/logical/sys/SetSystemModeOperator.java   |   54 -
 .../iotdb/db/qp/logical/sys/SetTTLOperator.java    |   61 -
 .../db/qp/logical/sys/SetTemplateOperator.java     |   65 -
 .../iotdb/db/qp/logical/sys/SettleOperator.java    |   71 -
 .../db/qp/logical/sys/ShowChildNodesOperator.java  |   47 -
 .../db/qp/logical/sys/ShowChildPathsOperator.java  |   47 -
 .../db/qp/logical/sys/ShowDevicesOperator.java     |   73 -
 .../db/qp/logical/sys/ShowFunctionsOperator.java   |   38 -
 .../logical/sys/ShowNodesInTemplateOperator.java   |   43 -
 .../iotdb/db/qp/logical/sys/ShowOperator.java      |   64 -
 .../logical/sys/ShowPathsSetTemplateOperator.java  |   43 -
 .../sys/ShowPathsUsingTemplateOperator.java        |   43 -
 .../iotdb/db/qp/logical/sys/ShowPipeOperator.java  |   45 -
 .../db/qp/logical/sys/ShowPipeSinkOperator.java    |   45 -
 .../qp/logical/sys/ShowPipeSinkTypeOperator.java   |   38 -
 .../qp/logical/sys/ShowQueryResourceOperate.java   |   39 -
 .../qp/logical/sys/ShowStorageGroupOperator.java   |   47 -
 .../iotdb/db/qp/logical/sys/ShowTTLOperator.java   |   48 -
 .../db/qp/logical/sys/ShowTemplatesOperator.java   |   27 -
 .../db/qp/logical/sys/ShowTimeSeriesOperator.java  |  103 -
 .../db/qp/logical/sys/ShowTriggersOperator.java    |   38 -
 .../iotdb/db/qp/logical/sys/StartPipeOperator.java |   44 -
 .../iotdb/db/qp/logical/sys/StopPipeOperator.java  |   44 -
 .../iotdb/db/qp/logical/sys/TracingOperator.java   |   46 -
 .../iotdb/db/qp/logical/sys/UnSetTTLOperator.java  |   52 -
 .../db/qp/logical/sys/UnloadFileOperator.java      |   55 -
 .../db/qp/logical/sys/UnsetTemplateOperator.java   |   65 -
 .../org/apache/iotdb/db/qp/physical/BatchPlan.java |   73 -
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |  253 --
 .../iotdb/db/qp/physical/crud/AggregationPlan.java |  226 --
 .../db/qp/physical/crud/AlignByDevicePlan.java     |  285 ---
 .../iotdb/db/qp/physical/crud/FillQueryPlan.java   |   61 -
 .../db/qp/physical/crud/GroupByTimeFillPlan.java   |  118 -
 .../iotdb/db/qp/physical/crud/GroupByTimePlan.java |  138 -
 .../iotdb/db/qp/physical/crud/LastQueryPlan.java   |   87 -
 .../iotdb/db/qp/physical/crud/MeasurementInfo.java |   62 -
 .../iotdb/db/qp/physical/crud/QueryIndexPlan.java  |   88 -
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |  255 --
 .../db/qp/physical/crud/RawDataQueryPlan.java      |  217 --
 .../iotdb/db/qp/physical/crud/SelectIntoPlan.java  |  130 -
 .../apache/iotdb/db/qp/physical/crud/UDAFPlan.java |   81 -
 .../apache/iotdb/db/qp/physical/crud/UDFPlan.java  |   43 -
 .../apache/iotdb/db/qp/physical/crud/UDTFPlan.java |  149 --
 .../sys/ActivateTemplateInClusterPlan.java         |  127 -
 .../db/qp/physical/sys/ActivateTemplatePlan.java   |   87 -
 .../db/qp/physical/sys/AlterTimeSeriesPlan.java    |  212 --
 .../db/qp/physical/sys/AppendTemplatePlan.java     |  218 --
 .../iotdb/db/qp/physical/sys/AuthorPlan.java       |  406 ---
 .../qp/physical/sys/AutoCreateDeviceMNodePlan.java |   89 -
 .../iotdb/db/qp/physical/sys/ChangeAliasPlan.java  |  116 -
 .../db/qp/physical/sys/ChangeTagOffsetPlan.java    |  116 -
 .../iotdb/db/qp/physical/sys/ClearCachePlan.java   |   55 -
 .../apache/iotdb/db/qp/physical/sys/CountPlan.java |   53 -
 .../physical/sys/CreateAlignedTimeSeriesPlan.java  |   66 -
 .../qp/physical/sys/CreateContinuousQueryPlan.java |  156 --
 .../db/qp/physical/sys/CreateFunctionPlan.java     |   81 -
 .../iotdb/db/qp/physical/sys/CreateIndexPlan.java  |  180 --
 .../qp/physical/sys/CreateMultiTimeSeriesPlan.java |  398 ---
 .../db/qp/physical/sys/CreateTemplatePlan.java     |  516 ----
 .../db/qp/physical/sys/CreateTimeSeriesPlan.java   |   35 -
 .../iotdb/db/qp/physical/sys/DataAuthPlan.java     |  100 -
 .../db/qp/physical/sys/DeleteStorageGroupPlan.java |   84 -
 .../db/qp/physical/sys/DeleteTimeSeriesPlan.java   |  139 -
 .../qp/physical/sys/DropContinuousQueryPlan.java   |   63 -
 .../iotdb/db/qp/physical/sys/DropFunctionPlan.java |   69 -
 .../iotdb/db/qp/physical/sys/DropIndexPlan.java    |  129 -
 .../iotdb/db/qp/physical/sys/DropTemplatePlan.java |   78 -
 .../apache/iotdb/db/qp/physical/sys/FlushPlan.java |  244 --
 .../iotdb/db/qp/physical/sys/KillQueryPlan.java    |   45 -
 .../db/qp/physical/sys/LoadConfigurationPlan.java  |  144 --
 .../iotdb/db/qp/physical/sys/LoadDataPlan.java     |   73 -
 .../apache/iotdb/db/qp/physical/sys/LogPlan.java   |   75 -
 .../apache/iotdb/db/qp/physical/sys/MNodePlan.java |  116 -
 .../db/qp/physical/sys/MeasurementMNodePlan.java   |  154 --
 .../apache/iotdb/db/qp/physical/sys/MergePlan.java |   59 -
 .../iotdb/db/qp/physical/sys/OperateFilePlan.java  |  119 -
 .../qp/physical/sys/PreDeleteTimeSeriesPlan.java   |   80 -
 .../db/qp/physical/sys/PruneTemplatePlan.java      |  107 -
 .../sys/RollbackPreDeleteTimeSeriesPlan.java       |   81 -
 .../db/qp/physical/sys/SetStorageGroupPlan.java    |  100 -
 .../db/qp/physical/sys/SetSystemModePlan.java      |   76 -
 .../iotdb/db/qp/physical/sys/SetTTLPlan.java       |  102 -
 .../iotdb/db/qp/physical/sys/SetTemplatePlan.java  |  107 -
 .../iotdb/db/qp/physical/sys/SettlePlan.java       |   65 -
 .../db/qp/physical/sys/ShowChildNodesPlan.java     |   39 -
 .../db/qp/physical/sys/ShowChildPathsPlan.java     |   39 -
 .../qp/physical/sys/ShowContinuousQueriesPlan.java |   27 -
 .../iotdb/db/qp/physical/sys/ShowDevicesPlan.java  |   10 -
 .../db/qp/physical/sys/ShowFunctionsPlan.java      |   27 -
 .../iotdb/db/qp/physical/sys/ShowLockInfoPlan.java |   36 -
 .../qp/physical/sys/ShowNodesInTemplatePlan.java   |   34 -
 .../qp/physical/sys/ShowPathsSetTemplatePlan.java  |   34 -
 .../physical/sys/ShowPathsUsingTemplatePlan.java   |   34 -
 .../qp/physical/sys/ShowQueryProcesslistPlan.java  |   26 -
 .../db/qp/physical/sys/ShowQueryResourcePlan.java  |   38 -
 .../db/qp/physical/sys/ShowStorageGroupPlan.java   |   36 -
 .../iotdb/db/qp/physical/sys/ShowTTLPlan.java      |   42 -
 .../db/qp/physical/sys/ShowTemplatesPlan.java      |   27 -
 .../db/qp/physical/sys/ShowTimeSeriesPlan.java     |   14 -
 .../iotdb/db/qp/physical/sys/ShowTriggersPlan.java |   27 -
 .../db/qp/physical/sys/StorageGroupMNodePlan.java  |  110 -
 .../iotdb/db/qp/physical/sys/TracingPlan.java      |   45 -
 .../db/qp/physical/sys/UnsetTemplatePlan.java      |  109 -
 .../iotdb/db/qp/strategy/LogicalChecker.java       |   46 -
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |  131 -
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |   59 -
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |  408 ---
 .../qp/strategy/optimizer/DnfFilterOptimizer.java  |  163 --
 .../db/qp/strategy/optimizer/IFilterOptimizer.java |   29 -
 .../qp/strategy/optimizer/ILogicalOptimizer.java   |   30 -
 .../optimizer/MergeSingleFilterOptimizer.java      |  179 --
 .../qp/strategy/optimizer/RemoveNotOptimizer.java  |  104 -
 .../iotdb/db/qp/utils/EmptyOutputStream.java       |   35 -
 .../apache/iotdb/db/qp/utils/WildcardsRemover.java |  149 --
 .../db/query/aggregation/AggregateResult.java      |  377 ---
 .../db/query/aggregation/impl/AvgAggrResult.java   |  222 --
 .../db/query/aggregation/impl/CountAggrResult.java |  122 -
 .../query/aggregation/impl/ExtremeAggrResult.java  |  175 --
 .../aggregation/impl/FirstValueAggrResult.java     |  141 --
 .../aggregation/impl/FirstValueDescAggrResult.java |   88 -
 .../aggregation/impl/LastValueAggrResult.java      |  131 -
 .../aggregation/impl/LastValueDescAggrResult.java  |  110 -
 .../query/aggregation/impl/MaxTimeAggrResult.java  |  119 -
 .../aggregation/impl/MaxTimeDescAggrResult.java    |   92 -
 .../query/aggregation/impl/MaxValueAggrResult.java |  126 -
 .../query/aggregation/impl/MinTimeAggrResult.java  |  134 -
 .../aggregation/impl/MinTimeDescAggrResult.java    |   76 -
 .../query/aggregation/impl/MinValueAggrResult.java |  124 -
 .../db/query/aggregation/impl/SumAggrResult.java   |  172 --
 .../iotdb/db/query/context/QueryContext.java       |    9 -
 .../db/query/control/QueryResourceManager.java     |   98 +-
 .../iotdb/db/query/control/QueryTimeManager.java   |  151 --
 .../iotdb/db/query/control/SessionManager.java     |   40 -
 .../db/query/control/tracing/TracingConstant.java  |   30 -
 .../db/query/control/tracing/TracingInfo.java      |  164 --
 .../db/query/control/tracing/TracingManager.java   |   88 -
 .../db/query/dataset/AlignByDeviceDataSet.java     |  281 ---
 .../db/query/dataset/DirectAlignByTimeDataSet.java |   34 -
 .../db/query/dataset/DirectNonAlignDataSet.java    |   32 -
 .../apache/iotdb/db/query/dataset/ListDataSet.java |   61 -
 .../db/query/dataset/NonAlignEngineDataSet.java    |  353 ---
 .../dataset/RawQueryDataSetWithValueFilter.java    |  264 --
 .../dataset/RawQueryDataSetWithoutValueFilter.java |  728 ------
 .../query/dataset/ShowContinuousQueriesResult.java |   75 -
 .../apache/iotdb/db/query/dataset/ShowDataSet.java |   69 -
 .../iotdb/db/query/dataset/ShowDevicesDataSet.java |   86 -
 .../db/query/dataset/ShowTimeseriesDataSet.java    |  109 -
 .../iotdb/db/query/dataset/SingleDataSet.java      |   56 -
 .../iotdb/db/query/dataset/UDFInputDataSet.java    |   67 -
 .../UDFRawQueryInputDataSetWithoutValueFilter.java |   68 -
 .../db/query/dataset/UDTFAlignByTimeDataSet.java   |  373 ---
 .../apache/iotdb/db/query/dataset/UDTFDataSet.java |  145 --
 .../db/query/dataset/UDTFNonAlignDataSet.java      |  216 --
 .../query/dataset/groupby/GroupByFillDataSet.java  |  340 ---
 .../query/dataset/groupby/GroupByLevelDataSet.java |   93 -
 .../query/dataset/groupby/GroupByTimeDataSet.java  |  165 --
 .../dataset/groupby/GroupByTimeEngineDataSet.java  |   93 -
 .../groupby/GroupByWithValueFilterDataSet.java     |  234 --
 .../groupby/GroupByWithoutValueFilterDataSet.java  |  161 --
 .../db/query/executor/AggregationExecutor.java     |  706 ------
 .../iotdb/db/query/executor/FillQueryExecutor.java |  206 --
 .../iotdb/db/query/executor/IQueryRouter.java      |   74 -
 .../iotdb/db/query/executor/LastQueryExecutor.java |  285 ---
 .../iotdb/db/query/executor/QueryRouter.java       |  274 --
 .../db/query/executor/RawDataQueryExecutor.java    |  185 --
 .../iotdb/db/query/executor/UDFQueryExecutor.java  |  112 -
 .../executor/fill/AlignedLastPointReader.java      |   58 -
 .../apache/iotdb/db/query/executor/fill/IFill.java |  150 --
 .../db/query/executor/fill/LastPointReader.java    |  266 --
 .../iotdb/db/query/executor/fill/LinearFill.java   |  263 --
 .../iotdb/db/query/executor/fill/PreviousFill.java |  138 -
 .../iotdb/db/query/executor/fill/ValueFill.java    |  152 --
 .../executor/groupby/AlignedGroupByExecutor.java   |   37 -
 .../db/query/executor/groupby/GroupByExecutor.java |   40 -
 .../groupby/SlidingWindowGroupByExecutor.java      |   66 -
 .../SlidingWindowGroupByExecutorFactory.java       |  117 -
 .../EmptyQueueSlidingWindowGroupByExecutor.java    |   51 -
 .../groupby/impl/LocalAlignedGroupByExecutor.java  |  366 ---
 .../groupby/impl/LocalGroupByExecutor.java         |  367 ---
 ...MonotonicQueueSlidingWindowGroupByExecutor.java |   73 -
 .../NormalQueueSlidingWindowGroupByExecutor.java   |   61 -
 .../SmoothQueueSlidingWindowGroupByExecutor.java   |   55 -
 .../db/query/externalsort/ExternalSortJob.java     |   43 -
 .../query/externalsort/ExternalSortJobEngine.java  |   52 -
 .../db/query/externalsort/ExternalSortJobPart.java |   43 -
 .../externalsort/ExternalSortJobScheduler.java     |   40 -
 .../iotdb/db/query/externalsort/LineMerger.java    |   55 -
 .../MultiSourceExternalSortJobPart.java            |   50 -
 .../externalsort/SimpleExternalSortEngine.java     |  178 --
 .../SingleSourceExternalSortJobPart.java           |   39 -
 .../adapter/ByTimestampReaderAdapter.java          |   73 -
 .../serialize/IExternalSortFileDeserializer.java   |   32 -
 .../serialize/IExternalSortFileSerializer.java     |   30 -
 .../FixLengthIExternalSortFileDeserializer.java    |  267 --
 .../impl/FixLengthTimeValuePairSerializer.java     |  169 --
 .../db/query/factory/AggregateResultFactory.java   |  150 --
 .../iotdb/db/query/pool/QueryTaskManager.java      |   90 -
 .../db/query/pool/RawQueryReadTaskPoolManager.java |  104 -
 .../pool/RawQueryReadTaskPoolManagerMetrics.java   |   92 -
 .../db/query/reader/chunk/ChunkDataIterator.java   |   79 -
 .../db/query/reader/chunk/ChunkReaderWrap.java     |   95 -
 .../reader/chunk/DiskChunkReaderByTimestamp.java   |   82 -
 .../resource/CachedUnseqResourceMergeReader.java   |   43 -
 .../series/AlignedSeriesAggregateReader.java       |  189 --
 .../reader/series/BaseManagedSeriesReader.java     |   45 -
 .../db/query/reader/series/IAggregateReader.java   |   57 -
 .../db/query/reader/series/IReaderByTimestamp.java |   47 -
 .../query/reader/series/ManagedSeriesReader.java   |   37 -
 .../query/reader/series/SeriesAggregateReader.java |  175 --
 .../reader/series/SeriesRawDataBatchReader.java    |   63 +-
 .../reader/series/SeriesRawDataPointReader.java    |   87 -
 .../iotdb/db/query/reader/series/SeriesReader.java |   51 -
 .../reader/series/SeriesReaderByTimestamp.java     |  189 --
 .../reader/universal/PriorityMergeReader.java      |   10 -
 .../query/timegenerator/ServerTimeGenerator.java   |  182 --
 .../java/org/apache/iotdb/db/service/DataNode.java |   98 +-
 .../db/service/DataNodeServerCommandLine.java      |    2 +-
 .../java/org/apache/iotdb/db/service/IoTDB.java    |  251 --
 .../org/apache/iotdb/db/service/IoTDBMBean.java    |   27 -
 .../apache/iotdb/db/service/IoTDBShutdownHook.java |   16 +-
 .../java/org/apache/iotdb/db/service/NewIoTDB.java |  232 --
 .../org/apache/iotdb/db/service/NewIoTDBMBean.java |   28 -
 .../iotdb/db/service/basic/ServiceProvider.java    |  100 -
 .../service/basic/StandaloneServiceProvider.java   |   55 -
 .../iotdb/db/service/metrics/FileMetrics.java      |   97 +
 .../db/service/metrics/IoTDBInternalReporter.java  |   11 +-
 .../service/thrift/impl/ClientRPCServiceImpl.java  |  153 +-
 .../impl/DataNodeInternalRPCServiceImpl.java       |   17 +-
 .../db/service/thrift/impl/TSServiceImpl.java      | 1424 -----------
 .../iotdb/db/sync/pipedata/load/ILoader.java       |   15 +-
 .../db/sync/sender/manager/LocalSyncManager.java   |   21 +-
 .../apache/iotdb/db/tools/TsFileSketchTool.java    |    5 +
 .../java/org/apache/iotdb/db/utils/QueryUtils.java |   34 -
 .../org/apache/iotdb/db/utils/SchemaUtils.java     |   72 +-
 .../iotdb/db/utils/writelog/BatchLogReader.java    |   83 -
 .../apache/iotdb/db/utils/writelog/ILogReader.java |   50 -
 .../apache/iotdb/db/utils/writelog/LogWriter.java  |   19 +-
 .../db/utils/writelog/MultiFileLogReader.java      |   76 -
 .../db/utils/writelog/SingleFileLogReader.java     |  166 --
 .../apache/iotdb/db/auth/AuthorityCheckerTest.java |  264 --
 .../iotdb/db/engine/MetadataManagerHelper.java     |    6 +-
 .../iotdb/db/engine/cache/ChunkCacheTest.java      |   17 -
 .../engine/compaction/CompactionSchedulerTest.java |   33 +-
 .../CompactionSchedulerWithFastPerformerTest.java  |   36 +-
 .../compaction/TestUtilsForAlignedSeries.java      |   30 +-
 ...eCompactionWithFastPerformerValidationTest.java |  100 +
 .../db/engine/compaction/cross/MergeTest.java      |   22 +-
 .../inner/AbstractInnerSpaceCompactionTest.java    |   22 +-
 .../inner/FastCompactionPerformerAlignedTest.java  |    6 +-
 .../InnerSeqCompactionWithFastPerformerTest.java   |   15 -
 ...nerSeqCompactionWithReadChunkPerformerTest.java |   22 +-
 .../InnerUnseqCompactionWithFastPerformerTest.java |   17 -
 ...rUnseqCompactionWithReadPointPerformerTest.java |   22 +-
 .../ReadChunkCompactionPerformerAlignedTest.java   |    6 +-
 .../inner/sizetiered/SizeTieredCompactionTest.java |   22 +-
 .../recover/SizeTieredCompactionRecoverTest.java   |   22 +-
 .../compaction/utils/CompactionConfigRestorer.java |   15 +-
 .../db/engine/storagegroup/DataRegionTest.java     |   13 -
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   30 +-
 .../engine/storagegroup/TsFileProcessorTest.java   |    2 -
 .../LocalConfigNodeMultiDataRegionTest.java        |   94 -
 .../apache/iotdb/db/metadata/MetaUtilsTest.java    |   90 +
 .../iotdb/db/metadata/SchemaAdvancedTest.java      |    3 +-
 .../apache/iotdb/db/metadata/SchemaBasicTest.java  | 1295 ----------
 .../iotdb/db/metadata/SchemaImproveTest.java       |    9 +-
 .../org/apache/iotdb/db/metadata/TemplateTest.java |  180 --
 .../db/metadata/cache/DataNodeSchemaCacheTest.java |    6 +-
 .../iotdb/db/metadata/idtable/IDTableTest.java     |   12 +-
 .../db/metadata/mtree/disk/MemManagerTest.java     |    3 +-
 .../db/metadata/multimode/SchemaDiskModeTest.java  |   42 -
 .../metadata/multimode/SchemaFullMemoryTest.java   |   29 -
 .../metadata/multimode/SchemaMemoryModeTest.java   |   35 -
 .../db/metadata/multimode/SchemaNonMemoryTest.java |   29 -
 .../multimode/SchemaPartialMemoryTest.java         |   28 -
 .../plan/SchemaRegionPlanCompatibilityTest.java    |  279 --
 .../schemaRegion/AbstractSchemaRegionTest.java     |  141 ++
 .../schemaRegion/SchemaRegionAliasAndTagTest.java} |   15 +-
 .../schemaRegion/SchemaRegionBasicTest.java        |  320 +--
 .../schemaRegion/SchemaRegionManagementTest.java   |  161 ++
 .../schemaRegion/SchemaRegionTemplateTest.java     |  185 ++
 .../multimode/SchemaRegionFullMemoryTest.java      |   43 -
 .../multimode/SchemaRegionMemoryTest.java          |   46 -
 .../multimode/SchemaRegionNonMemoryTest.java       |   43 -
 .../multimode/SchemaRegionPartialMemoryTest.java   |   43 -
 .../multimode/SchemaRegionSchemaFileTest.java      |   46 -
 .../iotdb/db/mpp/aggregation/AccumulatorTest.java  |    2 +-
 .../execution/exchange/LocalSinkHandleTest.java    |   63 +-
 .../execution/exchange/LocalSourceHandleTest.java  |    4 +-
 .../execution/exchange/SharedTsBlockQueueTest.java |    5 +-
 .../db/mpp/execution/exchange/SinkHandleTest.java  |   77 +-
 .../mpp/execution/exchange/SourceHandleTest.java   |   10 +-
 .../db/mpp/execution/exchange/StubSinkHandle.java  |    3 +
 .../iotdb/db/mpp/execution/exchange/Utils.java     |   52 +-
 .../db/mpp/execution/memory/MemoryPoolTest.java    |  182 +-
 .../operator/AggregationOperatorTest.java          |    2 +-
 .../AlignedSeriesAggregationScanOperatorTest.java  |    2 +-
 .../execution/operator/AlignedSeriesTestUtil.java  |   86 +-
 .../mpp/execution/operator/OperatorMemoryTest.java |    2 +-
 .../operator/RawDataAggregationOperatorTest.java   |    2 +-
 .../SeriesAggregationScanOperatorTest.java         |    2 +-
 .../SlidingWindowAggregationOperatorTest.java      |    2 +-
 .../operator/VerticallyConcatOperatorTest.java     |    2 +-
 .../operator/schema/CountMergeOperatorTest.java    |    2 +
 .../operator/schema/SchemaCountOperatorTest.java   |    2 +
 .../schema/SchemaQueryScanOperatorTest.java        |    2 +
 .../db/mpp/plan/StandaloneCoordinatorTest.java     |  155 --
 .../plan/analyze/AggregationDescriptorTest.java    |    2 +-
 .../iotdb/db/mpp/plan/plan/LogicalPlannerTest.java |    2 +-
 .../db/mpp/plan/plan/QueryLogicalPlanUtil.java     |    2 +-
 .../distribution/AggregationDistributionTest.java  |    2 +-
 .../node/process/AggregationNodeSerdeTest.java     |    2 +-
 .../node/process/GroupByLevelNodeSerdeTest.java    |    2 +-
 .../plan/node/process/GroupByTagNodeSerdeTest.java |    2 +-
 .../process/SingleDeviceViewNodeSerdeTest.java     |   61 +
 .../source/SeriesAggregationScanNodeSerdeTest.java |    2 +-
 .../plan/scheduler/StandaloneSchedulerTest.java    |  547 ----
 .../java/org/apache/iotdb/db/qp/PlannerTest.java   |  289 ---
 .../iotdb/db/qp/bench/QueryParseBenchmark.java     |   45 -
 .../iotdb/db/qp/logical/LogicalPlanSmallTest.java  |  365 ---
 .../iotdb/db/qp/other/TSPlanContextAuthorTest.java |   94 -
 .../db/qp/utils/DatetimeQueryDataSetUtilsTest.java |   18 +-
 .../db/query/aggregation/AggregateResultTest.java  |  294 ---
 .../query/aggregation/DescAggregateResultTest.java |  190 --
 .../iotdb/db/query/dataset/ListDataSetTest.java    |  164 --
 .../query/dataset/UDTFAlignByTimeDataSetTest.java  |  694 -----
 .../dataset/groupby/GroupByTimeDataSetTest.java    |  492 ----
 .../query/externalsort/ExternalSortEngineTest.java |  193 --
 .../db/query/externalsort/FakeChunkReaderWrap.java |   43 -
 ...ExternalSortFileSerializerDeserializerTest.java |  131 -
 .../reader/series/SeriesAggregateReaderTest.java   |  141 --
 .../reader/series/SeriesReaderByTimestampTest.java |   95 -
 .../db/query/reader/series/SeriesReaderTest.java   |  189 --
 .../query/reader/series/SeriesReaderTestUtil.java  |   19 +-
 .../iotdb/db/rescon/ResourceManagerTest.java       |   22 +-
 .../org/apache/iotdb/db/service/DaemonTest.java    |    4 +-
 .../DataNodeInternalRPCServiceImplTest.java        |    4 +-
 .../db/sync/datasource/PipeOpManagerTest.java      |    6 +-
 .../org/apache/iotdb/db/tools/MLogParserTest.java  |   23 +-
 .../iotdb/db/tools/TsFileAndModSettleToolTest.java |    2 -
 .../iotdb/db/tools/TsFileSketchToolTest.java       |   26 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |   82 +-
 .../org/apache/iotdb/db/utils/SchemaTestUtils.java |    5 +-
 .../org/apache/iotdb/db/utils/SchemaUtilsTest.java |   16 -
 .../iotdb/db/utils/TsFileRewriteToolTest.java      |  460 ----
 .../db/utils/writelog/LogWriterReaderTest.java     |  215 --
 .../db/utils/writelog/MultiFileLogReaderTest.java  |   97 -
 .../db/wal/recover/WALRecoverManagerTest.java      |   61 +-
 .../db/wal/recover/file/TsFilePlanRedoerTest.java  |   87 +-
 .../file/UnsealedTsFileRecoverPerformerTest.java   |   56 +-
 server/src/test/resources/logback-test.xml         |    2 +-
 .../java/org/apache/iotdb/session/ISession.java    |    8 +-
 .../java/org/apache/iotdb/session/Session.java     |   30 +-
 site/src/main/.vuepress/config.js                  |   30 +-
 .../apache/iotdb/spark/db/EnvironmentUtils.java    |    6 +-
 .../org/apache/iotdb/spark/db/IoTDBTest.scala      |    9 +-
 .../org/apache/iotdb/spark/db/IoTDBWriteTest.scala |   14 +-
 .../iotdb/spark/db/unit/DataFrameToolsTest.scala   |   11 +-
 .../test/java/org/apache/iotdb/db/sql/Cases.java   |   46 -
 .../src/main/thrift/confignode.thrift              |   31 +-
 .../tsfile/read/query/dataset/EmptyDataSet.java    |   40 -
 .../tsfile/read/reader/FakedTimeGenerator.java     |   83 -
 683 files changed, 10698 insertions(+), 61492 deletions(-)
 create mode 100644 client-py/tests/test_delete_data.py
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/ConfigurationResp.java
 rename consensus/src/test/java/org/apache/iotdb/consensus/iot/{IoTConsensusTest.java => ReplicateTest.java} (98%)
 rename consensus/src/test/java/org/apache/iotdb/consensus/iot/{RecoveryTest.java => StabilityTest.java} (60%)
 create mode 100755 docker/src/main/DockerCompose/do-docker-build.sh
 copy grafana-plugin/backend-compile.sh => docker/src/main/DockerCompose/docker-compose-1c1d.yml (58%)
 mode change 100755 => 100644
 create mode 100644 docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml
 create mode 100644 docker/src/main/DockerCompose/docker-compose-cluster-3c3d.yml
 create mode 100644 docker/src/main/DockerCompose/docker-compose-host-3c3d.yml
 copy grafana-plugin/backend-compile.sh => docker/src/main/DockerCompose/entrypoint.sh (52%)
 create mode 100755 docker/src/main/DockerCompose/replace-conf-from-env.sh
 copy confignode/src/assembly/resources/sbin/stop-confignode.sh => docker/src/main/Dockerfile-1.0.0-1c1d (51%)
 create mode 100644 docker/src/main/Dockerfile-1.0.0-confignode
 create mode 100644 docker/src/main/Dockerfile-1.0.0-datanode
 create mode 100644 docs/UserGuide/QuickStart/ClusterQuickStart.md
 create mode 100644 docs/zh/UserGuide/QuickStart/ClusterQuickStart.md
 delete mode 100644 example/trigger/src/main/java/org/apache/iotdb/trigger/old/TriggerExample.java
 create mode 100644 integration-test/src/test/java/org/apache/iotdb/cli/it/AbstractScript.java
 rename {cli/src/test/java/org/apache/iotdb/cli => integration-test/src/test/java/org/apache/iotdb/cli/it}/StartClientScriptIT.java (66%)
 create mode 100644 integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBSnapshotTransferIT.java
 rename library-udf/src/test/java/org/apache/iotdb/library/anomaly/AnomalyTests.java => integration-test/src/test/java/org/apache/iotdb/libudf/it/anomaly/AnomalyIT.java (71%)
 rename library-udf/src/test/java/org/apache/iotdb/library/dmatch/DMatchTests.java => integration-test/src/test/java/org/apache/iotdb/libudf/it/dmatch/DMatchIT.java (65%)
 rename library-udf/src/test/java/org/apache/iotdb/library/dprofile/DProfileTests.java => integration-test/src/test/java/org/apache/iotdb/libudf/it/dprofile/DProfileIT.java (64%)
 rename library-udf/src/test/java/org/apache/iotdb/library/dquality/DQualityTests.java => integration-test/src/test/java/org/apache/iotdb/libudf/it/dquality/DQualityIT.java (61%)
 rename library-udf/src/test/java/org/apache/iotdb/library/drepair/DRepairTests.java => integration-test/src/test/java/org/apache/iotdb/libudf/it/drepair/DRepairIT.java (61%)
 rename library-udf/src/test/java/org/apache/iotdb/library/frequency/FrequencyTests.java => integration-test/src/test/java/org/apache/iotdb/libudf/it/frequency/FrequencyIT.java (60%)
 rename library-udf/src/test/java/org/apache/iotdb/library/series/SeriesTest.java => integration-test/src/test/java/org/apache/iotdb/libudf/it/series/SeriesIT.java (56%)
 rename library-udf/src/test/java/org/apache/iotdb/library/string/StringTests.java => integration-test/src/test/java/org/apache/iotdb/libudf/it/string/StringIT.java (69%)
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSelectIntoIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBUDFNestAggregationIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBUserDefinedAggregationFunctionIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/aligned/AlignedWriteUtil.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBEmptyDataIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByFillQueryBigDataIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByFillQueryIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBLoadExternalAlignedTsFileIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilter2IT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterWithDeletion2IT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterWithDeletionIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByFillIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByFillMixPathsIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByFillWithRangeIT.java
 delete mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByNaturalMonthFillIT.java
 delete mode 100644 jdbc/src/main/java/org/apache/iotdb/jdbc/ListDataSet.java
 mode change 100644 => 100755 library-udf/src/assembly/tools/register-UDF.sh
 rename server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowLockInfoOperator.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/IFAState.java (64%)
 rename server/src/main/java/org/apache/iotdb/db/query/aggregation/RemovableAggregateResult.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/IFATransition.java (63%)
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/IPatternFA.java
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/SimpleNFA.java
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/match/IStateMatchInfo.java
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/match/MatchedStateSet.java
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/match/StateMultiMatchInfo.java
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/match/StateSingleMatchInfo.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/auth/StandaloneAuthorityFetcher.java
 rename server/src/main/java/org/apache/iotdb/db/{metadata/storagegroup/StorageGroupLogReader.java => client/ConfigNodeClientManager.java} (56%)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/local/LocalIoTDBHandler.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/logfile/MLogReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/logfile/MLogWriter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/storagegroup/StorageGroupLogWriter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/StandalonePartitionFetcher.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/StandaloneSchemaFetcher.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/StandaloneConfigTaskExecutor.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/MemoryDistributionCalculator.java
 rename server/src/main/java/org/apache/iotdb/db/{query/aggregation => mpp/plan/planner/plan/parameter}/AggregationType.java (97%)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneScheduler.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/AuthorType.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ShowQueriesStatement.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/builder/DAGBuilder.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/Planner.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/executor/IPlanExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/AggregationQueryOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteDataOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FillClauseComponent.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FillQueryOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/GroupByClauseComponent.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/GroupByFillClauseComponent.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/GroupByFillQueryOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/GroupByQueryOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/InOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/LastQueryOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/LikeOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/RegexpOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectIntoOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/UDAFQueryOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/UDTFQueryOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ActivateTemplateOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/AlterTimeSeriesOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ClearCacheOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/CountOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/CreateAlignedTimeSeriesOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/CreateContinuousQueryOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/CreateFunctionOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/CreateIndexOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/CreatePipeOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/CreatePipeSinkOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/CreateTemplateOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/CreateTimeSeriesOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/DataAuthOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/DeletePartitionOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/DeleteStorageGroupOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/DeleteTimeSeriesOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/DropContinuousQueryOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/DropFunctionOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/DropIndexOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/DropPipeOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/DropPipeSinkOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/DropTemplateOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/FlushOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/KillQueryOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadConfigurationOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadFilesOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/MergeOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/RemoveFileOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/SetStorageGroupOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/SetSystemModeOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/SetTTLOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/SetTemplateOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/SettleOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowChildNodesOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowChildPathsOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowDevicesOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowFunctionsOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowNodesInTemplateOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowPathsSetTemplateOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowPathsUsingTemplateOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowPipeOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowPipeSinkOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowPipeSinkTypeOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowQueryResourceOperate.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowStorageGroupOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowTTLOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowTemplatesOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowTimeSeriesOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowTriggersOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/StartPipeOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/StopPipeOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/TracingOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/UnSetTTLOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/UnloadFileOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/UnsetTemplateOperator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/BatchPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AlignByDevicePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByTimeFillPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByTimePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/MeasurementInfo.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryIndexPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/SelectIntoPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDAFPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDFPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ActivateTemplateInClusterPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ActivateTemplatePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AlterTimeSeriesPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AppendTemplatePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AutoCreateDeviceMNodePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ChangeAliasPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ChangeTagOffsetPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ClearCachePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CountPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateContinuousQueryPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateFunctionPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateIndexPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateMultiTimeSeriesPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTemplatePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteStorageGroupPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteTimeSeriesPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropContinuousQueryPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropFunctionPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropIndexPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropTemplatePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/FlushPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/KillQueryPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadConfigurationPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LogPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MNodePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MeasurementMNodePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MergePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/OperateFilePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/PreDeleteTimeSeriesPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/PruneTemplatePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/RollbackPreDeleteTimeSeriesPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetStorageGroupPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetSystemModePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTTLPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTemplatePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SettlePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowChildNodesPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowChildPathsPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowContinuousQueriesPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowFunctionsPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowLockInfoPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowNodesInTemplatePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPathsSetTemplatePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPathsUsingTemplatePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowQueryProcesslistPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowQueryResourcePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowStorageGroupPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowTTLPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowTemplatesPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowTriggersPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StorageGroupMNodePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/TracingPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/UnsetTemplatePlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalChecker.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/utils/EmptyOutputStream.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/utils/WildcardsRemover.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/AvgAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/ExtremeAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstValueAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstValueDescAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastValueAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastValueDescAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeDescAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeDescAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/control/QueryTimeManager.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/control/tracing/TracingConstant.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/control/tracing/TracingInfo.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/control/tracing/TracingManager.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/DirectAlignByTimeDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/DirectNonAlignDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/ListDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/NonAlignEngineDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithValueFilter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/ShowContinuousQueriesResult.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/ShowDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/ShowDevicesDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/SingleDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/UDFInputDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/UDFRawQueryInputDataSetWithoutValueFilter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByFillDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByLevelDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByTimeDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByTimeEngineDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/FillQueryExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/IQueryRouter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/QueryRouter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/RawDataQueryExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/UDFQueryExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/fill/AlignedLastPointReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/fill/IFill.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/fill/LastPointReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/fill/LinearFill.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/fill/PreviousFill.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/fill/ValueFill.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/groupby/AlignedGroupByExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/groupby/SlidingWindowGroupByExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/groupby/SlidingWindowGroupByExecutorFactory.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/groupby/impl/EmptyQueueSlidingWindowGroupByExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/groupby/impl/LocalAlignedGroupByExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/groupby/impl/LocalGroupByExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/groupby/impl/MonotonicQueueSlidingWindowGroupByExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/groupby/impl/NormalQueueSlidingWindowGroupByExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/executor/groupby/impl/SmoothQueueSlidingWindowGroupByExecutor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJob.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobEngine.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobPart.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobScheduler.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/LineMerger.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/MultiSourceExternalSortJobPart.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/SimpleExternalSortEngine.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/SingleSourceExternalSortJobPart.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/adapter/ByTimestampReaderAdapter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/IExternalSortFileDeserializer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/IExternalSortFileSerializer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthIExternalSortFileDeserializer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthTimeValuePairSerializer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/factory/AggregateResultFactory.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/pool/QueryTaskManager.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/pool/RawQueryReadTaskPoolManager.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/pool/RawQueryReadTaskPoolManagerMetrics.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/chunk/ChunkDataIterator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/chunk/ChunkReaderWrap.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/chunk/DiskChunkReaderByTimestamp.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/resource/CachedUnseqResourceMergeReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/AlignedSeriesAggregateReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/BaseManagedSeriesReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/IAggregateReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/IReaderByTimestamp.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/ManagedSeriesReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesRawDataPointReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestamp.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/timegenerator/ServerTimeGenerator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/service/NewIoTDBMBean.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/service/basic/ServiceProvider.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/service/basic/StandaloneServiceProvider.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/writelog/BatchLogReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/writelog/ILogReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/writelog/MultiFileLogReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/writelog/SingleFileLogReader.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/auth/AuthorityCheckerTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/localconfignode/LocalConfigNodeMultiDataRegionTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/SchemaBasicTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/TemplateTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/multimode/SchemaDiskModeTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/multimode/SchemaFullMemoryTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/multimode/SchemaMemoryModeTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/multimode/SchemaNonMemoryTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/multimode/SchemaPartialMemoryTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/plan/SchemaRegionPlanCompatibilityTest.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/AbstractSchemaRegionTest.java
 rename server/src/{main/java/org/apache/iotdb/db/qp/logical/sys/ShowContinuousQueriesOperator.java => test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionAliasAndTagTest.java} (72%)
 create mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionManagementTest.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTemplateTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/multimode/SchemaRegionFullMemoryTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/multimode/SchemaRegionMemoryTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/multimode/SchemaRegionNonMemoryTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/multimode/SchemaRegionPartialMemoryTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/multimode/SchemaRegionSchemaFileTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/mpp/plan/StandaloneCoordinatorTest.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/process/SingleDeviceViewNodeSerdeTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/qp/PlannerTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/qp/logical/LogicalPlanSmallTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/aggregation/AggregateResultTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/aggregation/DescAggregateResultTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/dataset/ListDataSetTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSetTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/dataset/groupby/GroupByTimeDataSetTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/externalsort/ExternalSortEngineTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/externalsort/FakeChunkReaderWrap.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/externalsort/IExternalSortFileSerializerDeserializerTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/utils/TsFileRewriteToolTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/utils/writelog/LogWriterReaderTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/utils/writelog/MultiFileLogReaderTest.java
 delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/EmptyDataSet.java
 delete mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/FakedTimeGenerator.java


[iotdb] 01/02: Merge remote-tracking branch 'origin/master' into lmh/addQueryMetrics

Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hui pushed a commit to branch lmh/addQueryMetrics
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 25270fba300740cab83d12af34fa55bf16b7bf0f
Merge: 0f9a394911 3ed2d7349c
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Tue Dec 20 09:29:10 2022 +0800

    Merge remote-tracking branch 'origin/master' into lmh/addQueryMetrics
    
    # Conflicts:
    #       node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
    #       node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Tag.java
    #       server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
    #       server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java
    #       server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java
    #       server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQuerySortOperator.java
    #       server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
    #       server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java

 .github/workflows/main-unix.yml                    |    2 +-
 .github/workflows/main-win.yml                     |    2 +-
 .gitignore                                         |    3 +
 Jenkinsfile                                        |    2 +-
 README.md                                          |   48 +-
 README_ZH.md                                       |   52 +-
 .../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 |    6 +-
 .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4   |   18 +-
 .../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4  |   20 +-
 cli/src/assembly/resources/sbin/start-cli.bat      |    2 +-
 cli/src/assembly/resources/sbin/start-cli.sh       |    2 -
 client-py/iotdb/Session.py                         |   26 +-
 client-py/iotdb/utils/IoTDBRpcDataSet.py           |    2 +-
 client-py/tests/test_delete_data.py                |  162 ++
 .../assembly/resources/sbin/start-confignode.bat   |   55 +-
 .../assembly/resources/sbin/start-confignode.sh    |   22 +-
 .../assembly/resources/sbin/stop-confignode.bat    |    5 +-
 .../src/assembly/resources/sbin/stop-confignode.sh |   19 +-
 .../consensus/response/ConfigurationResp.java      |   66 +
 .../consensus/response/DataNodeRegisterResp.java   |   23 -
 .../iotdb/confignode/manager/ConfigManager.java    |   27 +
 .../iotdb/confignode/manager/ConsensusManager.java |    2 +-
 .../apache/iotdb/confignode/manager/IManager.java  |   10 +
 .../iotdb/confignode/manager/node/NodeManager.java |   21 +-
 .../persistence/executor/ConfigPlanExecutor.java   |    9 +-
 .../thrift/ConfigNodeRPCServiceProcessor.java      |   26 +-
 .../apache/iotdb/consensus/config/RatisConfig.java |   45 +-
 .../exception/RatisRequestFailedException.java     |    7 +-
 .../apache/iotdb/consensus/iot/IoTConsensus.java   |    6 +-
 .../consensus/iot/IoTConsensusServerImpl.java      |   27 +-
 .../iot/logdispatcher/IndexController.java         |   43 +-
 .../consensus/iot/logdispatcher/LogDispatcher.java |    3 +-
 .../apache/iotdb/consensus/ratis/RatisClient.java  |    6 +-
 .../iotdb/consensus/ratis/RatisConsensus.java      |   10 +-
 .../{IoTConsensusTest.java => ReplicateTest.java}  |    4 +-
 .../iot/{RecoveryTest.java => StabilityTest.java}  |   54 +-
 .../iot/logdispatcher/IndexControllerTest.java     |   37 +-
 .../iot/logdispatcher/SyncStatusTest.java          |   15 +-
 .../iotdb/consensus/iot/util/TestStateMachine.java |    2 +-
 .../iotdb/consensus/ratis/RatisConsensusTest.java  |   15 +-
 docker/ReadMe.md                                   |   30 +-
 docker/src/main/DockerCompose/do-docker-build.sh   |  134 +
 .../src/main/DockerCompose/docker-compose-1c1d.yml |   40 +-
 .../DockerCompose/docker-compose-cluster-1c2d.yml  |   69 +
 .../DockerCompose/docker-compose-cluster-3c3d.yml  |   60 +
 .../DockerCompose/docker-compose-host-3c3d.yml     |   58 +
 .../src/main/DockerCompose/entrypoint.sh           |   54 +-
 .../main/DockerCompose/replace-conf-from-env.sh    |   64 +
 .../src/main/Dockerfile-1.0.0-1c1d                 |   55 +-
 docker/src/main/Dockerfile-1.0.0-confignode        |   54 +
 docker/src/main/Dockerfile-1.0.0-datanode          |   56 +
 docs/Development/ContributeGuide.md                |   28 +-
 docs/UserGuide/Cluster/Cluster-Setup.md            |  545 ++--
 docs/UserGuide/Monitor-Alert/Metric-Tool.md        |  372 +--
 docs/UserGuide/Query-Data/Align-By.md              |    7 +-
 docs/UserGuide/Query-Data/Order-By.md              |  111 +-
 docs/UserGuide/Query-Data/Overview.md              |    3 +-
 docs/UserGuide/QuickStart/ClusterQuickStart.md     |  183 ++
 docs/UserGuide/QuickStart/WayToGetIoTDB.md         |  175 +-
 docs/UserGuide/Reference/Common-Config-Manual.md   |   16 +-
 docs/UserGuide/Write-Data/Write-Data.md            |    2 +-
 docs/zh/Development/ContributeGuide.md             |   11 -
 docs/zh/UserGuide/Cluster/Cluster-Setup.md         |  534 ++--
 docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md     |  311 +--
 docs/zh/UserGuide/Query-Data/Align-By.md           |    4 +
 docs/zh/UserGuide/Query-Data/Order-By.md           |  109 +-
 docs/zh/UserGuide/Query-Data/Overview.md           |    7 +-
 docs/zh/UserGuide/QuickStart/ClusterQuickStart.md  |  180 ++
 docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md      |  182 +-
 .../zh/UserGuide/Reference/Common-Config-Manual.md |   16 +-
 docs/zh/UserGuide/Write-Data/Write-Data.md         |    2 +-
 .../apache/iotdb/trigger/old/TriggerExample.java   |  147 --
 grafana-plugin/backend-compile.sh                  |    4 +-
 integration-test/import-control.xml                |    2 +
 integration-test/pom.xml                           |   19 +-
 .../java/org/apache/iotdb/it/env/AbstractEnv.java  |   54 +
 .../apache/iotdb/it/env/AbstractNodeWrapper.java   |    4 +-
 .../java/org/apache/iotdb/it/env/MppConfig.java    |    9 +-
 .../org/apache/iotdb/it/env/RemoteServerEnv.java   |   25 +
 .../org/apache/iotdb/itbase/env/BaseConfig.java    |    8 +-
 .../java/org/apache/iotdb/itbase/env/BaseEnv.java  |   10 +
 .../org/apache/iotdb/cli/it/AbstractScript.java    |  105 +
 .../apache/iotdb/cli/it}/StartClientScriptIT.java  |   71 +-
 .../confignode/it/IoTDBClusterAuthorityIT.java     |   62 +-
 .../it/IoTDBClusterRegionLeaderBalancingIT.java    |   25 +-
 .../confignode/it/IoTDBConfigNodeSnapshotIT.java   |    7 +-
 .../confignode/it/IoTDBSnapshotTransferIT.java     |  152 ++
 .../IoTDBOrderByWithAlignByDeviceIT.java           |   90 +-
 .../org/apache/iotdb/db/it/env/StandaloneEnv.java  |   25 +
 .../apache/iotdb/db/it/groupby/IOTDBGroupByIT.java |    6 +-
 .../iotdb/db/it/query/IoTDBNullOperandIT.java      |    3 +-
 .../org/apache/iotdb/db/it/sync/IoTDBPipeIT.java   |   14 +
 .../org/apache/iotdb/db/it/udf/IoTDBUDFM4IT.java   |   45 +-
 .../apache/iotdb/libudf/it/anomaly/AnomalyIT.java  |  783 +++---
 .../apache/iotdb/libudf/it/dmatch/DMatchIT.java    |  533 ++--
 .../iotdb/libudf/it/dprofile/DProfileIT.java       |  298 +--
 .../iotdb/libudf/it/dquality/DQualityIT.java       |  203 +-
 .../apache/iotdb/libudf/it/drepair/DRepairIT.java  |  160 +-
 .../iotdb/libudf/it/frequency/FrequencyIT.java     |  180 +-
 .../apache/iotdb/libudf/it/series/SeriesIT.java    |  319 +--
 .../apache/iotdb/libudf/it/string/StringIT.java    |  124 +-
 .../src/test/resources/logback-test.xml            |    2 +-
 .../iotdb/db/integration/IoTDBAuthorizationIT.java | 1127 ---------
 .../iotdb/db/integration/IoTDBCheckConfigIT.java   |    6 +-
 .../db/integration/IoTDBEngineTimeGeneratorIT.java |  291 ---
 .../iotdb/db/integration/IoTDBSelectIntoIT.java    |  787 ------
 .../db/integration/IoTDBSequenceDataQueryIT.java   |  329 ---
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java  |  444 ----
 .../aggregation/IoTDBUDFNestAggregationIT.java     |  774 ------
 .../IoTDBUserDefinedAggregationFunctionIT.java     |  732 ------
 .../db/integration/aligned/AlignedWriteUtil.java   |  149 --
 .../db/integration/aligned/IoTDBEmptyDataIT.java   |   78 -
 .../aligned/IoTDBGroupByFillQueryBigDataIT.java    |  192 --
 .../aligned/IoTDBGroupByFillQueryIT.java           |  989 --------
 .../aligned/IoTDBLoadExternalAlignedTsFileIT.java  | 1037 --------
 .../aligned/IoTDBRawQueryWithValueFilter2IT.java   |   65 -
 .../aligned/IoTDBRawQueryWithValueFilterIT.java    |  763 ------
 ...oTDBRawQueryWithValueFilterWithDeletion2IT.java |   82 -
 ...IoTDBRawQueryWithValueFilterWithDeletionIT.java |  778 ------
 .../db/integration/groupby/IoTDBGroupByFillIT.java | 2657 --------------------
 .../groupby/IoTDBGroupByFillMixPathsIT.java        |  479 ----
 .../groupby/IoTDBGroupByFillWithRangeIT.java       |  179 --
 .../groupby/IoTDBGroupByNaturalMonthFillIT.java    |  273 --
 integration/src/test/resources/logback-test.xml    |    2 +-
 .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java   |   42 -
 .../java/org/apache/iotdb/jdbc/ListDataSet.java    |   53 -
 library-udf/pom.xml                                |   50 +-
 library-udf/src/assembly/tools/register-UDF.bat    |    1 -
 library-udf/src/assembly/tools/register-UDF.sh     |    1 -
 .../metrics/config/MetricConfigDescriptor.java     |   16 +-
 .../iotdb/metrics/config/MetricConfigTest.java     |   28 +-
 .../resources/conf/iotdb-common.properties         |    4 +-
 .../src/assembly/resources/sbin/iotdb-common.sh    |  137 +
 .../iotdb/commons/partition/ExecutorType.java      |    4 -
 .../iotdb/commons/partition/StorageExecutor.java   |   11 +-
 .../org/apache/iotdb/commons/path/fa/IFAState.java |   21 +-
 .../iotdb/commons/path/fa/IFATransition.java       |   16 +-
 .../apache/iotdb/commons/path/fa/IPatternFA.java   |   75 +
 .../apache/iotdb/commons/path/fa/SimpleNFA.java    |  522 ++++
 .../commons/path/fa/match/IStateMatchInfo.java     |   79 +
 .../commons/path/fa/match/MatchedStateSet.java     |   68 +
 .../commons/path/fa/match/StateMultiMatchInfo.java |  120 +
 .../path/fa/match/StateSingleMatchInfo.java        |  103 +
 .../commons/schema/tree/AbstractTreeVisitor.java   |  804 +++---
 .../iotdb/commons/service/metric/enums/Metric.java |    1 +
 .../iotdb/commons/service/metric/enums/Tag.java    |    1 +
 .../apache/iotdb/commons/udf/builtin/UDTFM4.java   |  272 +-
 .../metadata/rocksdb/RocksDBBenchmarkEngine.java   |  139 +-
 .../metadata/tagSchemaRegion/TagSchemaRegion.java  |    9 +-
 .../tagSchemaRegion/TagSchemaRegionTest.java       |   18 +-
 .../src/assembly/resources/sbin/start-datanode.bat |  103 +-
 .../src/assembly/resources/sbin/start-datanode.sh  |   20 +-
 .../src/assembly/resources/sbin/stop-datanode.bat  |    8 +-
 .../src/assembly/resources/sbin/stop-datanode.sh   |   16 +-
 .../org/apache/iotdb/db/auth/AuthorityChecker.java |  131 -
 .../apache/iotdb/db/auth/AuthorizerManager.java    |    7 +-
 .../iotdb/db/auth/ClusterAuthorityFetcher.java     |   10 +-
 .../iotdb/db/auth/StandaloneAuthorityFetcher.java  |  125 -
 .../apache/iotdb/db/client/ConfigNodeClient.java   |   44 +
 .../ConfigNodeClientManager.java}                  |   32 +-
 .../iotdb/db/client/DataNodeInternalClient.java    |   15 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   26 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   13 +-
 .../org/apache/iotdb/db/conf/IoTDBStartCheck.java  |   47 +-
 .../db/conf/directories/DirectoryChecker.java      |   27 +
 .../db/consensus/DataRegionConsensusImpl.java      |    2 +-
 .../db/consensus/SchemaRegionConsensusImpl.java    |    2 +-
 .../iotdb/db/engine/TsFileMetricManager.java       |   54 +-
 .../engine/compaction/CompactionTaskManager.java   |   43 +-
 .../db/engine/compaction/CompactionUtils.java      |   22 +-
 .../utils/AlignedSeriesCompactionExecutor.java     |    8 +
 .../utils/NonAlignedSeriesCompactionExecutor.java  |    2 +
 .../utils/AlignedSeriesCompactionExecutor.java     |   15 +-
 .../utils/SingleSeriesCompactionExecutor.java      |   12 +-
 .../performer/impl/FastCompactionPerformer.java    |   16 +-
 .../impl/ReadChunkCompactionPerformer.java         |   11 +
 .../impl/ReadPointCompactionPerformer.java         |   19 +
 .../writer/AbstractCompactionWriter.java           |   14 +-
 .../writer/AbstractCrossCompactionWriter.java      |    9 +
 .../writer/AbstractInnerCompactionWriter.java      |    5 +
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |   23 +-
 .../iotdb/db/engine/storagegroup/DataRegion.java   |   65 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |    2 -
 .../trigger/sink/local/LocalIoTDBHandler.java      |   94 -
 .../iotdb/db/localconfignode/LocalConfigNode.java  |    9 +-
 .../db/localconfignode/LocalDataPartitionInfo.java |    1 +
 .../localconfignode/LocalDataPartitionTable.java   |    1 +
 .../localconfignode/LocalSchemaPartitionTable.java |    1 +
 .../iotdb/db/metadata/LocalSchemaProcessor.java    |    6 +-
 .../db/metadata/cache/DataNodeSchemaCache.java     |    3 +-
 .../iotdb/db/metadata/idtable/IDTableManager.java  |   27 +-
 .../iotdb/db/metadata/logfile/MLogReader.java      |   75 -
 .../iotdb/db/metadata/logfile/MLogWriter.java      |  254 --
 .../db/metadata/schemaregion/ISchemaRegion.java    |    9 +
 .../schemaregion/SchemaRegionMemoryImpl.java       |    6 +
 .../schemaregion/SchemaRegionSchemaFileImpl.java   |    6 +
 .../storagegroup/StorageGroupLogWriter.java        |   56 -
 .../storagegroup/StorageGroupSchemaManager.java    |  126 +-
 .../iotdb/db/metadata/template/Template.java       |   53 +-
 .../apache/iotdb/db/metadata/utils/MetaUtils.java  |   35 +-
 .../db/metadata/utils/ResourceByPathUtils.java     |   34 -
 .../db/mpp/aggregation/AccumulatorFactory.java     |    2 +-
 .../SlidingWindowAggregatorFactory.java            |    2 +-
 .../db/mpp/common/header/ColumnHeaderConstant.java |   12 +
 .../db/mpp/common/header/DatasetHeaderFactory.java |    4 +
 .../mpp/common/schematree/ClusterSchemaTree.java   |    1 -
 .../common/schematree/DeviceGroupSchemaTree.java   |    5 -
 .../db/mpp/common/schematree/ISchemaTree.java      |    2 -
 .../visitor/SchemaTreeDeviceVisitor.java           |    2 +-
 .../visitor/SchemaTreeMeasurementVisitor.java      |   76 +-
 .../schematree/visitor/SchemaTreeVisitor.java      |    5 -
 .../iotdb/db/mpp/execution/driver/Driver.java      |   31 +-
 .../exchange/IMPPDataExchangeManager.java          |    2 +
 .../db/mpp/execution/exchange/ISinkHandle.java     |    3 +
 .../db/mpp/execution/exchange/ISourceHandle.java   |    3 +
 .../db/mpp/execution/exchange/LocalSinkHandle.java |   11 +-
 .../mpp/execution/exchange/LocalSourceHandle.java  |    5 +
 .../execution/exchange/MPPDataExchangeManager.java |   21 +-
 .../mpp/execution/exchange/SharedTsBlockQueue.java |   59 +-
 .../db/mpp/execution/exchange/SinkHandle.java      |   56 +-
 .../db/mpp/execution/exchange/SourceHandle.java    |   62 +-
 .../mpp/execution/memory/LocalMemoryManager.java   |    2 +-
 .../iotdb/db/mpp/execution/memory/MemoryPool.java  |  206 +-
 .../operator/process/AbstractIntoOperator.java     |   11 +-
 .../process/last/LastQuerySortOperator.java        |   56 +-
 .../apache/iotdb/db/mpp/plan/analyze/Analysis.java |   20 +-
 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  |  211 +-
 .../apache/iotdb/db/mpp/plan/analyze/Analyzer.java |   10 +-
 .../db/mpp/plan/analyze/ExpressionAnalyzer.java    |   70 +
 .../iotdb/db/mpp/plan/analyze/SchemaValidator.java |    6 +-
 .../plan/analyze/StandalonePartitionFetcher.java   |  252 --
 .../mpp/plan/analyze/StandaloneSchemaFetcher.java  |  227 --
 .../db/mpp/plan/execution/QueryExecution.java      |   27 +-
 .../mpp/plan/execution/config/ConfigExecution.java |    7 +-
 .../executor/StandaloneConfigTaskExecutor.java     |  728 ------
 .../plan/execution/memory/MemorySourceHandle.java  |    3 +
 .../iotdb/db/mpp/plan/expression/Expression.java   |   27 -
 .../iotdb/db/mpp/plan/expression/ResultColumn.java |   61 -
 .../plan/expression/binary/BinaryExpression.java   |   96 -
 .../mpp/plan/expression/leaf/ConstantOperand.java  |   26 -
 .../db/mpp/plan/expression/leaf/NullOperand.java   |   27 -
 .../plan/expression/leaf/TimeSeriesOperand.java    |   31 -
 .../mpp/plan/expression/leaf/TimestampOperand.java |   27 -
 .../plan/expression/multi/FunctionExpression.java  |   49 -
 .../plan/expression/ternary/TernaryExpression.java |   50 -
 .../mpp/plan/expression/unary/UnaryExpression.java |   37 -
 .../iotdb/db/mpp/plan/parser/ASTVisitor.java       |   92 +-
 .../db/mpp/plan/planner/LocalExecutionPlanner.java |   30 +
 .../db/mpp/plan/planner/LogicalPlanBuilder.java    |    8 +-
 .../db/mpp/plan/planner/LogicalPlanVisitor.java    |    9 +
 .../plan/planner/MemoryDistributionCalculator.java |  490 ++++
 .../db/mpp/plan/planner/OperatorTreeGenerator.java |    6 +-
 .../planner/distribution/ExchangeNodeAdder.java    |    6 +-
 .../distribution/WriteFragmentParallelPlanner.java |    4 +-
 .../plan/node/process/SingleDeviceViewNode.java    |   59 +-
 .../plan/parameter/AggregationDescriptor.java      |    1 -
 .../planner/plan/parameter}/AggregationType.java   |    2 +-
 .../db/mpp/plan/scheduler/StandaloneScheduler.java |  222 --
 .../iotdb/db/mpp/plan/statement/AuthorType.java    |  122 +
 .../db/mpp/plan/statement/StatementVisitor.java    |    5 +
 .../db/mpp/plan/statement/component/SortKey.java   |    6 +-
 .../db/mpp/plan/statement/crud/QueryStatement.java |   15 +-
 .../db/mpp/plan/statement/sys/AuthorStatement.java |   12 +-
 .../plan/statement/sys/ShowQueriesStatement.java   |   74 +
 .../mpp/transformation/dag/builder/DAGBuilder.java |  116 -
 .../dag/input/QueryDataSetInputLayer.java          |   41 -
 .../protocol/influxdb/util/QueryResultUtils.java   |   90 -
 .../iotdb/db/protocol/mqtt/MPPPublishHandler.java  |   11 +-
 .../protocol/rest/impl/GrafanaApiServiceImpl.java  |   11 +-
 .../db/protocol/rest/impl/RestApiServiceImpl.java  |   11 +-
 .../main/java/org/apache/iotdb/db/qp/Planner.java  |  154 --
 .../apache/iotdb/db/qp/executor/IPlanExecutor.java |   55 -
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  946 -------
 .../org/apache/iotdb/db/qp/logical/Operator.java   |   13 -
 .../qp/logical/crud/AggregationQueryOperator.java  |  155 --
 .../db/qp/logical/crud/DeleteDataOperator.java     |   73 -
 .../db/qp/logical/crud/FillClauseComponent.java    |   49 -
 .../db/qp/logical/crud/FillQueryOperator.java      |   92 -
 .../db/qp/logical/crud/GroupByClauseComponent.java |   92 -
 .../logical/crud/GroupByFillClauseComponent.java   |   49 -
 .../qp/logical/crud/GroupByFillQueryOperator.java  |   80 -
 .../db/qp/logical/crud/GroupByQueryOperator.java   |  111 -
 .../iotdb/db/qp/logical/crud/InOperator.java       |  212 --
 .../iotdb/db/qp/logical/crud/InsertOperator.java   |   90 -
 .../db/qp/logical/crud/LastQueryOperator.java      |   64 -
 .../iotdb/db/qp/logical/crud/LikeOperator.java     |  134 -
 .../iotdb/db/qp/logical/crud/QueryOperator.java    |  421 ----
 .../iotdb/db/qp/logical/crud/RegexpOperator.java   |  133 -
 .../db/qp/logical/crud/SelectIntoOperator.java     |  133 -
 .../db/qp/logical/crud/UDAFQueryOperator.java      |  179 --
 .../db/qp/logical/crud/UDTFQueryOperator.java      |   48 -
 .../qp/logical/sys/ActivateTemplateOperator.java   |   51 -
 .../db/qp/logical/sys/AlterTimeSeriesOperator.java |  116 -
 .../iotdb/db/qp/logical/sys/AuthorOperator.java    |  233 --
 .../db/qp/logical/sys/ClearCacheOperator.java      |   39 -
 .../iotdb/db/qp/logical/sys/CountOperator.java     |   73 -
 .../sys/CreateAlignedTimeSeriesOperator.java       |  184 --
 .../logical/sys/CreateContinuousQueryOperator.java |  108 -
 .../db/qp/logical/sys/CreateFunctionOperator.java  |   59 -
 .../db/qp/logical/sys/CreateIndexOperator.java     |   84 -
 .../db/qp/logical/sys/CreatePipeOperator.java      |   61 -
 .../db/qp/logical/sys/CreatePipeSinkOperator.java  |   54 -
 .../db/qp/logical/sys/CreateTemplateOperator.java  |  108 -
 .../qp/logical/sys/CreateTimeSeriesOperator.java   |  127 -
 .../iotdb/db/qp/logical/sys/DataAuthOperator.java  |   51 -
 .../db/qp/logical/sys/DeletePartitionOperator.java |   61 -
 .../qp/logical/sys/DeleteStorageGroupOperator.java |   50 -
 .../qp/logical/sys/DeleteTimeSeriesOperator.java   |   51 -
 .../logical/sys/DropContinuousQueryOperator.java   |   50 -
 .../db/qp/logical/sys/DropFunctionOperator.java    |   50 -
 .../iotdb/db/qp/logical/sys/DropIndexOperator.java |   65 -
 .../iotdb/db/qp/logical/sys/DropPipeOperator.java  |   44 -
 .../db/qp/logical/sys/DropPipeSinkOperator.java    |   43 -
 .../db/qp/logical/sys/DropTemplateOperator.java    |   49 -
 .../iotdb/db/qp/logical/sys/FlushOperator.java     |   62 -
 .../iotdb/db/qp/logical/sys/KillQueryOperator.java |   52 -
 .../qp/logical/sys/LoadConfigurationOperator.java  |   52 -
 .../iotdb/db/qp/logical/sys/LoadDataOperator.java  |   54 -
 .../iotdb/db/qp/logical/sys/LoadFilesOperator.java |   92 -
 .../iotdb/db/qp/logical/sys/MergeOperator.java     |   44 -
 .../db/qp/logical/sys/RemoveFileOperator.java      |   49 -
 .../db/qp/logical/sys/SetStorageGroupOperator.java |   48 -
 .../db/qp/logical/sys/SetSystemModeOperator.java   |   54 -
 .../iotdb/db/qp/logical/sys/SetTTLOperator.java    |   61 -
 .../db/qp/logical/sys/SetTemplateOperator.java     |   65 -
 .../iotdb/db/qp/logical/sys/SettleOperator.java    |   71 -
 .../db/qp/logical/sys/ShowChildNodesOperator.java  |   47 -
 .../db/qp/logical/sys/ShowChildPathsOperator.java  |   47 -
 .../db/qp/logical/sys/ShowDevicesOperator.java     |   73 -
 .../db/qp/logical/sys/ShowFunctionsOperator.java   |   38 -
 .../logical/sys/ShowNodesInTemplateOperator.java   |   43 -
 .../iotdb/db/qp/logical/sys/ShowOperator.java      |   64 -
 .../logical/sys/ShowPathsSetTemplateOperator.java  |   43 -
 .../sys/ShowPathsUsingTemplateOperator.java        |   43 -
 .../iotdb/db/qp/logical/sys/ShowPipeOperator.java  |   45 -
 .../db/qp/logical/sys/ShowPipeSinkOperator.java    |   45 -
 .../qp/logical/sys/ShowPipeSinkTypeOperator.java   |   38 -
 .../qp/logical/sys/ShowQueryResourceOperate.java   |   39 -
 .../qp/logical/sys/ShowStorageGroupOperator.java   |   47 -
 .../iotdb/db/qp/logical/sys/ShowTTLOperator.java   |   48 -
 .../db/qp/logical/sys/ShowTemplatesOperator.java   |   27 -
 .../db/qp/logical/sys/ShowTimeSeriesOperator.java  |  103 -
 .../db/qp/logical/sys/ShowTriggersOperator.java    |   38 -
 .../iotdb/db/qp/logical/sys/StartPipeOperator.java |   44 -
 .../iotdb/db/qp/logical/sys/StopPipeOperator.java  |   44 -
 .../iotdb/db/qp/logical/sys/TracingOperator.java   |   46 -
 .../iotdb/db/qp/logical/sys/UnSetTTLOperator.java  |   52 -
 .../db/qp/logical/sys/UnloadFileOperator.java      |   55 -
 .../db/qp/logical/sys/UnsetTemplateOperator.java   |   65 -
 .../org/apache/iotdb/db/qp/physical/BatchPlan.java |   73 -
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |  253 --
 .../iotdb/db/qp/physical/crud/AggregationPlan.java |  226 --
 .../db/qp/physical/crud/AlignByDevicePlan.java     |  285 ---
 .../iotdb/db/qp/physical/crud/FillQueryPlan.java   |   61 -
 .../db/qp/physical/crud/GroupByTimeFillPlan.java   |  118 -
 .../iotdb/db/qp/physical/crud/GroupByTimePlan.java |  138 -
 .../iotdb/db/qp/physical/crud/LastQueryPlan.java   |   87 -
 .../iotdb/db/qp/physical/crud/MeasurementInfo.java |   62 -
 .../iotdb/db/qp/physical/crud/QueryIndexPlan.java  |   88 -
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |  255 --
 .../db/qp/physical/crud/RawDataQueryPlan.java      |  217 --
 .../iotdb/db/qp/physical/crud/SelectIntoPlan.java  |  130 -
 .../apache/iotdb/db/qp/physical/crud/UDAFPlan.java |   81 -
 .../apache/iotdb/db/qp/physical/crud/UDFPlan.java  |   43 -
 .../apache/iotdb/db/qp/physical/crud/UDTFPlan.java |  149 --
 .../sys/ActivateTemplateInClusterPlan.java         |  127 -
 .../db/qp/physical/sys/ActivateTemplatePlan.java   |   87 -
 .../db/qp/physical/sys/AlterTimeSeriesPlan.java    |  212 --
 .../db/qp/physical/sys/AppendTemplatePlan.java     |  218 --
 .../iotdb/db/qp/physical/sys/AuthorPlan.java       |  406 ---
 .../qp/physical/sys/AutoCreateDeviceMNodePlan.java |   89 -
 .../iotdb/db/qp/physical/sys/ChangeAliasPlan.java  |  116 -
 .../db/qp/physical/sys/ChangeTagOffsetPlan.java    |  116 -
 .../iotdb/db/qp/physical/sys/ClearCachePlan.java   |   55 -
 .../apache/iotdb/db/qp/physical/sys/CountPlan.java |   53 -
 .../physical/sys/CreateAlignedTimeSeriesPlan.java  |   66 -
 .../qp/physical/sys/CreateContinuousQueryPlan.java |  156 --
 .../db/qp/physical/sys/CreateFunctionPlan.java     |   81 -
 .../iotdb/db/qp/physical/sys/CreateIndexPlan.java  |  180 --
 .../qp/physical/sys/CreateMultiTimeSeriesPlan.java |  398 ---
 .../db/qp/physical/sys/CreateTemplatePlan.java     |  516 ----
 .../db/qp/physical/sys/CreateTimeSeriesPlan.java   |   35 -
 .../iotdb/db/qp/physical/sys/DataAuthPlan.java     |  100 -
 .../db/qp/physical/sys/DeleteStorageGroupPlan.java |   84 -
 .../db/qp/physical/sys/DeleteTimeSeriesPlan.java   |  139 -
 .../qp/physical/sys/DropContinuousQueryPlan.java   |   63 -
 .../iotdb/db/qp/physical/sys/DropFunctionPlan.java |   69 -
 .../iotdb/db/qp/physical/sys/DropIndexPlan.java    |  129 -
 .../iotdb/db/qp/physical/sys/DropTemplatePlan.java |   78 -
 .../apache/iotdb/db/qp/physical/sys/FlushPlan.java |  244 --
 .../iotdb/db/qp/physical/sys/KillQueryPlan.java    |   45 -
 .../db/qp/physical/sys/LoadConfigurationPlan.java  |  144 --
 .../iotdb/db/qp/physical/sys/LoadDataPlan.java     |   73 -
 .../apache/iotdb/db/qp/physical/sys/LogPlan.java   |   75 -
 .../apache/iotdb/db/qp/physical/sys/MNodePlan.java |  116 -
 .../db/qp/physical/sys/MeasurementMNodePlan.java   |  154 --
 .../apache/iotdb/db/qp/physical/sys/MergePlan.java |   59 -
 .../iotdb/db/qp/physical/sys/OperateFilePlan.java  |  119 -
 .../qp/physical/sys/PreDeleteTimeSeriesPlan.java   |   80 -
 .../db/qp/physical/sys/PruneTemplatePlan.java      |  107 -
 .../sys/RollbackPreDeleteTimeSeriesPlan.java       |   81 -
 .../db/qp/physical/sys/SetStorageGroupPlan.java    |  100 -
 .../db/qp/physical/sys/SetSystemModePlan.java      |   76 -
 .../iotdb/db/qp/physical/sys/SetTTLPlan.java       |  102 -
 .../iotdb/db/qp/physical/sys/SetTemplatePlan.java  |  107 -
 .../iotdb/db/qp/physical/sys/SettlePlan.java       |   65 -
 .../db/qp/physical/sys/ShowChildNodesPlan.java     |   39 -
 .../db/qp/physical/sys/ShowChildPathsPlan.java     |   39 -
 .../qp/physical/sys/ShowContinuousQueriesPlan.java |   27 -
 .../iotdb/db/qp/physical/sys/ShowDevicesPlan.java  |   10 -
 .../db/qp/physical/sys/ShowFunctionsPlan.java      |   27 -
 .../iotdb/db/qp/physical/sys/ShowLockInfoPlan.java |   36 -
 .../qp/physical/sys/ShowNodesInTemplatePlan.java   |   34 -
 .../qp/physical/sys/ShowPathsSetTemplatePlan.java  |   34 -
 .../physical/sys/ShowPathsUsingTemplatePlan.java   |   34 -
 .../qp/physical/sys/ShowQueryProcesslistPlan.java  |   26 -
 .../db/qp/physical/sys/ShowQueryResourcePlan.java  |   38 -
 .../db/qp/physical/sys/ShowStorageGroupPlan.java   |   36 -
 .../iotdb/db/qp/physical/sys/ShowTTLPlan.java      |   42 -
 .../db/qp/physical/sys/ShowTemplatesPlan.java      |   27 -
 .../db/qp/physical/sys/ShowTimeSeriesPlan.java     |   14 -
 .../iotdb/db/qp/physical/sys/ShowTriggersPlan.java |   27 -
 .../db/qp/physical/sys/StorageGroupMNodePlan.java  |  110 -
 .../iotdb/db/qp/physical/sys/TracingPlan.java      |   45 -
 .../db/qp/physical/sys/UnsetTemplatePlan.java      |  109 -
 .../iotdb/db/qp/strategy/LogicalChecker.java       |   46 -
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |  131 -
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |   59 -
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |  408 ---
 .../qp/strategy/optimizer/DnfFilterOptimizer.java  |  163 --
 .../db/qp/strategy/optimizer/IFilterOptimizer.java |   29 -
 .../qp/strategy/optimizer/ILogicalOptimizer.java   |   30 -
 .../optimizer/MergeSingleFilterOptimizer.java      |  179 --
 .../qp/strategy/optimizer/RemoveNotOptimizer.java  |  104 -
 .../iotdb/db/qp/utils/EmptyOutputStream.java       |   35 -
 .../apache/iotdb/db/qp/utils/WildcardsRemover.java |  149 --
 .../db/query/aggregation/AggregateResult.java      |  377 ---
 .../db/query/aggregation/impl/AvgAggrResult.java   |  222 --
 .../db/query/aggregation/impl/CountAggrResult.java |  122 -
 .../query/aggregation/impl/ExtremeAggrResult.java  |  175 --
 .../aggregation/impl/FirstValueAggrResult.java     |  141 --
 .../aggregation/impl/FirstValueDescAggrResult.java |   88 -
 .../aggregation/impl/LastValueAggrResult.java      |  131 -
 .../aggregation/impl/LastValueDescAggrResult.java  |  110 -
 .../query/aggregation/impl/MaxTimeAggrResult.java  |  119 -
 .../aggregation/impl/MaxTimeDescAggrResult.java    |   92 -
 .../query/aggregation/impl/MaxValueAggrResult.java |  126 -
 .../query/aggregation/impl/MinTimeAggrResult.java  |  134 -
 .../aggregation/impl/MinTimeDescAggrResult.java    |   76 -
 .../query/aggregation/impl/MinValueAggrResult.java |  124 -
 .../db/query/aggregation/impl/SumAggrResult.java   |  172 --
 .../iotdb/db/query/context/QueryContext.java       |    9 -
 .../db/query/control/QueryResourceManager.java     |   98 +-
 .../iotdb/db/query/control/QueryTimeManager.java   |  151 --
 .../iotdb/db/query/control/SessionManager.java     |   40 -
 .../db/query/control/tracing/TracingConstant.java  |   30 -
 .../db/query/control/tracing/TracingInfo.java      |  164 --
 .../db/query/control/tracing/TracingManager.java   |   88 -
 .../db/query/dataset/AlignByDeviceDataSet.java     |  281 ---
 .../db/query/dataset/DirectAlignByTimeDataSet.java |   34 -
 .../db/query/dataset/DirectNonAlignDataSet.java    |   32 -
 .../apache/iotdb/db/query/dataset/ListDataSet.java |   61 -
 .../db/query/dataset/NonAlignEngineDataSet.java    |  353 ---
 .../dataset/RawQueryDataSetWithValueFilter.java    |  264 --
 .../dataset/RawQueryDataSetWithoutValueFilter.java |  728 ------
 .../query/dataset/ShowContinuousQueriesResult.java |   75 -
 .../apache/iotdb/db/query/dataset/ShowDataSet.java |   69 -
 .../iotdb/db/query/dataset/ShowDevicesDataSet.java |   86 -
 .../db/query/dataset/ShowTimeseriesDataSet.java    |  109 -
 .../iotdb/db/query/dataset/SingleDataSet.java      |   56 -
 .../iotdb/db/query/dataset/UDFInputDataSet.java    |   67 -
 .../UDFRawQueryInputDataSetWithoutValueFilter.java |   68 -
 .../db/query/dataset/UDTFAlignByTimeDataSet.java   |  373 ---
 .../apache/iotdb/db/query/dataset/UDTFDataSet.java |  145 --
 .../db/query/dataset/UDTFNonAlignDataSet.java      |  216 --
 .../query/dataset/groupby/GroupByFillDataSet.java  |  340 ---
 .../query/dataset/groupby/GroupByLevelDataSet.java |   93 -
 .../query/dataset/groupby/GroupByTimeDataSet.java  |  165 --
 .../dataset/groupby/GroupByTimeEngineDataSet.java  |   93 -
 .../groupby/GroupByWithValueFilterDataSet.java     |  234 --
 .../groupby/GroupByWithoutValueFilterDataSet.java  |  161 --
 .../db/query/executor/AggregationExecutor.java     |  706 ------
 .../iotdb/db/query/executor/FillQueryExecutor.java |  206 --
 .../iotdb/db/query/executor/IQueryRouter.java      |   74 -
 .../iotdb/db/query/executor/LastQueryExecutor.java |  285 ---
 .../iotdb/db/query/executor/QueryRouter.java       |  274 --
 .../db/query/executor/RawDataQueryExecutor.java    |  185 --
 .../iotdb/db/query/executor/UDFQueryExecutor.java  |  112 -
 .../executor/fill/AlignedLastPointReader.java      |   58 -
 .../apache/iotdb/db/query/executor/fill/IFill.java |  150 --
 .../db/query/executor/fill/LastPointReader.java    |  266 --
 .../iotdb/db/query/executor/fill/LinearFill.java   |  263 --
 .../iotdb/db/query/executor/fill/PreviousFill.java |  138 -
 .../iotdb/db/query/executor/fill/ValueFill.java    |  152 --
 .../executor/groupby/AlignedGroupByExecutor.java   |   37 -
 .../db/query/executor/groupby/GroupByExecutor.java |   40 -
 .../groupby/SlidingWindowGroupByExecutor.java      |   66 -
 .../SlidingWindowGroupByExecutorFactory.java       |  117 -
 .../EmptyQueueSlidingWindowGroupByExecutor.java    |   51 -
 .../groupby/impl/LocalAlignedGroupByExecutor.java  |  366 ---
 .../groupby/impl/LocalGroupByExecutor.java         |  367 ---
 ...MonotonicQueueSlidingWindowGroupByExecutor.java |   73 -
 .../NormalQueueSlidingWindowGroupByExecutor.java   |   61 -
 .../SmoothQueueSlidingWindowGroupByExecutor.java   |   55 -
 .../db/query/externalsort/ExternalSortJob.java     |   43 -
 .../query/externalsort/ExternalSortJobEngine.java  |   52 -
 .../db/query/externalsort/ExternalSortJobPart.java |   43 -
 .../externalsort/ExternalSortJobScheduler.java     |   40 -
 .../iotdb/db/query/externalsort/LineMerger.java    |   55 -
 .../MultiSourceExternalSortJobPart.java            |   50 -
 .../externalsort/SimpleExternalSortEngine.java     |  178 --
 .../SingleSourceExternalSortJobPart.java           |   39 -
 .../adapter/ByTimestampReaderAdapter.java          |   73 -
 .../serialize/IExternalSortFileDeserializer.java   |   32 -
 .../serialize/IExternalSortFileSerializer.java     |   30 -
 .../FixLengthIExternalSortFileDeserializer.java    |  267 --
 .../impl/FixLengthTimeValuePairSerializer.java     |  169 --
 .../db/query/factory/AggregateResultFactory.java   |  150 --
 .../iotdb/db/query/pool/QueryTaskManager.java      |   90 -
 .../db/query/pool/RawQueryReadTaskPoolManager.java |  104 -
 .../pool/RawQueryReadTaskPoolManagerMetrics.java   |   92 -
 .../db/query/reader/chunk/ChunkDataIterator.java   |   79 -
 .../db/query/reader/chunk/ChunkReaderWrap.java     |   95 -
 .../reader/chunk/DiskChunkReaderByTimestamp.java   |   82 -
 .../resource/CachedUnseqResourceMergeReader.java   |   43 -
 .../series/AlignedSeriesAggregateReader.java       |  189 --
 .../reader/series/BaseManagedSeriesReader.java     |   45 -
 .../db/query/reader/series/IAggregateReader.java   |   57 -
 .../db/query/reader/series/IReaderByTimestamp.java |   47 -
 .../query/reader/series/ManagedSeriesReader.java   |   37 -
 .../query/reader/series/SeriesAggregateReader.java |  175 --
 .../reader/series/SeriesRawDataBatchReader.java    |   63 +-
 .../reader/series/SeriesRawDataPointReader.java    |   87 -
 .../iotdb/db/query/reader/series/SeriesReader.java |   51 -
 .../reader/series/SeriesReaderByTimestamp.java     |  189 --
 .../reader/universal/PriorityMergeReader.java      |   10 -
 .../query/timegenerator/ServerTimeGenerator.java   |  182 --
 .../java/org/apache/iotdb/db/service/DataNode.java |   98 +-
 .../db/service/DataNodeServerCommandLine.java      |    2 +-
 .../java/org/apache/iotdb/db/service/IoTDB.java    |  251 --
 .../org/apache/iotdb/db/service/IoTDBMBean.java    |   27 -
 .../apache/iotdb/db/service/IoTDBShutdownHook.java |   16 +-
 .../java/org/apache/iotdb/db/service/NewIoTDB.java |  232 --
 .../org/apache/iotdb/db/service/NewIoTDBMBean.java |   28 -
 .../iotdb/db/service/basic/ServiceProvider.java    |  100 -
 .../service/basic/StandaloneServiceProvider.java   |   55 -
 .../iotdb/db/service/metrics/FileMetrics.java      |   97 +
 .../db/service/metrics/IoTDBInternalReporter.java  |   11 +-
 .../service/thrift/impl/ClientRPCServiceImpl.java  |  151 +-
 .../impl/DataNodeInternalRPCServiceImpl.java       |   17 +-
 .../db/service/thrift/impl/TSServiceImpl.java      | 1424 -----------
 .../iotdb/db/sync/pipedata/load/ILoader.java       |   15 +-
 .../db/sync/sender/manager/LocalSyncManager.java   |   21 +-
 .../apache/iotdb/db/tools/TsFileSketchTool.java    |    5 +
 .../java/org/apache/iotdb/db/utils/QueryUtils.java |   34 -
 .../org/apache/iotdb/db/utils/SchemaUtils.java     |   72 +-
 .../iotdb/db/utils/writelog/BatchLogReader.java    |   83 -
 .../apache/iotdb/db/utils/writelog/ILogReader.java |   50 -
 .../apache/iotdb/db/utils/writelog/LogWriter.java  |   19 +-
 .../db/utils/writelog/MultiFileLogReader.java      |   76 -
 .../db/utils/writelog/SingleFileLogReader.java     |  166 --
 .../apache/iotdb/db/auth/AuthorityCheckerTest.java |  264 --
 .../iotdb/db/engine/MetadataManagerHelper.java     |    6 +-
 .../iotdb/db/engine/cache/ChunkCacheTest.java      |   17 -
 .../engine/compaction/CompactionSchedulerTest.java |   33 +-
 .../CompactionSchedulerWithFastPerformerTest.java  |   36 +-
 .../compaction/TestUtilsForAlignedSeries.java      |   30 +-
 ...eCompactionWithFastPerformerValidationTest.java |  100 +
 .../db/engine/compaction/cross/MergeTest.java      |   22 +-
 .../inner/AbstractInnerSpaceCompactionTest.java    |   22 +-
 .../inner/FastCompactionPerformerAlignedTest.java  |    6 +-
 .../InnerSeqCompactionWithFastPerformerTest.java   |   15 -
 ...nerSeqCompactionWithReadChunkPerformerTest.java |   22 +-
 .../InnerUnseqCompactionWithFastPerformerTest.java |   17 -
 ...rUnseqCompactionWithReadPointPerformerTest.java |   22 +-
 .../ReadChunkCompactionPerformerAlignedTest.java   |    6 +-
 .../inner/sizetiered/SizeTieredCompactionTest.java |   22 +-
 .../recover/SizeTieredCompactionRecoverTest.java   |   22 +-
 .../compaction/utils/CompactionConfigRestorer.java |   15 +-
 .../db/engine/storagegroup/DataRegionTest.java     |   13 -
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   30 +-
 .../engine/storagegroup/TsFileProcessorTest.java   |    2 -
 .../LocalConfigNodeMultiDataRegionTest.java        |   94 -
 .../apache/iotdb/db/metadata/MetaUtilsTest.java    |   90 +
 .../iotdb/db/metadata/SchemaAdvancedTest.java      |    3 +-
 .../apache/iotdb/db/metadata/SchemaBasicTest.java  | 1295 ----------
 .../iotdb/db/metadata/SchemaImproveTest.java       |    9 +-
 .../org/apache/iotdb/db/metadata/TemplateTest.java |  180 --
 .../db/metadata/cache/DataNodeSchemaCacheTest.java |    6 +-
 .../iotdb/db/metadata/idtable/IDTableTest.java     |   12 +-
 .../db/metadata/mtree/disk/MemManagerTest.java     |    3 +-
 .../db/metadata/multimode/SchemaDiskModeTest.java  |   42 -
 .../metadata/multimode/SchemaFullMemoryTest.java   |   29 -
 .../metadata/multimode/SchemaMemoryModeTest.java   |   35 -
 .../db/metadata/multimode/SchemaNonMemoryTest.java |   29 -
 .../multimode/SchemaPartialMemoryTest.java         |   28 -
 .../plan/SchemaRegionPlanCompatibilityTest.java    |  279 --
 .../schemaRegion/AbstractSchemaRegionTest.java     |  141 ++
 .../schemaRegion/SchemaRegionAliasAndTagTest.java} |   15 +-
 .../schemaRegion/SchemaRegionBasicTest.java        |  320 +--
 .../schemaRegion/SchemaRegionManagementTest.java   |  161 ++
 .../schemaRegion/SchemaRegionTemplateTest.java     |  185 ++
 .../multimode/SchemaRegionFullMemoryTest.java      |   43 -
 .../multimode/SchemaRegionMemoryTest.java          |   46 -
 .../multimode/SchemaRegionNonMemoryTest.java       |   43 -
 .../multimode/SchemaRegionPartialMemoryTest.java   |   43 -
 .../multimode/SchemaRegionSchemaFileTest.java      |   46 -
 .../iotdb/db/mpp/aggregation/AccumulatorTest.java  |    2 +-
 .../execution/exchange/LocalSinkHandleTest.java    |   63 +-
 .../execution/exchange/LocalSourceHandleTest.java  |    4 +-
 .../execution/exchange/SharedTsBlockQueueTest.java |    5 +-
 .../db/mpp/execution/exchange/SinkHandleTest.java  |   77 +-
 .../mpp/execution/exchange/SourceHandleTest.java   |   10 +-
 .../db/mpp/execution/exchange/StubSinkHandle.java  |    3 +
 .../iotdb/db/mpp/execution/exchange/Utils.java     |   52 +-
 .../db/mpp/execution/memory/MemoryPoolTest.java    |  182 +-
 .../operator/AggregationOperatorTest.java          |    2 +-
 .../AlignedSeriesAggregationScanOperatorTest.java  |    2 +-
 .../execution/operator/AlignedSeriesTestUtil.java  |   86 +-
 .../mpp/execution/operator/OperatorMemoryTest.java |    2 +-
 .../operator/RawDataAggregationOperatorTest.java   |    2 +-
 .../SeriesAggregationScanOperatorTest.java         |    2 +-
 .../SlidingWindowAggregationOperatorTest.java      |    2 +-
 .../operator/VerticallyConcatOperatorTest.java     |    2 +-
 .../operator/schema/CountMergeOperatorTest.java    |    2 +
 .../operator/schema/SchemaCountOperatorTest.java   |    2 +
 .../schema/SchemaQueryScanOperatorTest.java        |    2 +
 .../db/mpp/plan/StandaloneCoordinatorTest.java     |  155 --
 .../plan/analyze/AggregationDescriptorTest.java    |    2 +-
 .../iotdb/db/mpp/plan/plan/LogicalPlannerTest.java |    2 +-
 .../db/mpp/plan/plan/QueryLogicalPlanUtil.java     |    2 +-
 .../distribution/AggregationDistributionTest.java  |    2 +-
 .../node/process/AggregationNodeSerdeTest.java     |    2 +-
 .../node/process/GroupByLevelNodeSerdeTest.java    |    2 +-
 .../plan/node/process/GroupByTagNodeSerdeTest.java |    2 +-
 .../process/SingleDeviceViewNodeSerdeTest.java     |   61 +
 .../source/SeriesAggregationScanNodeSerdeTest.java |    2 +-
 .../plan/scheduler/StandaloneSchedulerTest.java    |  547 ----
 .../java/org/apache/iotdb/db/qp/PlannerTest.java   |  289 ---
 .../iotdb/db/qp/bench/QueryParseBenchmark.java     |   45 -
 .../iotdb/db/qp/logical/LogicalPlanSmallTest.java  |  365 ---
 .../iotdb/db/qp/other/TSPlanContextAuthorTest.java |   94 -
 .../db/qp/utils/DatetimeQueryDataSetUtilsTest.java |   18 +-
 .../db/query/aggregation/AggregateResultTest.java  |  294 ---
 .../query/aggregation/DescAggregateResultTest.java |  190 --
 .../iotdb/db/query/dataset/ListDataSetTest.java    |  164 --
 .../query/dataset/UDTFAlignByTimeDataSetTest.java  |  694 -----
 .../dataset/groupby/GroupByTimeDataSetTest.java    |  492 ----
 .../query/externalsort/ExternalSortEngineTest.java |  193 --
 .../db/query/externalsort/FakeChunkReaderWrap.java |   43 -
 ...ExternalSortFileSerializerDeserializerTest.java |  131 -
 .../reader/series/SeriesAggregateReaderTest.java   |  141 --
 .../reader/series/SeriesReaderByTimestampTest.java |   95 -
 .../db/query/reader/series/SeriesReaderTest.java   |  189 --
 .../query/reader/series/SeriesReaderTestUtil.java  |   19 +-
 .../iotdb/db/rescon/ResourceManagerTest.java       |   22 +-
 .../org/apache/iotdb/db/service/DaemonTest.java    |    4 +-
 .../DataNodeInternalRPCServiceImplTest.java        |    4 +-
 .../db/sync/datasource/PipeOpManagerTest.java      |    6 +-
 .../org/apache/iotdb/db/tools/MLogParserTest.java  |   23 +-
 .../iotdb/db/tools/TsFileAndModSettleToolTest.java |    2 -
 .../iotdb/db/tools/TsFileSketchToolTest.java       |   26 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |   82 +-
 .../org/apache/iotdb/db/utils/SchemaTestUtils.java |    5 +-
 .../org/apache/iotdb/db/utils/SchemaUtilsTest.java |   16 -
 .../iotdb/db/utils/TsFileRewriteToolTest.java      |  460 ----
 .../db/utils/writelog/LogWriterReaderTest.java     |  215 --
 .../db/utils/writelog/MultiFileLogReaderTest.java  |   97 -
 .../db/wal/recover/WALRecoverManagerTest.java      |   61 +-
 .../db/wal/recover/file/TsFilePlanRedoerTest.java  |   87 +-
 .../file/UnsealedTsFileRecoverPerformerTest.java   |   56 +-
 server/src/test/resources/logback-test.xml         |    2 +-
 .../java/org/apache/iotdb/session/ISession.java    |    8 +-
 .../java/org/apache/iotdb/session/Session.java     |   30 +-
 site/src/main/.vuepress/config.js                  |   30 +-
 .../apache/iotdb/spark/db/EnvironmentUtils.java    |    6 +-
 .../org/apache/iotdb/spark/db/IoTDBTest.scala      |    9 +-
 .../org/apache/iotdb/spark/db/IoTDBWriteTest.scala |   14 +-
 .../iotdb/spark/db/unit/DataFrameToolsTest.scala   |   11 +-
 .../test/java/org/apache/iotdb/db/sql/Cases.java   |   46 -
 .../src/main/thrift/confignode.thrift              |   31 +-
 .../tsfile/read/query/dataset/EmptyDataSet.java    |   40 -
 .../tsfile/read/reader/FakedTimeGenerator.java     |   83 -
 683 files changed, 10701 insertions(+), 61493 deletions(-)

diff --cc node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
index 5e809a83dd,16bf0d92b0..b888fb6c8f
--- a/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
@@@ -62,16 -62,7 +62,17 @@@ public enum Metric 
    THRIFT_ACTIVE_THREADS,
    IOT_CONSENSUS,
    STAGE,
 -  POINTS;
++  POINTS,
 +  QUERY_PLAN_COST,
 +  OPERATOR_EXECUTION_COST,
 +  OPERATOR_EXECUTION_COUNT,
 +  SERIES_SCAN_COST,
 +  DISPATCHER,
 +  QUERY_EXECUTION,
 +  AGGREGATION,
 +  QUERY_RESOURCE,
 +  DATA_EXCHANGE,
 +  DRIVER_SCHEDULER;
  
    @Override
    public String toString() {
diff --cc node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Tag.java
index b9019ba153,24bc55a757..b57f515456
--- a/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Tag.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Tag.java
@@@ -24,9 -24,7 +24,10 @@@ public enum Tag 
    NAME,
    REGION,
    STATUS,
 -  DATABASE;
++  DATABASE,
 +  STAGE,
 +  FROM,
 +  OPERATION;
  
    @Override
    public String toString() {
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/LocalSinkHandle.java
index 82e049d76d,91aa31d705..575efdb800
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/LocalSinkHandle.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/LocalSinkHandle.java
@@@ -32,9 -31,7 +32,8 @@@ import org.slf4j.LoggerFactory
  import java.util.List;
  import java.util.Optional;
  
- import static com.google.common.util.concurrent.Futures.immediateFuture;
  import static com.google.common.util.concurrent.Futures.nonCancellationPropagating;
 +import static org.apache.iotdb.db.mpp.metric.DataExchangeMetricSet.SINK_HANDLE_SEND_TSBLOCK_LOCAL;
  
  public class LocalSinkHandle implements ISinkHandle {
  
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java
index 354960b2b5,943d24a6e5..13b665b795
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java
@@@ -23,9 -23,9 +23,10 @@@ import org.apache.iotdb.common.rpc.thri
  import org.apache.iotdb.commons.client.IClientManager;
  import org.apache.iotdb.commons.client.sync.SyncDataNodeMPPDataExchangeServiceClient;
  import org.apache.iotdb.commons.utils.TestOnly;
+ import org.apache.iotdb.db.conf.IoTDBDescriptor;
  import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeManager.SinkHandleListener;
  import org.apache.iotdb.db.mpp.execution.memory.LocalMemoryManager;
 +import org.apache.iotdb.db.mpp.metric.QueryMetricsManager;
  import org.apache.iotdb.db.utils.SetThreadName;
  import org.apache.iotdb.mpp.rpc.thrift.TEndOfDataBlockEvent;
  import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstanceId;
@@@ -95,8 -95,10 +98,12 @@@ public class SinkHandle implements ISin
  
    private boolean noMoreTsBlocks = false;
  
+   /** max bytes this SourceHandle can reserve. */
+   private long maxBytesCanReserve =
+       IoTDBDescriptor.getInstance().getConfig().getMaxBytesPerFragmentInstance();
+ 
 +  private static final QueryMetricsManager QUERY_METRICS = QueryMetricsManager.getInstance();
 +
    public SinkHandle(
        TEndPoint remoteEndpoint,
        TFragmentInstanceId remoteFragmentInstanceId,
@@@ -144,36 -155,35 +160,41 @@@
  
    @Override
    public synchronized void send(TsBlock tsBlock) {
 -    Validate.notNull(tsBlock, "tsBlocks is null");
 -    checkState();
 -    if (!blocked.isDone()) {
 -      throw new IllegalStateException("Sink handle is blocked.");
 -    }
 -    if (noMoreTsBlocks) {
 -      return;
 +    long startTime = System.nanoTime();
 +    try {
 +      Validate.notNull(tsBlock, "tsBlocks is null");
 +      checkState();
 +      if (!blocked.isDone()) {
 +        throw new IllegalStateException("Sink handle is blocked.");
 +      }
 +      if (noMoreTsBlocks) {
 +        return;
 +      }
 +      long retainedSizeInBytes = tsBlock.getRetainedSizeInBytes();
 +      int startSequenceId;
 +      startSequenceId = nextSequenceId;
 +      blocked =
-           localMemoryManager
-               .getQueryPool()
-               .reserve(localFragmentInstanceId.getQueryId(), retainedSizeInBytes)
-               .left;
++              localMemoryManager
++                      .getQueryPool()
++                      .reserve(
++                              localFragmentInstanceId.getQueryId(),
++                              localFragmentInstanceId.getInstanceId(),
++                              localPlanNodeId,
++                              retainedSizeInBytes,
++                              maxBytesCanReserve)
++                      .left;
 +      bufferRetainedSizeInBytes += retainedSizeInBytes;
 +
 +      sequenceIdToTsBlock.put(nextSequenceId, new Pair<>(tsBlock, currentTsBlockSize));
 +      nextSequenceId += 1;
 +      currentTsBlockSize = retainedSizeInBytes;
 +
 +      // TODO: consider merge multiple NewDataBlockEvent for less network traffic.
 +      submitSendNewDataBlockEventTask(startSequenceId, ImmutableList.of(retainedSizeInBytes));
 +    } finally {
 +      QUERY_METRICS.recordDataExchangeCost(
 +          SINK_HANDLE_SEND_TSBLOCK_REMOTE, System.nanoTime() - startTime);
      }
 -    long retainedSizeInBytes = tsBlock.getRetainedSizeInBytes();
 -    int startSequenceId;
 -    startSequenceId = nextSequenceId;
 -    blocked =
 -        localMemoryManager
 -            .getQueryPool()
 -            .reserve(
 -                localFragmentInstanceId.getQueryId(),
 -                localFragmentInstanceId.getInstanceId(),
 -                localPlanNodeId,
 -                retainedSizeInBytes,
 -                maxBytesCanReserve)
 -            .left;
 -    bufferRetainedSizeInBytes += retainedSizeInBytes;
 -
 -    sequenceIdToTsBlock.put(nextSequenceId, new Pair<>(tsBlock, currentTsBlockSize));
 -    nextSequenceId += 1;
 -    currentTsBlockSize = retainedSizeInBytes;
 -
 -    // TODO: consider merge multiple NewDataBlockEvent for less network traffic.
 -    submitSendNewDataBlockEventTask(startSequenceId, ImmutableList.of(retainedSizeInBytes));
    }
  
    @Override
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java
index 2ce4fd5c75,cda072ff0f..f2b08fe744
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java
@@@ -23,9 -23,9 +23,10 @@@ import org.apache.iotdb.common.rpc.thri
  import org.apache.iotdb.commons.client.IClientManager;
  import org.apache.iotdb.commons.client.sync.SyncDataNodeMPPDataExchangeServiceClient;
  import org.apache.iotdb.commons.utils.TestOnly;
+ import org.apache.iotdb.db.conf.IoTDBDescriptor;
  import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeManager.SourceHandleListener;
  import org.apache.iotdb.db.mpp.execution.memory.LocalMemoryManager;
 +import org.apache.iotdb.db.mpp.metric.QueryMetricsManager;
  import org.apache.iotdb.db.utils.SetThreadName;
  import org.apache.iotdb.mpp.rpc.thrift.TAcknowledgeDataBlockEvent;
  import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstanceId;
@@@ -94,8 -90,16 +95,18 @@@ public class SourceHandle implements IS
  
    private boolean closed = false;
  
+   /** max bytes this SourceHandle can reserve. */
+   private long maxBytesCanReserve =
+       IoTDBDescriptor.getInstance().getConfig().getMaxBytesPerFragmentInstance();
+ 
+   /**
+    * this is set to true after calling isBlocked() at least once which indicates that this
+    * SourceHandle needs to output data
+    */
+   private boolean canGetTsBlockFromRemote = false;
+ 
 +  private static final QueryMetricsManager QUERY_METRICS = QueryMetricsManager.getInstance();
 +
    public SourceHandle(
        TEndPoint remoteEndpoint,
        TFragmentInstanceId remoteFragmentInstanceId,
@@@ -139,9 -137,7 +150,8 @@@
  
    @Override
    public synchronized ByteBuffer getSerializedTsBlock() {
 +    long startTime = System.nanoTime();
      try (SetThreadName sourceHandleName = new SetThreadName(threadName)) {
- 
        checkState();
  
        if (!blocked.isDone()) {
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQuerySortOperator.java
index 3e16a8e6d2,522977ec2c..09779cf106
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQuerySortOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQuerySortOperator.java
@@@ -138,28 -140,16 +140,16 @@@ public class LastQuerySortOperator impl
      int endIndex = getEndIndex();
  
      while ((System.nanoTime() - start < maxRuntime)
-         && (currentIndex < endIndex || previousTsBlock != null)
+         && (currentIndex < endIndex
+             || (previousTsBlock != null
+                 && previousTsBlockIndex < previousTsBlock.getPositionCount()))
          && !tsBlockBuilder.isFull()) {
-       if (previousTsBlock != null) {
-         if (canUseDataFromCachedTsBlock(previousTsBlock)) {
-           LastQueryUtil.appendLastValue(tsBlockBuilder, cachedTsBlock, cachedTsBlockRowIndex++);
-         } else {
-           LastQueryUtil.appendLastValue(tsBlockBuilder, previousTsBlock);
-           previousTsBlock = null;
-         }
-       } else {
+       if (previousTsBlock == null || previousTsBlock.getPositionCount() <= previousTsBlockIndex) {
 -        if (children.get(currentIndex).hasNext()) {
 -          previousTsBlock = children.get(currentIndex).next();
 +        if (children.get(currentIndex).hasNextWithTimer()) {
-           TsBlock tsBlock = children.get(currentIndex).nextWithTimer();
-           if (tsBlock == null) {
++          previousTsBlock = children.get(currentIndex).nextWithTimer();
+           previousTsBlockIndex = 0;
+           if (previousTsBlock == null) {
              return null;
-           } else if (!tsBlock.isEmpty()) {
-             if (canUseDataFromCachedTsBlock(tsBlock)) {
-               LastQueryUtil.appendLastValue(tsBlockBuilder, cachedTsBlock, cachedTsBlockRowIndex++);
-               previousTsBlock = tsBlock;
-             } else {
-               // it is safe to append the whole TsBlock
-               LastQueryUtil.appendLastValue(tsBlockBuilder, tsBlock);
-             }
            }
          }
          currentIndex++;
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java
index 1a6782a5f3,83f0378323..2da090a5c2
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java
@@@ -19,9 -19,7 +19,8 @@@
  
  package org.apache.iotdb.db.mpp.plan.analyze;
  
- import org.apache.iotdb.db.conf.IoTDBDescriptor;
  import org.apache.iotdb.db.mpp.common.MPPQueryContext;
 +import org.apache.iotdb.db.mpp.metric.QueryMetricsManager;
  import org.apache.iotdb.db.mpp.plan.statement.Statement;
  
  import static org.apache.iotdb.db.mpp.common.QueryId.mockQueryId;
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
index 4f53cdc79b,99a7f606c7..e16f00dcf6
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
@@@ -274,31 -265,18 +273,23 @@@ public class QueryExecution implements 
        this.scheduler.start();
        return;
      }
 +
      // TODO: (xingtanzjr) initialize the query scheduler according to configuration
 +    long startTime = System.nanoTime();
      this.scheduler =
-         config.isClusterMode()
-             ? new ClusterScheduler(
-                 context,
-                 stateMachine,
-                 distributedPlan.getInstances(),
-                 context.getQueryType(),
-                 executor,
-                 writeOperationExecutor,
-                 scheduledExecutor,
-                 internalServiceClientManager)
-             : new StandaloneScheduler(
-                 context,
-                 stateMachine,
-                 distributedPlan.getInstances(),
-                 context.getQueryType(),
-                 scheduledExecutor,
-                 internalServiceClientManager);
+         new ClusterScheduler(
+             context,
+             stateMachine,
+             distributedPlan.getInstances(),
+             context.getQueryType(),
+             executor,
+             writeOperationExecutor,
+             scheduledExecutor,
+             internalServiceClientManager);
      this.scheduler.start();
 +    if (rawStatement.isQuery()) {
 +      QUERY_METRICS.recordExecutionCost(SCHEDULE, System.nanoTime() - startTime);
 +    }
    }
  
    // Use LogicalPlanner to do the logical query plan and logical optimization
diff --cc server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
index d41a3606f3,d2129443f3..44b7d62e9b
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
@@@ -126,11 -124,7 +127,8 @@@ import java.util.ArrayList
  import java.util.List;
  import java.util.Map;
  import java.util.Optional;
 +import java.util.concurrent.TimeUnit;
  
- import static org.apache.iotdb.db.service.basic.ServiceProvider.AUDIT_LOGGER;
- import static org.apache.iotdb.db.service.basic.ServiceProvider.CURRENT_RPC_VERSION;
- import static org.apache.iotdb.db.service.basic.ServiceProvider.QUERY_FREQUENCY_RECORDER;
  import static org.apache.iotdb.db.utils.ErrorHandlingUtils.onIoTDBException;
  import static org.apache.iotdb.db.utils.ErrorHandlingUtils.onNPEOrUnexpectedException;
  import static org.apache.iotdb.db.utils.ErrorHandlingUtils.onQueryException;
@@@ -208,10 -199,6 +204,7 @@@ public class ClientRPCServiceImpl imple
          return RpcUtils.getTSExecuteStatementResp(status);
        }
  
-       QUERY_FREQUENCY_RECORDER.incrementAndGet();
-       AUDIT_LOGGER.debug("Session {} execute Query: {}", req.sessionId, statement);
 +      statementType = s.getType();
- 
        queryId = SESSION_MANAGER.requestQueryId(SESSION_MANAGER.getCurrSession(), req.statementId);
        // create and cache dataset
        ExecutionResult result =


[iotdb] 02/02: spotless apply

Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hui pushed a commit to branch lmh/addQueryMetrics
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 03c0c8195a6e1749ffbb738668c26818dc0beb1c
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Tue Dec 20 09:30:11 2022 +0800

    spotless apply
---
 .../iotdb/db/mpp/execution/exchange/SinkHandle.java    | 18 +++++++++---------
 .../db/service/thrift/impl/ClientRPCServiceImpl.java   |  2 --
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java
index 13b665b795..539bdd86d5 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java
@@ -174,15 +174,15 @@ public class SinkHandle implements ISinkHandle {
       int startSequenceId;
       startSequenceId = nextSequenceId;
       blocked =
-              localMemoryManager
-                      .getQueryPool()
-                      .reserve(
-                              localFragmentInstanceId.getQueryId(),
-                              localFragmentInstanceId.getInstanceId(),
-                              localPlanNodeId,
-                              retainedSizeInBytes,
-                              maxBytesCanReserve)
-                      .left;
+          localMemoryManager
+              .getQueryPool()
+              .reserve(
+                  localFragmentInstanceId.getQueryId(),
+                  localFragmentInstanceId.getInstanceId(),
+                  localPlanNodeId,
+                  retainedSizeInBytes,
+                  maxBytesCanReserve)
+              .left;
       bufferRetainedSizeInBytes += retainedSizeInBytes;
 
       sequenceIdToTsBlock.put(nextSequenceId, new Pair<>(tsBlock, currentTsBlockSize));
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
index 44b7d62e9b..7f9fd949e7 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
@@ -38,8 +38,6 @@ import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher;
 import org.apache.iotdb.db.mpp.plan.analyze.ClusterSchemaFetcher;
 import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher;
 import org.apache.iotdb.db.mpp.plan.analyze.ISchemaFetcher;
-import org.apache.iotdb.db.mpp.plan.analyze.StandalonePartitionFetcher;
-import org.apache.iotdb.db.mpp.plan.analyze.StandaloneSchemaFetcher;
 import org.apache.iotdb.db.mpp.plan.constant.StatementType;
 import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult;
 import org.apache.iotdb.db.mpp.plan.execution.IQueryExecution;