You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2023/03/17 09:35:24 UTC
[iotdb] branch jira5695 updated (caf905029a -> ac40724926)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a change to branch jira5695
in repository https://gitbox.apache.org/repos/asf/iotdb.git
discard caf905029a finish
add 6b2aab0fc7 added Workbench-doc to IoTDB website and modified an article of community (#9308)
add 78b2b279f5 [IOTDB-5674] Multi-Mode IMNode Management (#9243)
add 9ee40a1226 [IOTDB-5676] Improve ConfigurationException description and analyzing of cluster parameters (#9334)
add 687da0ec0d [IOTDB-4439] Support GROUP BY COUNT in aggregation query
add 92549f8f30 [IOTDB-5616] Fix some code smells (#9320)
add 279b775b85 [CLIENT-PY] Optimize array concatenation performance in `todf()` (#9001)
add d14f37af86 [IOTDB-5682] Fix the update of nodeId in Metrics (#9344)
add 81b365b9ce [IOTDB-5651] Fix compaction UT
add 53d06b296b [IoTDB-5636] Add round as built-in scalar function
add 637cd48803 [IOTDB-5683] Support aggregation function Mode for query
add 8c4f80046b [IOTDB-5671] Fix inode cannot be released after deletion causing waste of disk space
add b54a3ef136 [IOTDB-5684] Standardize log folder of ConfigNode's Simple consensus protocol
add eae04ab624 Fix dispatch result collection logic (#9323) (#9347)
add b167e06d85 fix erros of Community doc (#9355)
add 387404d1e3 [IOTDB-5618] Add RatisConsensus metrics in dashboard (#9212)
add 94178d766e Seperate IO Dashboard apart (#9357)
new ac40724926 finish
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (caf905029a)
\
N -- N -- N refs/heads/jira5695 (ac40724926)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 1 +
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 2 +
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 +
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 12 +-
client-py/iotdb/utils/IoTDBRpcDataSet.py | 31 +-
.../client/sync/SyncConfigNodeClientPool.java | 2 +
.../client/sync/SyncDataNodeClientPool.java | 4 +-
.../confignode/conf/ConfigNodeDescriptor.java | 2 +-
.../confignode/conf/ConfigNodeStartupCheck.java | 58 +-
.../confignode/conf/SystemPropertiesUtils.java | 32 +-
.../request/write/database/DatabaseSchemaPlan.java | 4 +-
.../statemachine/ConfigRegionStateMachine.java | 6 +-
.../manager/consensus/ConsensusManager.java | 3 -
.../persistence/executor/ConfigPlanExecutor.java | 2 +-
.../persistence/schema/ClusterSchemaInfo.java | 42 +-
.../impl/schema/DeleteDatabaseProcedure.java | 4 +-
.../iotdb/confignode/service/ConfigNode.java | 17 +-
.../iotdb/consensus/config/ConsensusConfig.java | 15 -
.../ratis/ApplicationStateMachineProxy.java | 30 +-
.../iotdb/consensus/ratis/RatisConsensus.java | 31 +-
.../org/apache/iotdb/consensus/ratis/Utils.java | 15 +
.../ratis/metrics/IoTDBMetricRegistry.java | 65 +-
.../ratis/metrics/MetricRegistryManager.java | 13 +-
.../consensus/ratis/metrics/RatisMetricSet.java | 79 +-
.../ratis/metrics/RatisMetricsManager.java | 84 +
.../apache/iotdb/consensus/iot/ReplicateTest.java | 2 -
.../apache/iotdb/consensus/iot/StabilityTest.java | 2 -
.../iotdb/consensus/ratis/RatisConsensusTest.java | 2 -
.../apache/iotdb/consensus/ratis/SnapshotTest.java | 11 +-
.../iotdb/consensus/simple/RecoveryTest.java | 2 -
docs/Community/Materials.md | 285 +-
.../Apache-IoTDB-ConfigNode-Dashboard.json | 4184 ++++++++++----------
.../Apache-IoTDB-DataNode-Dashboard.json | 2433 +++++++-----
...rd.json => Apache-IoTDB-Disk-IO-Dashboard.json} | 486 ++-
.../Apache-IoTDB-Network-Dashboard.json | 7 +-
docs/UserGuide/Monitor-Alert/Metric-Tool.md | 77 +-
docs/UserGuide/Operators-Functions/Aggregation.md | 28 +-
docs/UserGuide/Operators-Functions/Mathematical.md | 65 +-
docs/UserGuide/Query-Data/Group-By.md | 67 +
docs/UserGuide/Query-Data/Overview.md | 11 +-
.../UserGuide/Ecosystem-Integration/Workbench.md | 420 ++
docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 60 +-
.../UserGuide/Operators-Functions/Aggregation.md | 2 +-
.../UserGuide/Operators-Functions/Mathematical.md | 63 +-
docs/zh/UserGuide/Operators-Functions/Overview.md | 44 +-
docs/zh/UserGuide/Query-Data/Group-By.md | 66 +
docs/zh/UserGuide/Query-Data/Overview.md | 9 +-
.../itbase/constant/BuiltinScalarFunctionEnum.java | 1 +
.../BuiltinTimeSeriesGeneratingFunctionEnum.java | 1 -
.../apache/iotdb/itbase/constant/TestConstant.java | 4 +
.../iotdb/db/it/aggregation/IoTDBModeIT.java | 160 +
.../scalar/IoTDBRoundFunctionIT.java | 327 ++
.../iotdb/db/it/groupby/IoTDBGroupByCountIT.java | 407 ++
.../iotdb/db/it/schema/AbstractSchemaIT.java | 2 +-
.../db/it/schema/IoTDBSortedShowTimeseriesIT.java | 2 +-
.../org/apache/iotdb/db/it/schema/IoTDBTagIT.java | 2 +-
.../iotdb/libudf/it/dprofile/DProfileIT.java | 3 +-
library-udf/src/assembly/tools/register-UDF.bat | 1 -
library-udf/src/assembly/tools/register-UDF.sh | 1 -
.../apache/iotdb/library/dprofile/UDAFMode.java | 178 -
.../apache/iotdb/metrics/config/MetricConfig.java | 7 +-
.../iotdb/metrics/metricsets/disk/DiskMetrics.java | 30 +-
.../resources/conf/iotdb-common.properties | 10 +-
.../commons/exception/ConfigurationException.java | 27 +-
.../apache/iotdb/commons/schema/node}/IMNode.java | 68 +-
.../iotdb/commons/schema/node}/MNodeType.java | 2 +-
.../node/common/AbstractAboveDatabaseMNode.java | 191 +
.../node/common/AbstractDatabaseDeviceMNode.java | 290 ++
.../schema/node/common/AbstractDatabaseMNode.java | 215 +
.../schema/node/common/AbstractDeviceMNode.java | 280 ++
.../node/common/AbstractMeasurementMNode.java | 256 ++
.../schema/node/info/IDatabaseDeviceInfo.java | 9 +-
.../commons/schema/node/info/IDatabaseInfo.java | 22 +-
.../commons/schema/node/info/IDeviceInfo.java | 31 +-
.../commons/schema/node/info/IMeasurementInfo.java | 20 +-
.../commons/schema/node/role/IDatabaseMNode.java | 14 +-
.../commons/schema/node/role/IDeviceMNode.java | 22 +-
.../schema/node/role}/IMeasurementMNode.java | 16 +-
.../schema/node/utils}/IMNodeContainer.java | 6 +-
.../commons/schema/node/utils/IMNodeFactory.java | 34 +-
.../commons/schema/node/utils}/IMNodeIterator.java | 6 +-
.../commons/schema/node/visitor/MNodeVisitor.java | 42 +
.../iotdb/commons/service/metric/enums/Metric.java | 2 +
.../udf/builtin/BuiltinAggregationFunction.java | 5 +-
.../commons/udf/builtin/BuiltinScalarFunction.java | 1 +
.../BuiltinTimeSeriesGeneratingFunction.java | 1 -
.../commons/utils/ThriftConfigNodeSerDeUtils.java | 8 +-
.../utils/ThriftConfigNodeSerDeUtilsTest.java | 4 +-
.../rocksdb/RSchemaReadWriteHandler.java | 4 +-
.../schemaregion/rocksdb/RSchemaRegion.java | 10 +-
.../schemaregion/rocksdb/RSchemaUtils.java | 10 +-
...RStorageGroupMNode.java => RDatabaseMNode.java} | 45 +-
.../mnode/{REntityMNode.java => RDeviceMNode.java} | 55 +-
.../schemaregion/rocksdb/mnode/RInternalMNode.java | 30 +-
.../schemaregion/rocksdb/mnode/RMNode.java | 101 +-
.../rocksdb/mnode/RMeasurementMNode.java | 47 +-
.../metadata/tagSchemaRegion/TagSchemaRegion.java | 6 +-
server/src/main/codegen/dataModel/AllDataType.tdd | 24 +-
.../src/main/codegen/templates/ModeAccumulator.ftl | 179 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 46 +-
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 5 +-
.../db/consensus/DataRegionConsensusImpl.java | 2 -
.../db/consensus/SchemaRegionConsensusImpl.java | 2 -
.../org/apache/iotdb/db/constant/SqlConstant.java | 5 +-
.../execute/task/CrossSpaceCompactionTask.java | 7 +-
.../execute/task/InnerSpaceCompactionTask.java | 264 +-
.../readchunk/AlignedSeriesCompactionExecutor.java | 3 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 3 +
.../idtable/entry/InsertMeasurementMNode.java | 287 --
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 200 -
.../apache/iotdb/db/metadata/mnode/MNodeUtils.java | 77 -
.../iotdb/db/metadata/mnode/MeasurementMNode.java | 233 --
.../db/metadata/mnode/StorageGroupEntityMNode.java | 90 -
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 102 -
.../IConfigMNode.java} | 26 +-
.../mnode/config/basic/ConfigBasicMNode.java | 279 ++
.../container/ConfigMNodeContainer.java} | 45 +-
.../mnode/config/factory/ConfigMNodeFactory.java | 81 +
.../impl/ConfigBasicInternalMNode.java} | 134 +-
.../mnode/config/impl/ConfigDatabaseMNode.java | 80 +
.../mnode/config/info/ConfigDatabaseInfo.java | 70 +
.../mnode/config/info/ConfigMNodeInfo.java | 82 +
.../mnode/container/MNodeContainerMapImpl.java | 26 -
.../mnode/estimator/BasicMNodSizeEstimator.java | 114 -
.../iotdb/db/metadata/mnode/mem/IMemMNode.java | 11 +-
.../db/metadata/mnode/mem/basic/BasicMNode.java | 252 ++
.../container/MemMNodeContainer.java} | 44 +-
.../mnode/mem/estimator/MNodeSizeEstimator.java | 10 +-
.../mnode/mem/factory/MemMNodeFactory.java | 84 +
.../mnode/mem/impl/AboveDatabaseMNode.java} | 22 +-
.../impl/BasicInternalMNode.java} | 134 +-
.../impl/DatabaseDeviceMNode.java} | 39 +-
.../db/metadata/mnode/mem/impl/DatabaseMNode.java} | 35 +-
.../impl/DeviceMNode.java} | 32 +-
.../metadata/mnode/mem/impl/MeasurementMNode.java | 49 +
.../db/metadata/mnode/mem/info/BasicMNodeInfo.java | 26 +-
.../mnode/mem/info/DatabaseDeviceInfo.java | 59 +
.../info/DatabaseInfo.java} | 38 +-
.../{EntityMNode.java => mem/info/DeviceInfo.java} | 131 +-
.../metadata/mnode/mem/info/MeasurementInfo.java | 113 +
.../iterator/AbstractTraverserIterator.java | 35 +-
.../mnode/{ => mem}/iterator/MNodeIterator.java | 13 +-
.../iterator/MemoryTraverserIterator.java | 16 +-
.../schemafile/ICachedMNode.java} | 11 +-
.../mnode/schemafile/basic/CachedBasicMNode.java | 264 ++
.../container}/CachedMNodeContainer.java | 166 +-
.../container}/ICachedMNodeContainer.java | 35 +-
.../schemafile/factory/CacheMNodeFactory.java | 84 +
.../impl/CachedAboveDatabaseMNode.java} | 31 +-
.../impl/CachedBasicInternalMNode.java} | 140 +-
.../schemafile/impl/CachedDatabaseDeviceMNode.java | 49 +
.../mnode/schemafile/impl/CachedDatabaseMNode.java | 54 +
.../mnode/schemafile/impl/CachedDeviceMNode.java | 48 +
.../schemafile/impl/CachedMeasurementMNode.java | 60 +
.../info/CacheMNodeInfo.java} | 31 +-
.../iterator/CachedTraverserIterator.java | 18 +-
.../iotdb/db/metadata/mnode/utils/MNodeUtils.java | 123 +
.../db/metadata/mnode/visitor/MNodeVisitor.java | 39 -
.../iotdb/db/metadata/mtree/ConfigMTree.java | 249 +-
.../iotdb/db/metadata/mtree/IMTreeBelowSG.java | 195 -
.../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 419 +-
.../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 378 +-
.../mtree/snapshot/MemMTreeSnapshotUtil.java | 142 +-
.../db/metadata/mtree/store/CachedMTreeStore.java | 167 +-
.../db/metadata/mtree/store/ConfigMTreeStore.java | 143 +
.../iotdb/db/metadata/mtree/store/IMTreeStore.java | 44 +-
.../db/metadata/mtree/store/MemMTreeStore.java | 147 +-
.../store/ReentrantReadOnlyCachedMTreeStore.java | 44 +-
.../mtree/store/disk/cache/CacheManager.java | 139 +-
.../mtree/store/disk/cache/ICacheManager.java | 28 +-
.../mtree/store/disk/cache/LRUCacheManager.java | 24 +-
.../mtree/store/disk/cache/PlainCacheManager.java | 10 +-
.../disk/memcontrol/CachedMNodeSizeEstimator.java | 72 -
.../mtree/store/disk/memcontrol/MemManager.java | 26 +-
.../mtree/store/disk/schemafile/ISchemaFile.java | 17 +-
.../store/disk/schemafile/ISegmentedPage.java | 8 +-
.../store/disk/schemafile/MockSchemaFile.java | 128 +-
.../mtree/store/disk/schemafile/RecordUtils.java | 84 +-
.../mtree/store/disk/schemafile/SchemaFile.java | 57 +-
.../mtree/store/disk/schemafile/SegmentedPage.java | 41 +-
.../store/disk/schemafile/WrappedSegment.java | 20 +-
.../disk/schemafile/pagemgr/BTreePageManager.java | 30 +-
.../disk/schemafile/pagemgr/IPageManager.java | 13 +-
.../store/disk/schemafile/pagemgr/PageManager.java | 34 +-
.../db/metadata/mtree/traverser/Traverser.java | 52 +-
.../traverser/TraverserWithLimitOffsetWrapper.java | 18 +-
.../mtree/traverser/basic/DatabaseTraverser.java | 22 +-
.../mtree/traverser/basic/EntityTraverser.java | 19 +-
.../mtree/traverser/basic/MNodeTraverser.java | 21 +-
.../traverser/basic/MeasurementTraverser.java | 14 +-
.../traverser/collector/DatabaseCollector.java | 14 +-
.../mtree/traverser/collector/EntityCollector.java | 14 +-
.../traverser/collector/MNodeAboveDBCollector.java | 14 +-
.../mtree/traverser/collector/MNodeCollector.java | 10 +-
.../traverser/collector/MeasurementCollector.java | 22 +-
.../mtree/traverser/counter/DatabaseCounter.java | 10 +-
.../mtree/traverser/counter/EntityCounter.java | 9 +-
.../traverser/counter/MeasurementCounter.java | 9 +-
.../mtree/traverser/updater/EntityUpdater.java | 15 +-
.../traverser/updater/MeasurementUpdater.java | 13 +-
.../plan/schemaregion/result/ShowNodesResult.java | 2 +-
.../db/metadata/query/info/INodeSchemaInfo.java | 2 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 52 +-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 102 +-
.../apache/iotdb/db/metadata/tag/TagManager.java | 55 +-
.../metadata/template/TemplateMNodeGenerator.java | 51 -
.../apache/iotdb/db/metadata/utils/MetaUtils.java | 2 +-
.../db/mpp/aggregation/AccumulatorFactory.java | 21 +
.../SlidingWindowAggregatorFactory.java | 2 +
.../execution/executor/RegionWriteExecutor.java | 149 +-
.../schema/NodeManageMemoryMergeOperator.java | 2 +-
.../operator/window/AbstractVariationWindow.java | 6 -
.../execution/operator/window/ConditionWindow.java | 6 -
...stractVariationWindow.java => CountWindow.java} | 80 +-
.../operator/window/CountWindowManager.java | 141 +
.../operator/window/CountWindowParameter.java} | 32 +-
.../db/mpp/execution/operator/window/IWindow.java | 19 +-
.../execution/operator/window/SessionWindow.java | 6 -
.../mpp/execution/operator/window/TimeWindow.java | 8 -
.../operator/window/WindowManagerFactory.java | 2 +
.../mpp/execution/operator/window/WindowType.java | 3 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 24 +-
.../memory/StatementMemorySourceVisitor.java | 2 +-
.../plan/expression/multi/FunctionExpression.java | 2 +-
.../multi/builtin/BuiltInScalarFunctionHelper.java | 4 +-
.../BuiltInScalarFunctionHelperFactory.java | 3 +
.../multi/builtin/helper/RoundFunctionHelper.java | 84 +
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 33 +
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 17 +
.../metedata/write/CreateMultiTimeSeriesNode.java | 6 +-
.../plan/node/metedata/write/MeasurementGroup.java | 36 +-
.../plan/parameter/GroupByCountParameter.java | 85 +
.../db/mpp/plan/scheduler/AsyncPlanNodeSender.java | 34 +
.../scheduler/FragmentInstanceDispatcherImpl.java | 32 +-
.../component/GroupByCountComponent.java} | 25 +-
.../db/mpp/plan/statement/crud/QueryStatement.java | 6 +-
.../scalar/RoundFunctionColumnTransformer.java | 72 +
.../unary/scalar/RoundFunctionTransformer.java | 72 +
.../java/org/apache/iotdb/db/service/DataNode.java | 7 +-
.../org/apache/iotdb/db/utils/SchemaUtils.java | 2 +
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 3 +
.../apache/iotdb/db/metadata/MetaUtilsTest.java | 18 +-
.../iotdb/db/metadata/idtable/IDTableTest.java | 2 +-
.../apache/iotdb/db/metadata/mnode/MNodeTest.java | 64 +-
.../iotdb/db/metadata/mtree/ConfigMTreeTest.java | 17 +-
.../iotdb/db/metadata/mtree/MTreeBelowSGTest.java | 257 --
.../mtree/disk/CachedMNodeContainerTest.java | 25 +-
.../mtree/multimode/MTreeNonMemoryTest.java | 28 -
.../mtree/multimode/MTreePartialMemoryTest.java | 28 -
.../metadata/mtree/schemafile/RecordUtilTests.java | 32 +-
.../mtree/schemafile/SchemaFileLogTest.java | 21 +-
.../metadata/mtree/schemafile/SchemaFileTest.java | 295 +-
.../metadata/mtree/schemafile/SchemaPageTest.java | 26 +-
.../mtree/schemafile/WrappedSegmentTest.java | 48 +-
.../schemaRegion/SchemaRegionBasicTest.java | 2 +-
.../schemaRegion/SchemaStatisticsTest.java | 97 +-
.../NodeManagementMemoryMergeNodeSerdeTest.java | 2 +-
.../iotdb/db/tools/SchemaFileSketchTest.java | 43 +-
.../Ecosystem-Integration/Workbench/image10.jpeg | Bin 0 -> 131946 bytes
.../Ecosystem-Integration/Workbench/image11.jpeg | Bin 0 -> 487707 bytes
.../Ecosystem-Integration/Workbench/image12.png | Bin 0 -> 45444 bytes
.../Ecosystem-Integration/Workbench/image13.jpeg | Bin 0 -> 488050 bytes
.../Ecosystem-Integration/Workbench/image14.jpeg | Bin 0 -> 457975 bytes
.../Ecosystem-Integration/Workbench/image15.jpeg | Bin 0 -> 493580 bytes
.../Ecosystem-Integration/Workbench/image16.jpeg | Bin 0 -> 444360 bytes
.../Ecosystem-Integration/Workbench/image17.jpeg | Bin 0 -> 512202 bytes
.../Ecosystem-Integration/Workbench/image18.jpeg | Bin 0 -> 99839 bytes
.../Ecosystem-Integration/Workbench/image19.jpeg | Bin 0 -> 596956 bytes
.../Ecosystem-Integration/Workbench/image20.png | Bin 0 -> 674410 bytes
.../Ecosystem-Integration/Workbench/image21.jpeg | Bin 0 -> 694550 bytes
.../Ecosystem-Integration/Workbench/image22.jpeg | Bin 0 -> 808356 bytes
.../Ecosystem-Integration/Workbench/image23.jpeg | Bin 0 -> 827186 bytes
.../Ecosystem-Integration/Workbench/image24.png | Bin 0 -> 179727 bytes
.../Ecosystem-Integration/Workbench/image25.jpeg | Bin 0 -> 529074 bytes
.../Ecosystem-Integration/Workbench/image26.jpeg | Bin 0 -> 307123 bytes
.../Ecosystem-Integration/Workbench/image27.png | Bin 0 -> 350407 bytes
.../Ecosystem-Integration/Workbench/image28.jpeg | Bin 0 -> 737495 bytes
.../Ecosystem-Integration/Workbench/image29.jpeg | Bin 0 -> 71283 bytes
.../Ecosystem-Integration/Workbench/image30.png | Bin 0 -> 200568 bytes
.../Ecosystem-Integration/Workbench/image31.jpeg | Bin 0 -> 433529 bytes
.../Ecosystem-Integration/Workbench/image32.jpeg | Bin 0 -> 539089 bytes
.../Ecosystem-Integration/Workbench/image33.png | Bin 0 -> 273003 bytes
.../Ecosystem-Integration/Workbench/image34.png | Bin 0 -> 148569 bytes
.../Ecosystem-Integration/Workbench/image35.png | Bin 0 -> 186961 bytes
.../Ecosystem-Integration/Workbench/image36.png | Bin 0 -> 349267 bytes
.../Ecosystem-Integration/Workbench/image37.png | Bin 0 -> 400709 bytes
.../Ecosystem-Integration/Workbench/image38.png | Bin 0 -> 349067 bytes
.../Ecosystem-Integration/Workbench/image39.jpeg | Bin 0 -> 941372 bytes
.../Ecosystem-Integration/Workbench/image40.png | Bin 0 -> 168395 bytes
.../Ecosystem-Integration/Workbench/image41.png | Bin 0 -> 342396 bytes
.../Ecosystem-Integration/Workbench/image42.png | Bin 0 -> 470241 bytes
.../Ecosystem-Integration/Workbench/image43.png | Bin 0 -> 110992 bytes
.../Ecosystem-Integration/Workbench/image44.png | Bin 0 -> 241073 bytes
.../Ecosystem-Integration/Workbench/image45.png | Bin 0 -> 253855 bytes
.../Ecosystem-Integration/Workbench/image5.jpeg | Bin 0 -> 7926 bytes
.../Ecosystem-Integration/Workbench/image6.jpeg | Bin 0 -> 395220 bytes
.../Ecosystem-Integration/Workbench/image7.png | Bin 0 -> 392808 bytes
.../Ecosystem-Integration/Workbench/image8.jpeg | Bin 0 -> 107764 bytes
.../Ecosystem-Integration/Workbench/image9.jpeg | Bin 0 -> 146196 bytes
site/src/main/.vuepress/sidebar/zh.ts | 1 +
thrift-commons/src/main/thrift/common.thrift | 3 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 7 +
303 files changed, 13354 insertions(+), 8561 deletions(-)
create mode 100644 consensus/src/main/java/org/apache/iotdb/consensus/ratis/metrics/RatisMetricsManager.java
copy docs/UserGuide/Monitor-Alert/{Apache-IoTDB-Network-Dashboard.json => Apache-IoTDB-Disk-IO-Dashboard.json} (51%)
create mode 100644 docs/zh/UserGuide/Ecosystem-Integration/Workbench.md
create mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBModeIT.java
create mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/builtinfunction/scalar/IoTDBRoundFunctionIT.java
create mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/groupby/IoTDBGroupByCountIT.java
delete mode 100644 library-udf/src/main/java/org/apache/iotdb/library/dprofile/UDAFMode.java
rename {server/src/main/java/org/apache/iotdb/db/metadata/mnode => node-commons/src/main/java/org/apache/iotdb/commons/schema/node}/IMNode.java (51%)
rename {server/src/main/java/org/apache/iotdb/db/metadata/mnode => node-commons/src/main/java/org/apache/iotdb/commons/schema/node}/MNodeType.java (97%)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/schema/node/common/AbstractAboveDatabaseMNode.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/schema/node/common/AbstractDatabaseDeviceMNode.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/schema/node/common/AbstractDatabaseMNode.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/schema/node/common/AbstractDeviceMNode.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/schema/node/common/AbstractMeasurementMNode.java
copy server/src/main/java/org/apache/iotdb/db/metadata/mnode/container/IMNodeContainer.java => node-commons/src/main/java/org/apache/iotdb/commons/schema/node/info/IDatabaseDeviceInfo.java (79%)
copy integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinScalarFunctionEnum.java => node-commons/src/main/java/org/apache/iotdb/commons/schema/node/info/IDatabaseInfo.java (69%)
copy server/src/main/java/org/apache/iotdb/db/metadata/mnode/IEntityMNode.java => node-commons/src/main/java/org/apache/iotdb/commons/schema/node/info/IDeviceInfo.java (55%)
copy server/src/main/java/org/apache/iotdb/db/metadata/mnode/IMeasurementMNode.java => node-commons/src/main/java/org/apache/iotdb/commons/schema/node/info/IMeasurementInfo.java (76%)
rename server/src/test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeFullMemoryTest.java => node-commons/src/main/java/org/apache/iotdb/commons/schema/node/role/IDatabaseMNode.java (73%)
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/IEntityMNode.java => node-commons/src/main/java/org/apache/iotdb/commons/schema/node/role/IDeviceMNode.java (63%)
copy {server/src/main/java/org/apache/iotdb/db/metadata/mnode => node-commons/src/main/java/org/apache/iotdb/commons/schema/node/role}/IMeasurementMNode.java (84%)
rename {server/src/main/java/org/apache/iotdb/db/metadata/mnode/container => node-commons/src/main/java/org/apache/iotdb/commons/schema/node/utils}/IMNodeContainer.java (81%)
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/IMeasurementMNode.java => node-commons/src/main/java/org/apache/iotdb/commons/schema/node/utils/IMNodeFactory.java (50%)
rename {server/src/main/java/org/apache/iotdb/db/metadata/mnode/iterator => node-commons/src/main/java/org/apache/iotdb/commons/schema/node/utils}/IMNodeIterator.java (82%)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/schema/node/visitor/MNodeVisitor.java
rename schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/mnode/{RStorageGroupMNode.java => RDatabaseMNode.java} (74%)
rename schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/mnode/{REntityMNode.java => RDeviceMNode.java} (70%)
create mode 100644 server/src/main/codegen/templates/ModeAccumulator.ftl
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/InsertMeasurementMNode.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNode.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNodeUtils.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/MeasurementMNode.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/StorageGroupEntityMNode.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/StorageGroupMNode.java
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/{IStorageGroupMNode.java => config/IConfigMNode.java} (60%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/config/basic/ConfigBasicMNode.java
copy server/src/main/java/org/apache/iotdb/db/metadata/mnode/{container/MNodeContainers.java => config/container/ConfigMNodeContainer.java} (59%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/config/factory/ConfigMNodeFactory.java
copy server/src/main/java/org/apache/iotdb/db/metadata/mnode/{InternalMNode.java => config/impl/ConfigBasicInternalMNode.java} (50%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/config/impl/ConfigDatabaseMNode.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/config/info/ConfigDatabaseInfo.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/config/info/ConfigMNodeInfo.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/container/MNodeContainerMapImpl.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/estimator/BasicMNodSizeEstimator.java
copy node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFRound.java => server/src/main/java/org/apache/iotdb/db/metadata/mnode/mem/IMemMNode.java (82%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/mem/basic/BasicMNode.java
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/{container/MNodeContainers.java => mem/container/MemMNodeContainer.java} (60%)
rename node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFRound.java => server/src/main/java/org/apache/iotdb/db/metadata/mnode/mem/estimator/MNodeSizeEstimator.java (80%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/mem/factory/MemMNodeFactory.java
rename server/src/{test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeMemoryModeTest.java => main/java/org/apache/iotdb/db/metadata/mnode/mem/impl/AboveDatabaseMNode.java} (60%)
copy server/src/main/java/org/apache/iotdb/db/metadata/mnode/{InternalMNode.java => mem/impl/BasicInternalMNode.java} (50%)
copy server/src/main/java/org/apache/iotdb/db/metadata/mnode/{iterator/MNodeIterator.java => mem/impl/DatabaseDeviceMNode.java} (55%)
rename server/src/{test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeDiskModeTest.java => main/java/org/apache/iotdb/db/metadata/mnode/mem/impl/DatabaseMNode.java} (52%)
copy server/src/main/java/org/apache/iotdb/db/metadata/mnode/{iterator/MNodeIterator.java => mem/impl/DeviceMNode.java} (58%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/mem/impl/MeasurementMNode.java
copy integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinScalarFunctionEnum.java => server/src/main/java/org/apache/iotdb/db/metadata/mnode/mem/info/BasicMNodeInfo.java (66%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/mem/info/DatabaseDeviceInfo.java
copy server/src/main/java/org/apache/iotdb/db/metadata/mnode/{iterator/MNodeIterator.java => mem/info/DatabaseInfo.java} (52%)
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/{EntityMNode.java => mem/info/DeviceInfo.java} (57%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/mem/info/MeasurementInfo.java
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/{ => mem}/iterator/AbstractTraverserIterator.java (77%)
copy server/src/main/java/org/apache/iotdb/db/metadata/mnode/{ => mem}/iterator/MNodeIterator.java (75%)
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/{ => mem}/iterator/MemoryTraverserIterator.java (65%)
copy server/src/main/java/org/apache/iotdb/db/metadata/{query/info/INodeSchemaInfo.java => mnode/schemafile/ICachedMNode.java} (72%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/schemafile/basic/CachedBasicMNode.java
rename server/src/main/java/org/apache/iotdb/db/metadata/{mtree/store/disk => mnode/schemafile/container}/CachedMNodeContainer.java (67%)
rename server/src/main/java/org/apache/iotdb/db/metadata/{mtree/store/disk => mnode/schemafile/container}/ICachedMNodeContainer.java (58%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/schemafile/factory/CacheMNodeFactory.java
copy server/src/main/java/org/apache/iotdb/db/metadata/mnode/{iterator/MNodeIterator.java => schemafile/impl/CachedAboveDatabaseMNode.java} (50%)
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/{InternalMNode.java => schemafile/impl/CachedBasicInternalMNode.java} (51%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/schemafile/impl/CachedDatabaseDeviceMNode.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/schemafile/impl/CachedDatabaseMNode.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/schemafile/impl/CachedDeviceMNode.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/schemafile/impl/CachedMeasurementMNode.java
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/{iterator/MNodeIterator.java => schemafile/info/CacheMNodeInfo.java} (58%)
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/{ => schemafile}/iterator/CachedTraverserIterator.java (67%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/utils/MNodeUtils.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/visitor/MNodeVisitor.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mtree/IMTreeBelowSG.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/ConfigMTreeStore.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/CachedMNodeSizeEstimator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/template/TemplateMNodeGenerator.java
copy server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/{AbstractVariationWindow.java => CountWindow.java} (55%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/window/CountWindowManager.java
rename server/src/main/java/org/apache/iotdb/db/{metadata/mnode/estimator/IMNodeSizeEstimator.java => mpp/execution/operator/window/CountWindowParameter.java} (52%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/multi/builtin/helper/RoundFunctionHelper.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/GroupByCountParameter.java
rename server/src/main/java/org/apache/iotdb/db/{metadata/mnode/AboveDatabaseMNode.java => mpp/plan/statement/component/GroupByCountComponent.java} (66%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/unary/scalar/RoundFunctionTransformer.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/mtree/MTreeBelowSGTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeNonMemoryTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreePartialMemoryTest.java
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image10.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image11.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image12.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image13.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image14.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image15.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image16.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image17.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image18.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image19.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image20.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image21.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image22.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image23.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image24.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image25.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image26.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image27.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image28.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image29.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image30.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image31.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image32.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image33.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image34.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image35.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image36.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image37.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image38.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image39.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image40.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image41.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image42.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image43.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image44.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image45.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image5.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image6.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image7.png
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image8.jpeg
create mode 100644 site/src/main/.vuepress/public/img/UserGuide/Ecosystem-Integration/Workbench/image9.jpeg
[iotdb] 01/01: finish
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch jira5695
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ac407249265987bdc187da2d6fefbf86bf7cd306
Author: OneSizeFitQuorum <ta...@apache.org>
AuthorDate: Fri Mar 17 17:32:45 2023 +0800
finish
Signed-off-by: OneSizeFitQuorum <ta...@apache.org>
---
.../statemachine/ConfigRegionStateMachine.java | 3 +-
.../manager/consensus/ConsensusManager.java | 58 ++++++++++++++++------
2 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java
index b6617fd6de..9e93061cf3 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java
@@ -32,6 +32,7 @@ import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
import org.apache.iotdb.confignode.exception.physical.UnknownPhysicalPlanTypeException;
import org.apache.iotdb.confignode.manager.ConfigManager;
+import org.apache.iotdb.confignode.manager.consensus.ConsensusManager;
import org.apache.iotdb.confignode.persistence.executor.ConfigPlanExecutor;
import org.apache.iotdb.confignode.writelog.io.SingleFileLogReader;
import org.apache.iotdb.consensus.ConsensusFactory;
@@ -76,7 +77,7 @@ public class ConfigRegionStateMachine
private int endIndex;
private static final String CURRENT_FILE_DIR =
- CONF.getConsensusDir() + File.separator + "simple" + File.separator + "current";
+ ConsensusManager.getConfigRegionDir() + File.separator + "current";
private static final String PROGRESS_FILE_PATH =
CURRENT_FILE_DIR + File.separator + "log_inprogress_";
private static final String FILE_PATH = CURRENT_FILE_DIR + File.separator + "log_";
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
index cca0c80433..16302fac47 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
@@ -47,6 +47,7 @@ import org.apache.ratis.util.TimeDuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -61,10 +62,11 @@ public class ConsensusManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ConsensusManager.class);
private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
private static final int SEED_CONFIG_NODE_ID = 0;
+ /** There is only one ConfigNodeGroup */
+ public static final ConsensusGroupId DEFAULT_CONSENSUS_GROUP_ID =
+ new ConfigRegionId(CONF.getConfigRegionId());;
private final IManager configManager;
-
- private ConsensusGroupId consensusGroupId;
private IConsensus consensusImpl;
public ConsensusManager(IManager configManager, ConfigRegionStateMachine stateMachine)
@@ -79,10 +81,9 @@ public class ConsensusManager {
/** ConsensusLayer local implementation. */
private void setConsensusLayer(ConfigRegionStateMachine stateMachine) throws IOException {
- // There is only one ConfigNodeGroup
- consensusGroupId = new ConfigRegionId(CONF.getConfigRegionId());
if (SIMPLE_CONSENSUS.equals(CONF.getConfigNodeConsensusProtocolClass())) {
+ upgrade();
consensusImpl =
ConsensusFactory.getConsensusImpl(
SIMPLE_CONSENSUS,
@@ -213,6 +214,25 @@ public class ConsensusManager {
}
}
+ /**
+ * In version 1.1, we fixed a 1.0 SimpleConsensus bug that incorrectly set the consensus
+ * directory. For backward compatibility, we added this function, which we may remove in version
+ * 2.x
+ */
+ private void upgrade() {
+ File consensusDir = new File(CONF.getConsensusDir());
+ if (consensusDir.exists()) {
+ File oldWalDir = new File(consensusDir, "simple");
+ if (oldWalDir.exists()) {
+ if (!oldWalDir.renameTo(new File(getConfigRegionDir()))) {
+ LOGGER.warn(
+ "upgrade ConfigNode consensus wal dir for SimpleConsensus from version/1.0 to version/1.1 failed, "
+ + "you maybe need to rename the simple dir to 0_0 manually.");
+ }
+ }
+ }
+ }
+
/**
* Create peer in new node to build consensus group.
*
@@ -225,11 +245,11 @@ public class ConsensusManager {
for (TConfigNodeLocation configNodeLocation : configNodeLocations) {
peerList.add(
new Peer(
- consensusGroupId,
+ DEFAULT_CONSENSUS_GROUP_ID,
configNodeLocation.getConfigNodeId(),
configNodeLocation.getConsensusEndPoint()));
}
- consensusImpl.createPeer(consensusGroupId, peerList);
+ consensusImpl.createPeer(DEFAULT_CONSENSUS_GROUP_ID, peerList);
}
/**
@@ -242,9 +262,9 @@ public class ConsensusManager {
boolean result =
consensusImpl
.addPeer(
- consensusGroupId,
+ DEFAULT_CONSENSUS_GROUP_ID,
new Peer(
- consensusGroupId,
+ DEFAULT_CONSENSUS_GROUP_ID,
configNodeLocation.getConfigNodeId(),
configNodeLocation.getConsensusEndPoint()))
.isSuccess();
@@ -264,9 +284,9 @@ public class ConsensusManager {
public boolean removeConfigNodePeer(TConfigNodeLocation configNodeLocation) {
return consensusImpl
.removePeer(
- consensusGroupId,
+ DEFAULT_CONSENSUS_GROUP_ID,
new Peer(
- consensusGroupId,
+ DEFAULT_CONSENSUS_GROUP_ID,
configNodeLocation.getConfigNodeId(),
configNodeLocation.getConsensusEndPoint()))
.isSuccess();
@@ -274,22 +294,22 @@ public class ConsensusManager {
/** Transmit PhysicalPlan to confignode.consensus.statemachine */
public ConsensusWriteResponse write(ConfigPhysicalPlan plan) {
- return consensusImpl.write(consensusGroupId, plan);
+ return consensusImpl.write(DEFAULT_CONSENSUS_GROUP_ID, plan);
}
/** Transmit PhysicalPlan to confignode.consensus.statemachine */
public ConsensusReadResponse read(ConfigPhysicalPlan plan) {
- return consensusImpl.read(consensusGroupId, plan);
+ return consensusImpl.read(DEFAULT_CONSENSUS_GROUP_ID, plan);
}
public boolean isLeader() {
- return consensusImpl.isLeader(consensusGroupId);
+ return consensusImpl.isLeader(DEFAULT_CONSENSUS_GROUP_ID);
}
/** @return ConfigNode-leader's location if leader exists, null otherwise. */
public TConfigNodeLocation getLeader() {
for (int retry = 0; retry < 50; retry++) {
- Peer leaderPeer = consensusImpl.getLeader(consensusGroupId);
+ Peer leaderPeer = consensusImpl.getLeader(DEFAULT_CONSENSUS_GROUP_ID);
if (leaderPeer != null) {
List<TConfigNodeLocation> registeredConfigNodes =
getNodeManager().getRegisteredConfigNodes();
@@ -338,7 +358,15 @@ public class ConsensusManager {
}
public ConsensusGroupId getConsensusGroupId() {
- return consensusGroupId;
+ return DEFAULT_CONSENSUS_GROUP_ID;
+ }
+
+ public static String getConfigRegionDir() {
+ return CONF.getConsensusDir()
+ + File.separator
+ + ConsensusManager.DEFAULT_CONSENSUS_GROUP_ID.getType().getValue()
+ + "_"
+ + ConsensusManager.DEFAULT_CONSENSUS_GROUP_ID.getId();
}
public IConsensus getConsensusImpl() {