You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2022/03/25 03:17:04 UTC
[iotdb] branch rocksdb/dev updated (24bf860 -> d680373)
This is an automated email from the ASF dual-hosted git repository.
jianyun pushed a change to branch rocksdb/dev
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 24bf860 [rocksdb] delete test file
add d680373 merge master URL: https://geelib.qihoo.net/geelib/repoMergeDetail?repoId=tsdb/iotdb&mergeId=11
No new revisions were added by this update.
Summary of changes:
.../resources/conf/iotdb-cluster.properties | 6 +-
.../resources/conf/iotdb-confignode.properties | 7 +-
.../src/assembly/resources/conf/logback-tool.xml | 0
confignode/src/assembly/resources/conf/logback.xml | 140 ++++++
.../assembly/resources/sbin/start-confignode.bat | 2 +
.../assembly/resources/sbin/start-confignode.sh | 2 +
.../iotdb/confignode/conf/ConfigNodeConf.java | 23 +
.../iotdb/confignode/conf/ConfigNodeConfCheck.java | 19 +-
.../confignode/conf/ConfigNodeDescriptor.java | 4 +-
.../consensus/response/DataNodesInfoDataSet.java | 15 +-
.../statemachine/PartitionRegionStateMachine.java | 2 +-
.../iotdb/confignode/manager/ConfigManager.java | 8 +-
.../iotdb/confignode/partition/PartitionTable.java | 33 +-
.../confignode/service/ConfigNodeCommandLine.java | 10 +-
.../confignode/service/executor/PlanExecutor.java | 32 +-
.../server/ConfigNodeRPCServerProcessor.java | 13 +-
consensus/pom.xml | 11 +-
.../org/apache/iotdb/consensus/IConsensus.java | 5 +-
.../consensus/exception/ConsensusException.java | 4 +
...a => PeerAlreadyInConsensusGroupException.java} | 12 +-
....java => PeerNotInConsensusGroupException.java} | 10 +-
...ption.java => RatisRequestFailedException.java} | 7 +-
.../ratis/ApplicationStateMachineProxy.java | 87 ++++
.../iotdb/consensus/ratis/RatisConsensus.java | 473 ++++++++++++++++++++-
.../iotdb/consensus/ratis/RequestMessage.java | 51 +++
.../iotdb/consensus/ratis/ResponseMessage.java | 62 +++
.../org/apache/iotdb/consensus/ratis/Utils.java | 105 +++++
.../consensus/standalone/StandAloneConsensus.java | 5 +-
consensus/src/main/resources/logback-test.xml | 31 ++
.../iotdb/consensus/ratis/RatisConsensusTest.java | 236 ++++++++++
.../apache/iotdb/consensus/ratis/UtilsTest.java | 31 +-
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 15 +-
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 57 +--
.../iotdb/db/integration/IoTDBMaxTimeQueryIT.java | 134 ++++++
.../integration/IoTDBSizeTieredCompactionIT.java | 2 +-
.../apache/iotdb/commons/ServerCommandLine.java | 6 +-
.../iotdb/commons/concurrent/ThreadName.java | 2 +
.../commons/exception/BadNodeUrlException.java | 9 +-
.../iotdb/commons/partition/DataPartitionInfo.java | 67 +++
.../commons/partition/DataPartitionQueryParam.java | 30 +-
.../iotdb/commons/partition/DataRegionId.java | 21 +-
.../commons/partition/DataRegionReplicaSet.java | 43 +-
.../iotdb/commons/partition/DeviceGroupId.java | 30 +-
.../iotdb/commons/partition/PartitionInfo.java | 23 +-
.../commons/partition/SchemaPartitionInfo.java | 18 +-
.../iotdb/commons/partition/SchemaRegionId.java | 13 +-
.../commons/partition/SchemaRegionReplicaSet.java | 29 +-
.../iotdb/commons/partition/TimePartitionId.java | 13 +-
.../apache/iotdb/commons/service/ServiceType.java | 1 +
.../apache/iotdb/commons/utils/CommonUtils.java | 59 +++
server/pom.xml | 10 +
.../resources/conf/iotdb-engine.properties | 15 +
.../src/assembly/resources/sbin/start-datanode.bat | 75 ++--
.../src/assembly/resources/sbin/start-datanode.sh | 97 +++++
.../src/assembly/resources/sbin/stop-datanode.bat | 27 ++
.../src/assembly/resources/sbin/stop-datanode.sh | 39 ++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 61 ++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 88 +++-
.../consensus/statemachine/BaseStateMachine.java | 48 +--
.../statemachine/DataRegionStateMachine.java | 10 +-
.../statemachine/SchemaRegionStateMachine.java | 10 +-
.../compaction/CompactionMetricsManager.java | 173 ++++++++
.../compaction/CompactionTaskComparator.java | 1 +
.../engine/compaction/CompactionTaskManager.java | 59 +--
.../{ => constant}/CompactionPriority.java | 2 +-
.../compaction/constant/CompactionTaskStatus.java} | 10 +-
.../CompactionType.java} | 11 +-
.../ProcessChunkType.java} | 11 +-
.../utils/AlignedSeriesCompactionExecutor.java | 27 +-
.../utils/SingleSeriesCompactionExecutor.java | 32 +-
.../compaction/task/AbstractCompactionTask.java | 24 +-
.../writer/AbstractCompactionWriter.java | 13 +
.../engine/memtable/AlignedWritableMemChunk.java | 6 +-
.../db/engine/memtable/IWritableMemChunk.java | 6 +
.../db/exception/BadNodeUrlFormatException.java | 11 +-
.../iotdb/db/mpp/buffer/DataBlockManager.java | 2 +-
.../iotdb/db/mpp/buffer/IDataBlockManager.java | 68 +++
.../iotdb/db/mpp/common/FragmentInstanceId.java | 32 +-
.../iotdb/db/mpp/common/MPPQueryContext.java | 16 +-
.../{FragmentId.java => PlanFragmentId.java} | 24 +-
.../org/apache/iotdb/db/mpp/common/QueryId.java | 7 +
.../SessionInfo.java} | 11 +-
.../schematree/PathPatternNode.java} | 13 +-
.../schematree/PathPatternTree.java} | 34 +-
.../common/schematree/SchemaEntityNode.java} | 9 +-
.../common/schematree/SchemaInternalNode.java} | 11 +-
.../common/schematree/SchemaMeasurementNode.java | 11 +-
.../common/schematree/SchemaNode.java} | 9 +-
.../iotdb/db/mpp/common/schematree/SchemaTree.java | 54 +++
.../apache/iotdb/db/mpp/execution/Coordinator.java | 24 +-
.../db/mpp/execution/ExecFragmentInstance.java | 10 +-
.../ExecutionResult.java} | 14 +-
.../iotdb/db/mpp/execution/FragmentInfo.java | 6 +-
.../iotdb/db/mpp/execution/QueryExecution.java | 41 +-
.../mpp/execution/scheduler/ClusterScheduler.java | 4 +-
.../db/mpp/execution/scheduler/IScheduler.java | 4 +-
.../execution/scheduler/StandaloneScheduler.java | 4 +-
.../db/mpp/schedule/task/FragmentInstanceTask.java | 20 +-
...InstanceID.java => FragmentInstanceTaskID.java} | 36 +-
.../apache/iotdb/db/mpp/sql/analyze/Analysis.java | 63 +--
.../{StatementAnalyzer.java => Analyzer.java} | 47 +-
.../ClusterPartitionFetcher.java} | 29 +-
.../ClusterSchemaFetcher.java} | 35 +-
.../IPartitionFetcher.java} | 39 +-
.../ISchemaFetcher.java} | 18 +-
.../analyze/QueryType.java} | 7 +-
.../sql/analyze/StandalonePartitionFetcher.java | 66 +++
.../StandaloneSchemaFetcher.java} | 35 +-
.../db/mpp/sql/planner/DistributionPlanner.java | 99 ++++-
.../iotdb/db/mpp/sql/planner/LogicalPlanner.java | 19 +-
.../mpp/sql/planner/plan/DistributedQueryPlan.java | 34 +-
.../db/mpp/sql/planner/plan/FragmentInstance.java | 85 +++-
...QueryPlan.java => IFragmentParallelPlaner.java} | 25 +-
.../db/mpp/sql/planner/plan/PlanFragment.java | 79 +++-
.../plan/SimpleFragmentParallelPlanner.java | 124 ++++++
.../iotdb/db/mpp/sql/planner/plan/SubPlan.java | 68 +++
.../db/mpp/sql/planner/plan/node/PlanNode.java | 5 +
.../db/mpp/sql/planner/plan/node/PlanNodeType.java | 113 +++++
.../db/mpp/sql/planner/plan/node/PlanNodeUtil.java | 26 ++
.../db/mpp/sql/planner/plan/node/PlanVisitor.java | 4 +
.../plan/node/metedata/read/ShowDevicesNode.java | 11 +
.../planner/plan/node/metedata/read/ShowNode.java | 5 +
.../node/metedata/write/CreateTimeSeriesNode.java | 11 +
.../planner/plan/node/process/AggregateNode.java | 11 +
.../planner/plan/node/process/DeviceMergeNode.java | 11 +
.../planner/plan/node/process/ExchangeNode.java | 96 ++++-
.../sql/planner/plan/node/process/FillNode.java | 11 +
.../sql/planner/plan/node/process/FilterNode.java | 11 +
.../planner/plan/node/process/FilterNullNode.java | 11 +
.../plan/node/process/GroupByLevelNode.java | 11 +
.../sql/planner/plan/node/process/LimitNode.java | 11 +
.../sql/planner/plan/node/process/OffsetNode.java | 11 +
.../sql/planner/plan/node/process/SortNode.java | 11 +
.../planner/plan/node/process/TimeJoinNode.java | 11 +
.../sql/planner/plan/node/sink/CsvSinkNode.java | 11 +
.../planner/plan/node/sink/FragmentSinkNode.java | 72 +++-
.../sql/planner/plan/node/sink/ThriftSinkNode.java | 11 +
.../planner/plan/node/source/CsvSourceNode.java | 22 +
.../plan/node/source/SeriesAggregateScanNode.java | 27 +-
.../planner/plan/node/source/SeriesScanNode.java | 41 +-
.../sql/planner/plan/node/source/SourceNode.java | 5 +
.../plan/node/write/InsertMultiTabletNode.java | 11 +
.../sql/planner/plan/node/write/InsertNode.java | 20 +-
.../sql/planner/plan/node/write/InsertRowNode.java | 11 +
.../planner/plan/node/write/InsertRowsNode.java | 11 +
.../plan/node/write/InsertRowsOfOneDeviceNode.java | 11 +
.../planner/plan/node/write/InsertTabletNode.java | 32 +-
.../statement/crud/InsertBaseStatement.java} | 37 +-
.../statement/crud/InsertTabletStatement.java} | 12 +-
.../iotdb/db/mpp/sql/tree/StatementVisitor.java | 5 +
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 1 +
.../iotdb/db/query/control/SessionManager.java | 88 +++-
.../iotdb/db/query/reader/series/SeriesReader.java | 51 +--
.../java/org/apache/iotdb/db/service/DataNode.java | 222 ++++++++++
.../DataNodeMBean.java} | 9 +-
.../iotdb/db/service/DataNodeManagementServer.java | 102 +++++
.../DataNodeManagementServerMBean.java} | 8 +-
.../db/service/DataNodeServerCommandLine.java | 53 +--
.../InternalService.java} | 36 +-
.../Metric.java => InternalServiceImpl.java} | 31 +-
.../iotdb/db/service/basic/ServiceProvider.java | 6 +-
.../apache/iotdb/db/service/metrics/Metric.java | 3 +
.../handler/DataNodeManagementServiceHandler.java | 58 +++
.../impl/DataNodeManagementServiceImpl.java} | 28 +-
.../db/service/thrift/impl/TSServiceImpl.java | 73 +++-
.../org/apache/iotdb/db/utils/SchemaUtils.java | 1 +
.../engine/compaction/CompactionSchedulerTest.java | 1 +
.../compaction/CompactionTaskComparatorTest.java | 1 +
.../compaction/utils/CompactionConfigRestorer.java | 2 +-
.../db/mpp/schedule/queue/L1PriorityQueueTest.java | 4 +-
.../db/mpp/schedule/queue/L2PriorityQueueTest.java | 4 +-
...tatementAnalyzerTest.java => AnalyzerTest.java} | 4 +-
.../db/mpp/sql/plan/DistributionPlannerTest.java | 128 ++++--
.../iotdb/db/mpp/sql/plan/LogicalPlannerTest.java | 4 +-
thrift/src/main/thrift/mpp.thrift | 21 +-
.../read/TsFileAlignedSeriesReaderIterator.java | 10 +-
176 files changed, 4968 insertions(+), 921 deletions(-)
copy {server => confignode}/src/assembly/resources/conf/logback-tool.xml (100%)
create mode 100644 confignode/src/assembly/resources/conf/logback.xml
copy consensus/src/main/java/org/apache/iotdb/consensus/exception/{ConsensusException.java => PeerAlreadyInConsensusGroupException.java} (66%)
copy consensus/src/main/java/org/apache/iotdb/consensus/exception/{ConsensusException.java => PeerNotInConsensusGroupException.java} (70%)
copy consensus/src/main/java/org/apache/iotdb/consensus/exception/{ConsensusException.java => RatisRequestFailedException.java} (83%)
create mode 100644 consensus/src/main/java/org/apache/iotdb/consensus/ratis/ApplicationStateMachineProxy.java
create mode 100644 consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java
create mode 100644 consensus/src/main/java/org/apache/iotdb/consensus/ratis/ResponseMessage.java
create mode 100644 consensus/src/main/java/org/apache/iotdb/consensus/ratis/Utils.java
create mode 100644 consensus/src/main/resources/logback-test.xml
create mode 100644 consensus/src/test/java/org/apache/iotdb/consensus/ratis/RatisConsensusTest.java
copy server/src/main/java/org/apache/iotdb/db/service/metrics/Metric.java => consensus/src/test/java/org/apache/iotdb/consensus/ratis/UtilsTest.java (60%)
create mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMaxTimeQueryIT.java
copy consensus/src/main/java/org/apache/iotdb/consensus/exception/ConsensusException.java => node-commons/src/main/java/org/apache/iotdb/commons/exception/BadNodeUrlException.java (80%)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionInfo.java
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/DistributedQueryPlan.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/DataPartitionQueryParam.java (61%)
copy server/src/main/java/org/apache/iotdb/db/mpp/common/FragmentInstanceId.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionId.java (65%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/sink/FragmentSinkNode.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionReplicaSet.java (55%)
copy confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/DataNodesInfoDataSet.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/DeviceGroupId.java (59%)
copy server/src/main/java/org/apache/iotdb/db/mpp/common/FragmentInstanceId.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/PartitionInfo.java (57%)
copy server/src/main/java/org/apache/iotdb/db/mpp/common/FragmentInstanceId.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartitionInfo.java (59%)
copy server/src/main/java/org/apache/iotdb/db/mpp/common/FragmentInstanceId.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionId.java (75%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/DistributedQueryPlan.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionReplicaSet.java (59%)
copy server/src/main/java/org/apache/iotdb/db/mpp/common/FragmentInstanceId.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/TimePartitionId.java (77%)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/utils/CommonUtils.java
copy confignode/src/assembly/resources/sbin/start-confignode.bat => server/src/assembly/resources/sbin/start-datanode.bat (62%)
mode change 100644 => 100755
create mode 100755 server/src/assembly/resources/sbin/start-datanode.sh
create mode 100644 server/src/assembly/resources/sbin/stop-datanode.bat
create mode 100644 server/src/assembly/resources/sbin/stop-datanode.sh
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMetricsManager.java
copy server/src/main/java/org/apache/iotdb/db/engine/compaction/{ => constant}/CompactionPriority.java (94%)
rename server/src/main/java/org/apache/iotdb/db/{mpp/common/DataRegionTimeSlice.java => engine/compaction/constant/CompactionTaskStatus.java} (80%)
copy server/src/main/java/org/apache/iotdb/db/engine/compaction/{CompactionPriority.java => constant/CompactionType.java} (84%)
copy server/src/main/java/org/apache/iotdb/db/engine/compaction/{CompactionPriority.java => constant/ProcessChunkType.java} (85%)
copy consensus/src/main/java/org/apache/iotdb/consensus/exception/ConsensusException.java => server/src/main/java/org/apache/iotdb/db/exception/BadNodeUrlFormatException.java (74%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/buffer/IDataBlockManager.java
rename server/src/main/java/org/apache/iotdb/db/mpp/common/{FragmentId.java => PlanFragmentId.java} (68%)
rename server/src/main/java/org/apache/iotdb/db/mpp/{sql/planner/plan/PlanFragmentId.java => common/SessionInfo.java} (83%)
copy server/src/main/java/org/apache/iotdb/db/mpp/{sql/metadata/IMetadataFetcher.java => common/schematree/PathPatternNode.java} (81%)
copy server/src/main/java/org/apache/iotdb/db/mpp/{sql/planner/plan/node/PlanNodeUtil.java => common/schematree/PathPatternTree.java} (60%)
copy server/src/main/java/org/apache/iotdb/db/{engine/compaction/CompactionPriority.java => mpp/common/schematree/SchemaEntityNode.java} (85%)
copy server/src/main/java/org/apache/iotdb/db/{engine/compaction/CompactionPriority.java => mpp/common/schematree/SchemaInternalNode.java} (83%)
copy consensus/src/main/java/org/apache/iotdb/consensus/exception/ConsensusException.java => server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/SchemaMeasurementNode.java (77%)
copy server/src/main/java/org/apache/iotdb/db/{engine/compaction/CompactionPriority.java => mpp/common/schematree/SchemaNode.java} (87%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/SchemaTree.java
copy server/src/main/java/org/apache/iotdb/db/mpp/{common/FragmentInstanceId.java => execution/ExecutionResult.java} (70%)
rename server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/{FragmentInstanceID.java => FragmentInstanceTaskID.java} (59%)
rename server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/{StatementAnalyzer.java => Analyzer.java} (68%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/{planner/plan/node/sink/FragmentSinkNode.java => analyze/ClusterPartitionFetcher.java} (52%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/{planner/plan/node/sink/FragmentSinkNode.java => analyze/ClusterSchemaFetcher.java} (58%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/{planner/plan/node/sink/FragmentSinkNode.java => analyze/IPartitionFetcher.java} (51%)
rename server/src/main/java/org/apache/iotdb/db/mpp/sql/{metadata/IMetadataFetcher.java => analyze/ISchemaFetcher.java} (61%)
rename server/src/main/java/org/apache/iotdb/db/mpp/{common/QuerySession.java => sql/analyze/QueryType.java} (90%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StandalonePartitionFetcher.java
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/{planner/plan/node/sink/FragmentSinkNode.java => analyze/StandaloneSchemaFetcher.java} (56%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/{DistributedQueryPlan.java => IFragmentParallelPlaner.java} (61%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/SimpleFragmentParallelPlanner.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/SubPlan.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/PlanNodeType.java
copy server/src/main/java/org/apache/iotdb/db/mpp/{execution/FragmentInfo.java => sql/statement/crud/InsertBaseStatement.java} (54%)
copy server/src/main/java/org/apache/iotdb/db/mpp/{common/FragmentInstanceId.java => sql/statement/crud/InsertTabletStatement.java} (73%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/service/DataNode.java
copy server/src/main/java/org/apache/iotdb/db/{engine/compaction/CompactionPriority.java => service/DataNodeMBean.java} (86%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/service/DataNodeManagementServer.java
rename server/src/main/java/org/apache/iotdb/db/{engine/compaction/CompactionPriority.java => service/DataNodeManagementServerMBean.java} (86%)
copy confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java => server/src/main/java/org/apache/iotdb/db/service/DataNodeServerCommandLine.java (62%)
copy server/src/main/java/org/apache/iotdb/db/{mpp/sql/planner/plan/node/sink/CsvSinkNode.java => service/InternalService.java} (60%)
copy server/src/main/java/org/apache/iotdb/db/service/{metrics/Metric.java => InternalServiceImpl.java} (62%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/service/thrift/handler/DataNodeManagementServiceHandler.java
copy server/src/main/java/org/apache/iotdb/db/{mpp/sql/planner/plan/node/write/InsertMultiTabletNode.java => service/thrift/impl/DataNodeManagementServiceImpl.java} (58%)
rename server/src/test/java/org/apache/iotdb/db/mpp/sql/analyze/{StatementAnalyzerTest.java => AnalyzerTest.java} (92%)