This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch calldepversion
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from e52fa2d55a Merge branch 'master' into calldepversion
add f17ddf763d solve conflict and library-udf error
add f9b3b0f8d2 [IOTDB-3104] Add Consensus Module StateMachine Event API
(#5806)
add 38473d1a00 Fix the issue that sometimes the FragmentInstance may stuck
in FLUSHING states (#5808)
add a01199d22c [IOTDB-2987] Optimize ConfigNodeGroup startup process
(#5802)
add 602b4f408d Optimize the logger recording of MPP (#5815)
add bb4ccb3d89 [IOTDB-3103] Implementation of
NonOverlappedMultiColumnMerger (#5805)
add 27390d65f8 push down limit to rawdatasetwithValueFilter (#5813)
add 2031319c2d [IOTDB-3016] do flush when graceful stop IoTDB (#5800)
add e76b727f98 add compaction speed log (#5826)
add be385cd2db [IOTDB-3047] Path does not exist when delete storage group
(#5738)
add 104da23532 [IOTDB-2962] [IOTDB-3079] Refactor SQL parser and
implememtation of complete Analyzer (#5819)
add b2f3c4b668 [IOTDB-3093] Use TsBlock to query data in TVList (#5772)
add 89825b6336 Merge remote-tracking branch 'origin/master' into
calldepversion
add 2c1604711d solve conflict and library-udf error
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 67 +-
.../resources/conf/iotdb-confignode.properties | 179 +++--
confignode/src/assembly/resources/conf/logback.xml | 2 +-
...lientPool.java => AsyncDataNodeClientPool.java} | 11 +-
.../client/SyncConfigNodeClientPool.java | 107 +++
.../iotdb/confignode/conf/ConfigNodeConf.java | 126 +--
.../iotdb/confignode/conf/ConfigNodeConfCheck.java | 155 ----
.../iotdb/confignode/conf/ConfigNodeConstant.java | 6 +-
.../confignode/conf/ConfigNodeDescriptor.java | 54 +-
.../confignode/conf/ConfigNodeStartupCheck.java | 356 +++++++++
.../consensus/request/ConfigRequest.java | 38 +-
.../consensus/request/ConfigRequestType.java | 37 +-
.../consensus/request/auth/AuthorReq.java | 68 +-
.../request/read/GetDataPartitionReq.java | 9 +-
.../request/read/GetSchemaPartitionReq.java | 5 +-
...torageGroupReq.java => ApplyConfigNodeReq.java} | 32 +-
.../request/write/CreateDataPartitionReq.java | 13 +-
.../consensus/request/write/CreateRegionsReq.java | 4 +-
.../request/write/CreateSchemaPartitionReq.java | 8 +-
.../consensus/request/write/DeleteRegionsReq.java | 4 +-
.../request/write/RegisterDataNodeReq.java | 4 +-
.../request/write/SetStorageGroupReq.java | 4 +-
.../response/DataNodeConfigurationResp.java | 11 +-
.../statemachine/PartitionRegionStateMachine.java | 4 +-
.../confignode/manager/ClusterSchemaManager.java | 12 +-
.../iotdb/confignode/manager/ConfigManager.java | 83 +-
.../iotdb/confignode/manager/ConsensusManager.java | 67 +-
.../apache/iotdb/confignode/manager/Manager.java | 28 +-
.../{DataNodeManager.java => NodeManager.java} | 74 +-
.../iotdb/confignode/persistence/AuthorInfo.java | 22 +-
.../confignode/persistence/ClusterSchemaInfo.java | 2 +
.../{DataNodeInfo.java => NodeInfo.java} | 126 ++-
.../executor/ConfigRequestExecutor.java | 49 +-
.../iotdb/confignode/service/ConfigNode.java | 30 +-
.../confignode/service/ConfigNodeCommandLine.java | 24 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 37 +-
.../consensus/request/ConfigRequestSerDeTest.java | 62 +-
.../thrift/ConfigNodeRPCServiceProcessorTest.java | 16 +-
.../org/apache/iotdb/consensus/IStateMachine.java | 40 +-
.../org/apache/iotdb/consensus/common/Peer.java | 5 +
.../ratis/ApplicationStateMachineProxy.java | 36 +-
.../iotdb/consensus/ratis/RatisConsensus.java | 53 +-
.../org/apache/iotdb/consensus/ratis/Utils.java | 47 +-
.../apache/iotdb/consensus/EmptyStateMachine.java | 2 +-
.../iotdb/consensus/ratis/RatisConsensusTest.java | 13 +-
.../apache/iotdb/consensus/ratis/SnapshotTest.java | 2 +-
.../apache/iotdb/consensus/ratis/TestUtils.java | 37 +-
.../apache/iotdb/consensus/ratis/UtilsTest.java | 4 +-
.../standalone/StandAloneConsensusTest.java | 2 +-
.../IoTDBSyntaxConventionStringLiteralIT.java | 8 +-
.../iotdb/db/integration/env/StandaloneEnv.java | 58 +-
.../IoTDBDeletionVersionAdaptionIT.java | 2 +
.../IoTDBQueryVersionAdaptionIT.java | 2 +
.../apache/iotdb/library/dmatch/DMatchTests.java | 62 +-
.../iotdb/library/dprofile/DProfileTests.java | 4 +-
.../iotdb/library/dquality/DQualityTests.java | 14 +-
.../apache/iotdb/library/drepair/DRepairTests.java | 12 +-
.../iotdb/library/frequency/FrequencyTests.java | 4 +-
.../apache/iotdb/library/series/SeriesTest.java | 4 +-
.../apache/iotdb/library/string/StringTests.java | 10 +-
.../iotdb/commons/consensus/ConsensusGroupId.java | 4 +
.../apache/iotdb/commons/utils/CommonUtils.java | 59 --
.../apache/iotdb/commons/utils/NodeUrlUtils.java | 188 +++++
.../commons/utils/ThriftCommonsSerDeUtils.java | 27 +-
.../commons/utils/ThriftConfigNodeSerDeUtils.java | 24 +-
.../iotdb/commons/utils/NodeUrlUtilsTest.java | 62 ++
.../commons/utils/ThriftCommonsSerDeUtilsTest.java | 28 +-
.../utils/ThriftConfigNodeSerDeUtilsTest.java | 18 +-
server/src/assembly/resources/sbin/stop-server.sh | 47 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 5 +-
.../consensus/statemachine/BaseStateMachine.java | 2 +-
.../statemachine/SchemaRegionStateMachine.java | 5 +-
.../compaction/cross/CrossSpaceCompactionTask.java | 19 +-
.../compaction/inner/InnerSpaceCompactionTask.java | 7 +-
.../engine/memtable/AlignedWritableMemChunk.java | 6 +-
.../querycontext/AlignedReadOnlyMemChunk.java | 170 ++--
.../db/engine/querycontext/ReadOnlyMemChunk.java | 104 ++-
.../iotdb/db/metadata/LocalSchemaProcessor.java | 5 +-
.../iotdb/db/metadata/mtree/MTreeAboveSG.java | 4 +-
.../iotdb/db/metadata/path/MeasurementPath.java | 4 +
.../db/metadata/utils/ResourceByPathUtils.java | 6 +-
.../iotdb/db/mpp/common/header/ColumnHeader.java | 81 +-
.../iotdb/db/mpp/common/header/DatasetHeader.java | 2 +-
.../db/mpp/common/schematree/DeviceSchemaInfo.java | 77 +-
.../iotdb/db/mpp/common/schematree/SchemaTree.java | 30 +-
.../execution/datatransfer/DataBlockManager.java | 41 +-
.../db/mpp/execution/datatransfer/SinkHandle.java | 71 +-
.../mpp/execution/datatransfer/SourceHandle.java | 78 +-
.../operator/process/TimeJoinOperator.java | 31 +-
.../operator/process/merge/ColumnMerger.java | 2 +-
.../operator/process/merge/MultiColumnMerger.java | 4 +-
.../merge/NonOverlappedMultiColumnMerger.java | 87 +++
.../operator/process/merge/SingleColumnMerger.java | 23 +-
.../apache/iotdb/db/mpp/plan/analyze/Analysis.java | 138 +++-
.../apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 656 ++++++++++++++--
.../db/mpp/plan/analyze/ClusterSchemaFetcher.java | 9 +-
.../plan/analyze/ColumnPaginationController.java | 73 ++
.../db/mpp/plan/analyze/ConcatPathRewriter.java | 135 ++++
.../db/mpp/plan/analyze/ExpressionAnalyzer.java | 854 +++++++++++++++++++++
.../iotdb/db/mpp/plan/analyze/ExpressionUtils.java | 242 ++++++
.../mpp/plan/analyze/GroupByLevelController.java | 144 ++++
.../iotdb/db/mpp/plan/analyze/TypeProvider.java | 23 +-
.../db/mpp/plan/execution/QueryExecution.java | 43 +-
.../mpp/plan/execution/config/ConfigExecution.java | 8 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 686 +++--------------
.../db/mpp/plan/parser/StatementGenerator.java | 21 +-
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 18 +-
.../db/mpp/plan/planner/LogicalPlanBuilder.java | 14 +-
.../iotdb/db/mpp/plan/planner/LogicalPlanner.java | 47 +-
.../planner/SimpleFragmentParallelPlanner.java | 6 +-
.../plan/planner/WriteFragmentParallelPlanner.java | 6 +-
.../db/mpp/plan/planner/plan/FragmentInstance.java | 15 +-
.../node/metedata/read/SchemaFetchMergeNode.java | 4 +
.../node/metedata/read/SchemaQueryMergeNode.java | 4 +
.../plan/planner/plan/node/process/FillNode.java | 33 +-
.../source/AlignedSeriesAggregationScanNode.java | 5 +-
.../plan/node/source/AlignedSeriesScanNode.java | 4 +-
.../node/source/SeriesAggregationScanNode.java | 5 +-
.../planner/plan/node/source/SeriesScanNode.java | 4 +-
.../planner/plan/parameter/FillDescriptor.java | 30 +-
.../plan/parameter/FilterNullParameter.java | 14 +-
.../plan/parameter/GroupByTimeParameter.java | 11 +
.../plan/planner/plan/parameter/OutputColumn.java | 2 +-
.../plan/rewriter/ColumnPaginationController.java | 145 ----
.../db/mpp/plan/rewriter/ConcatPathRewriter.java | 190 -----
.../db/mpp/plan/rewriter/WildcardsRemover.java | 375 ---------
.../db/mpp/plan/scheduler/ClusterScheduler.java | 14 +-
.../scheduler/SimpleFragInstanceDispatcher.java | 1 -
.../mpp/plan/scheduler/SimpleQueryTerminator.java | 28 +-
.../db/mpp/plan/statement/StatementVisitor.java | 35 -
.../plan/statement/component/FillComponent.java | 25 +-
.../statement/component/GroupByLevelComponent.java | 20 -
.../component/GroupByLevelController.java | 247 ------
.../mpp/plan/statement/component/ResultColumn.java | 113 +--
.../plan/statement/component/SelectComponent.java | 105 +--
.../plan/statement/component/WhereCondition.java | 16 +-
.../statement/crud/AggregationQueryStatement.java | 129 ----
.../plan/statement/crud/FillQueryStatement.java | 79 --
.../statement/crud/GroupByFillQueryStatement.java | 49 --
.../plan/statement/crud/GroupByQueryStatement.java | 61 --
.../plan/statement/crud/LastQueryStatement.java | 74 --
.../db/mpp/plan/statement/crud/QueryStatement.java | 213 ++---
.../plan/statement/crud/UDAFQueryStatement.java | 97 ---
.../plan/statement/crud/UDTFQueryStatement.java | 34 -
.../plan/statement/literal/BooleanLiteral.java} | 57 +-
.../plan/statement/literal/DoubleLiteral.java} | 54 +-
.../db/mpp/plan/statement/literal/Literal.java | 59 ++
.../plan/statement/literal/LongLiteral.java} | 54 +-
.../literal/NullLiteral.java} | 45 +-
.../plan/statement/literal/StringLiteral.java} | 52 +-
.../iotdb/db/qp/constant/FilterConstant.java | 11 +
.../iotdb/db/qp/logical/crud/InOperator.java | 4 +
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 451 +++++------
.../dataset/RawQueryDataSetWithValueFilter.java | 6 +-
.../iotdb/db/query/expression/Expression.java | 16 +-
.../iotdb/db/query/expression/ResultColumn.java | 12 +-
.../query/expression/binary/BinaryExpression.java | 42 +-
.../db/query/expression/leaf/ConstantOperand.java | 20 +-
.../query/expression/leaf/TimeSeriesOperand.java | 23 -
.../db/query/expression/leaf/TimestampOperand.java | 17 -
.../query/expression/multi/FunctionExpression.java | 35 -
.../db/query/expression/unary/InExpression.java | 8 +
.../db/query/expression/unary/LikeExpression.java | 8 +
.../query/expression/unary/RegularExpression.java | 8 +
.../db/query/expression/unary/UnaryExpression.java | 26 -
.../query/reader/chunk/MemAlignedChunkReader.java | 52 +-
.../query/reader/chunk/MemAlignedPageReader.java | 86 ++-
.../db/query/reader/chunk/MemChunkReader.java | 3 +-
.../iotdb/db/query/reader/chunk/MemPageReader.java | 122 +--
.../apache/iotdb/db/service/IoTDBShutdownHook.java | 7 +
.../service/thrift/impl/InternalServiceImpl.java | 12 +-
.../db/sync/receiver/collector/Collector.java | 1 +
.../iotdb/db/sync/receiver/load/SchemaLoader.java | 37 +-
.../db/sync/sender/manager/SchemaSyncManager.java | 4 +-
.../db/utils/datastructure/AlignedTVList.java | 239 +++---
.../iotdb/db/utils/datastructure/BinaryTVList.java | 19 +
.../db/utils/datastructure/BooleanTVList.java | 19 +
.../iotdb/db/utils/datastructure/DoubleTVList.java | 21 +
.../iotdb/db/utils/datastructure/FloatTVList.java | 21 +
.../iotdb/db/utils/datastructure/IntTVList.java | 19 +
.../iotdb/db/utils/datastructure/LongTVList.java | 19 +
.../iotdb/db/utils/datastructure/TVList.java | 139 +---
.../db/engine/memtable/PrimitiveMemTableTest.java | 3 +-
.../db/mpp/common/schematree/SchemaTreeTest.java | 3 +-
.../db/mpp/execution/ConfigExecutionTest.java | 2 +-
.../mpp/execution/datatransfer/SinkHandleTest.java | 3 +-
.../execution/datatransfer/SourceHandleTest.java | 1 +
...ava => NonOverlappedMultiColumnMergerTest.java} | 206 ++---
.../{AnalyzerTest.java => AnalyzeFailTest.java} | 7 +-
.../{AnalyzerTest.java => AnalyzeTest.java} | 37 +-
.../plan/plan/node/process/FillNodeSerdeTest.java | 8 +-
.../db/utils/datastructure/VectorTVListTest.java | 2 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 5 +-
.../java/org/apache/iotdb/session/Session.java | 19 +-
.../src/main/thrift/confignode.thrift | 48 +-
thrift/src/main/thrift/mpp.thrift | 1 +
.../iotdb/tsfile/read/common/block/TsBlock.java | 16 +-
.../read/common/block/column/ColumnBuilder.java | 8 +-
.../java/org/apache/iotdb/tsfile/utils/Pair.java | 8 +
199 files changed, 6141 insertions(+), 5046 deletions(-)
rename
confignode/src/main/java/org/apache/iotdb/confignode/client/{AsyncClientPool.java
=> AsyncDataNodeClientPool.java} (90%)
create mode 100644
confignode/src/main/java/org/apache/iotdb/confignode/client/SyncConfigNodeClientPool.java
delete mode 100644
confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfCheck.java
create mode 100644
confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
copy
confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/{SetStorageGroupReq.java
=> ApplyConfigNodeReq.java} (64%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/manager/{DataNodeManager.java
=> NodeManager.java} (66%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/persistence/{DataNodeInfo.java
=> NodeInfo.java} (54%)
rename confignode/src/main/java/org/apache/iotdb/confignode/{service =>
persistence}/executor/ConfigRequestExecutor.java (85%)
delete mode 100644
node-commons/src/main/java/org/apache/iotdb/commons/utils/CommonUtils.java
create mode 100644
node-commons/src/main/java/org/apache/iotdb/commons/utils/NodeUrlUtils.java
create mode 100644
node-commons/src/test/java/org/apache/iotdb/commons/utils/NodeUrlUtilsTest.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/merge/NonOverlappedMultiColumnMerger.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ConcatPathRewriter.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ExpressionAnalyzer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ExpressionUtils.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/GroupByLevelController.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/rewriter/ColumnPaginationController.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/rewriter/ConcatPathRewriter.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/rewriter/WildcardsRemover.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/GroupByLevelController.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/AggregationQueryStatement.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/FillQueryStatement.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/GroupByFillQueryStatement.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/GroupByQueryStatement.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/LastQueryStatement.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/UDAFQueryStatement.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/UDTFQueryStatement.java
copy
server/src/main/java/org/apache/iotdb/db/{metadata/idtable/entry/PlainDeviceID.java
=> mpp/plan/statement/literal/BooleanLiteral.java} (55%)
copy
server/src/main/java/org/apache/iotdb/db/{metadata/idtable/entry/PlainDeviceID.java
=> mpp/plan/statement/literal/DoubleLiteral.java} (59%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/literal/Literal.java
copy
server/src/main/java/org/apache/iotdb/db/{metadata/idtable/entry/PlainDeviceID.java
=> mpp/plan/statement/literal/LongLiteral.java} (60%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/plan/{planner/plan/node/PlanNodeId.java
=> statement/literal/NullLiteral.java} (60%)
copy
server/src/main/java/org/apache/iotdb/db/{metadata/idtable/entry/PlainDeviceID.java
=> mpp/plan/statement/literal/StringLiteral.java} (61%)
copy
server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/{MultiColumnMergerTest.java
=> NonOverlappedMultiColumnMergerTest.java} (59%)
copy
server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/{AnalyzerTest.java =>
AnalyzeFailTest.java} (93%)
rename
server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/{AnalyzerTest.java =>
AnalyzeTest.java} (52%)
