You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/04/02 10:17:17 UTC
[iotdb] branch ty-mpp updated (f53ecc1 -> a9bd87f)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch ty-mpp
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from f53ecc1 change according to reviews
add 28b9e82 [IOTDB-2824] fix stop-server.sh that wrongly kill process (#5378)
add 534475b Fix cpp client tests cannot pass with latest Windows environment (windows server 2022) (#5375)
add 1ffad89 [IOTDB-2828] Update system_version in system.properties after upgrading finished (#5385)
add ca53f81 Implement SchemaTree Search (#5383)
add cec372a Add interface in ConfigIService (#5386)
add 63b4668 Add isLeaderOf to Consensus (#5377)
add fcc4bf2 Update python client doc and code for NumpyTablet (#5395)
add c414b81 Bump jjwt-jackson from 0.10.7 to 0.10.8 (#5394)
add fdfee46 Bump httpcore from 4.4.13 to 4.4.15 (#5391)
add c96cfa7 [IOTDB-2684] refactoring confignode architecture and schema partition assign (#5374)
add d9fb0c1 [IOTDB-2819][metrics] modify session to session pool. (#5369)
add f144d19 [IOTDB-2836] Fix ErrorHandlingUtils exception stacktrace logging (#5399)
add be883fd [IOTDB-2818] Fix exception occurs when submitting compaction task to global queue (#5384)
add 55566b6 refactor count node by level (#5398)
add 1f7361c [IOTDB-2650] Tablet supports adding String value (#5382)
add d00a3df [IOTDB-2833] Add readme to consensus (#5396)
add 6b07373 Add c rest client example (#5397)
add 566fa07 fix bug in ratis consensus test (#5404)
add d8a0ac4 Unify class definitions of common concepts and move them into node-commons package (#5400)
add a9bd87f resolve conflicts
No new revisions were added by this update.
Summary of changes:
.github/workflows/client.yml | 8 +-
client-py/README.md | 277 ++++++++++++++++++---
client-py/SessionExample.py | 2 +-
client-py/SessionTest.py | 2 +-
confignode/pom.xml | 2 +-
.../iotdb/confignode/conf/ConfigNodeConf.java | 2 +-
.../iotdb/confignode/conf/ConfigNodeConfCheck.java | 28 ++-
.../confignode/conf/ConfigNodeDescriptor.java | 2 +-
.../consensus/response/DataNodesInfoDataSet.java | 12 +-
...chemaDataSet.java => DataPartitionDataSet.java} | 18 +-
.../consensus/response/SchemaPartitionDataSet.java | 82 ++++++
.../response/StorageGroupSchemaDataSet.java | 8 +-
.../iotdb/confignode/manager/ConfigManager.java | 214 ++++++++--------
.../{ConfigManager.java => ConsensusManager.java} | 32 +--
.../iotdb/confignode/manager/DataNodeManager.java | 169 +++++++++++++
.../apache/iotdb/confignode/manager/Manager.java | 119 +++++++++
.../iotdb/confignode/manager/PartitionManager.java | 145 +++++++++++
.../iotdb/confignode/manager/RegionManager.java | 152 +++++++++++
...{DataPartitionInfo.java => DataRegionInfo.java} | 46 ++--
.../iotdb/confignode/partition/PartitionTable.java | 189 --------------
...emaPartitionInfo.java => SchemaRegionInfo.java} | 41 ++-
.../persistence/DataNodeInfoPersistence.java | 186 ++++++++++++++
.../persistence/PartitionInfoPersistence.java | 157 ++++++++++++
.../persistence/RegionInfoPersistence.java | 198 +++++++++++++++
.../iotdb/confignode/physical/PhysicalPlan.java | 14 ++
.../confignode/physical/PhysicalPlanType.java | 6 +-
.../confignode/physical/sys/DataPartitionPlan.java | 78 ++++++
.../physical/sys/RegisterDataNodePlan.java | 12 +-
.../physical/sys/SchemaPartitionPlan.java | 97 ++++++++
.../physical/sys/SetStorageGroupPlan.java | 30 +++
.../confignode/service/balancer/LoadBalancer.java | 12 -
.../confignode/service/executor/PlanExecutor.java | 32 ++-
.../server/ConfigNodeRPCServerProcessor.java | 87 +++++--
.../confignode/util/SerializeDeserializeUtil.java | 242 ++++++++++++++++++
.../hash/DeviceGroupHashExecutorManualTest.java | 4 +-
.../server/ConfigNodeRPCServerProcessorTest.java | 151 +++++++++++
.../utils/SerializeDeserializeUtilTest.java | 90 +++++++
consensus/README.md | 123 +++++++++
consensus/pom.xml | 6 +
.../org/apache/iotdb/consensus/IConsensus.java | 4 +-
.../iotdb/consensus/common/ConsensusGroup.java | 2 +
.../org/apache/iotdb/consensus/common/Peer.java | 3 +
.../ConsensusGroupAlreadyExistException.java | 2 +-
.../exception/ConsensusGroupNotExistException.java | 2 +-
.../PeerAlreadyInConsensusGroupException.java | 2 +-
.../PeerNotInConsensusGroupException.java | 2 +-
.../iotdb/consensus/ratis/RatisConsensus.java | 68 ++++-
.../org/apache/iotdb/consensus/ratis/Utils.java | 25 +-
.../consensus/standalone/StandAloneConsensus.java | 7 +-
.../consensus/statemachine/IStateMachine.java | 2 +-
.../iotdb/consensus/ratis/RatisConsensusTest.java | 41 ++-
.../apache/iotdb/consensus/ratis/UtilsTest.java | 6 +-
.../standalone/StandAloneConsensusTest.java | 6 +-
.../UserGuide/API/Programming-Python-Native-API.md | 19 +-
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 1 +
.../UserGuide/API/Programming-Python-Native-API.md | 17 +-
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 1 +
example/rest-client-c-example/README.md | 111 +++++++++
example/rest-client-c-example/base64.c | 100 ++++++++
.../rest-client-c-example/base64.h | 13 +-
example/rest-client-c-example/main.c | 124 +++++++++
.../versionadaption/IoTDBDDLVersionAdaptionIT.java | 4 +-
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 42 ++++
.../metrics/dropwizard/reporter/IoTDBReporter.java | 40 +--
.../main/assembly/resources/conf/iotdb-metric.yml | 1 +
.../apache/iotdb/metrics/config/MetricConfig.java | 10 +
.../interface/src/test/resources/iotdb-metric.yml | 1 +
.../micrometer/reporter/IoTDBMeterRegistry.java | 32 +--
node-commons/pom.xml | 2 +-
.../apache/iotdb/commons/cluster}/Endpoint.java | 26 +-
.../iotdb/commons/consensus}/ConsensusGroupId.java | 27 +-
.../apache/iotdb/commons/consensus}/GroupType.java | 2 +-
.../iotdb/commons/partition/DataNodeLocation.java | 38 ++-
.../{DataPartitionInfo.java => DataPartition.java} | 20 +-
.../commons/partition/DataPartitionQueryParam.java | 20 +-
.../iotdb/commons/partition/DataRegionId.java | 39 ---
.../commons/partition/DataRegionReplicaSet.java | 61 -----
.../iotdb/commons/partition/PartitionInfo.java | 20 +-
.../iotdb/commons/partition/RegionReplicaSet.java | 89 +++++++
.../iotdb/commons/partition/SchemaPartition.java | 92 +++++++
.../commons/partition/SchemaPartitionInfo.java | 36 ---
.../iotdb/commons/partition/SchemaRegionId.java | 54 ----
.../commons/partition/SchemaRegionReplicaSet.java | 44 ----
...DeviceGroupId.java => SeriesPartitionSlot.java} | 8 +-
...TimePartitionId.java => TimePartitionSlot.java} | 2 +-
pom.xml | 2 +-
server/pom.xml | 4 +-
server/src/assembly/resources/sbin/stop-server.sh | 13 +-
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 3 +-
.../iotdb/db/consensus/ConsensusExample.java | 6 +-
.../manage/CrossSpaceCompactionResource.java | 3 +-
.../sizetiered/SizeTieredCompactionSelector.java | 4 +-
.../db/engine/storagegroup/TsFileResource.java | 4 +
.../iotdb/db/metadata/LocalConfigManager.java | 57 ++---
.../db/metadata/LocalSchemaPartitionTable.java | 30 +--
.../iotdb/db/metadata/LocalSchemaProcessor.java | 31 ++-
.../iotdb/db/metadata/mtree/MTreeAboveSG.java | 21 +-
.../iotdb/db/metadata/mtree/MTreeBelowSG.java | 4 +-
.../db/metadata/mtree/traverser/Traverser.java | 10 +-
.../mtree/traverser/counter/MNodeLevelCounter.java | 18 +-
.../iotdb/db/metadata/path/MeasurementPath.java | 5 +
.../db/metadata/schemaregion/SchemaEngine.java | 12 +-
.../db/metadata/schemaregion/SchemaRegion.java | 17 +-
.../storagegroup/IStorageGroupSchemaManager.java | 20 +-
.../storagegroup/StorageGroupSchemaManager.java | 13 +-
.../iotdb/db/metadata/template/Template.java | 18 +-
.../db/metadata/template/TemplateManager.java | 6 +-
.../db/mpp/common/schematree/SchemaEntityNode.java | 43 ++++
.../mpp/common/schematree/SchemaInternalNode.java | 32 ++-
.../common/schematree/SchemaMeasurementNode.java | 29 ++-
.../iotdb/db/mpp/common/schematree/SchemaNode.java | 44 +++-
.../iotdb/db/mpp/common/schematree/SchemaTree.java | 41 +--
.../mpp/common/schematree/SchemaTreeVisitor.java | 235 +++++++++++++++++
.../apache/iotdb/db/mpp/sql/analyze/Analysis.java | 30 +--
.../apache/iotdb/db/mpp/sql/analyze/Analyzer.java | 10 +-
.../mpp/sql/analyze/ClusterPartitionFetcher.java | 12 +-
.../mpp/sql/analyze/FakePartitionFetcherImpl.java | 92 ++++---
.../db/mpp/sql/analyze/IPartitionFetcher.java | 12 +-
.../sql/analyze/StandalonePartitionFetcher.java | 12 +-
.../db/mpp/sql/planner/DistributionPlanner.java | 16 +-
.../db/mpp/sql/planner/plan/FragmentInstance.java | 16 +-
.../db/mpp/sql/planner/plan/PlanFragment.java | 8 +-
.../plan/SimpleFragmentParallelPlanner.java | 6 +-
.../planner/plan/node/process/ExchangeNode.java | 8 +-
.../planner/plan/node/sink/FragmentSinkNode.java | 8 +-
.../plan/node/source/SeriesAggregateScanNode.java | 12 +-
.../planner/plan/node/source/SeriesScanNode.java | 19 +-
.../sql/planner/plan/node/source/SourceNode.java | 6 +-
.../apache/iotdb/db/utils/ErrorHandlingUtils.java | 15 +-
.../inner/InnerCompactionSchedulerTest.java | 31 +++
.../apache/iotdb/db/metadata/SchemaBasicTest.java | 44 ++++
.../iotdb/db/metadata/mtree/MTreeAboveSGTest.java | 10 +-
.../iotdb/db/metadata/mtree/MTreeBelowSGTest.java | 44 +++-
.../apache/iotdb/db/mpp/common/SchemaTreeTest.java | 214 ++++++++++++++++
.../db/mpp/sql/plan/DistributionPlannerTest.java | 94 ++++---
.../iotdb/db/mpp/sql/plan/QueryPlannerTest.java | 2 +
.../org/apache/iotdb/rpc/RedirectException.java | 6 +-
.../src/main/thrift/confignode.thrift | 63 ++++-
.../apache/iotdb/tsfile/write/record/Tablet.java | 4 +-
139 files changed, 4568 insertions(+), 1294 deletions(-)
copy confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{StorageGroupSchemaDataSet.java => DataPartitionDataSet.java} (70%)
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/SchemaPartitionDataSet.java
copy confignode/src/main/java/org/apache/iotdb/confignode/manager/{ConfigManager.java => ConsensusManager.java} (86%)
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/DataNodeManager.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/Manager.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/PartitionManager.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/RegionManager.java
rename confignode/src/main/java/org/apache/iotdb/confignode/partition/{DataPartitionInfo.java => DataRegionInfo.java} (54%)
delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/partition/PartitionTable.java
rename confignode/src/main/java/org/apache/iotdb/confignode/partition/{SchemaPartitionInfo.java => SchemaRegionInfo.java} (58%)
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/DataNodeInfoPersistence.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/PartitionInfoPersistence.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/RegionInfoPersistence.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/physical/sys/DataPartitionPlan.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/physical/sys/SchemaPartitionPlan.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/util/SerializeDeserializeUtil.java
create mode 100644 confignode/src/test/java/org/apache/iotdb/confignode/utils/SerializeDeserializeUtilTest.java
create mode 100644 consensus/README.md
create mode 100644 example/rest-client-c-example/README.md
create mode 100644 example/rest-client-c-example/base64.c
copy tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/FileOutputFactory.java => example/rest-client-c-example/base64.h (77%)
create mode 100644 example/rest-client-c-example/main.c
rename {consensus/src/main/java/org/apache/iotdb/consensus/common => node-commons/src/main/java/org/apache/iotdb/commons/cluster}/Endpoint.java (74%)
rename {consensus/src/main/java/org/apache/iotdb/consensus/common => node-commons/src/main/java/org/apache/iotdb/commons/consensus}/ConsensusGroupId.java (70%)
rename {consensus/src/main/java/org/apache/iotdb/consensus/common => node-commons/src/main/java/org/apache/iotdb/commons/consensus}/GroupType.java (95%)
rename confignode/src/main/java/org/apache/iotdb/confignode/partition/DataNodeInfo.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/DataNodeLocation.java (69%)
rename node-commons/src/main/java/org/apache/iotdb/commons/partition/{DataPartitionInfo.java => DataPartition.java} (71%)
delete mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionId.java
delete mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionReplicaSet.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/RegionReplicaSet.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java
delete mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartitionInfo.java
delete mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionId.java
delete mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionReplicaSet.java
rename node-commons/src/main/java/org/apache/iotdb/commons/partition/{DeviceGroupId.java => SeriesPartitionSlot.java} (85%)
rename node-commons/src/main/java/org/apache/iotdb/commons/partition/{TimePartitionId.java => TimePartitionSlot.java} (96%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/SchemaTreeVisitor.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/mpp/common/SchemaTreeTest.java