This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch change_rpc_port in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ce6cd51053e462dc4c260f5b455d4263ffa491e2 Merge: a21f05e 113bd38 Author: xiangdong huang <[email protected]> AuthorDate: Sat Dec 19 11:51:06 2020 +0800 Merge remote-tracking branch 'origin/master' into change_rpc_port .github/workflows/sonar_and_coverall.yml | 2 +- .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 8 +- .../cluster/partition/slot/SlotPartitionTable.java | 4 +- docs/SystemDesign/SchemaManager/SchemaManager.md | 20 +- docs/SystemDesign/TsFile/Format.md | 4 +- .../DML Data Manipulation Language.md | 100 +- docs/UserGuide/Operation Manual/SQL Reference.md | 7 +- docs/UserGuide/Server/Cluster Setup.md | 2 +- .../UserGuide/System Tools/MLogParser Tool.md | 21 +- .../zh/SystemDesign/SchemaManager/SchemaManager.md | 20 +- docs/zh/SystemDesign/StorageEngine/Compaction.md | 10 +- docs/zh/SystemDesign/TsFile/Format.md | 4 +- docs/zh/UserGuide/Concept/SDT.md | 22 +- .../DML Data Manipulation Language.md | 103 +- .../zh/UserGuide/Operation Manual/SQL Reference.md | 7 +- docs/zh/UserGuide/Server/Cluster Setup.md | 2 +- .../zh/UserGuide/System Tools/MLogParser Tool.md | 21 +- hive-connector/pom.xml | 6 +- server/file-changelists/mlog-changelist.md | 4 + .../resources/conf/iotdb-engine.properties | 11 +- .../assembly/resources/tools/mlog/mLogParser.bat | 62 + .../assembly/resources/tools/mlog/mLogParser.sh | 48 + .../org/apache/iotdb/db/auth/AuthException.java | 5 - .../iotdb/db/auth/authorizer/BasicAuthorizer.java | 2 +- .../db/auth/authorizer/LocalFileAuthorizer.java | 2 +- .../iotdb/db/auth/authorizer/OpenIdAuthorizer.java | 10 +- .../apache/iotdb/db/auth/entity/PathPrivilege.java | 4 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 16 +- .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 35 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 + .../db/engine/cache/TimeSeriesMetadataCache.java | 7 +- .../level/LevelCompactionTsFileManagement.java | 152 +-- .../no/NoCompactionTsFileManagement.java | 10 +- .../compaction/utils/CompactionLogAnalyzer.java | 19 +- .../engine/compaction/utils/CompactionLogger.java | 16 +- .../engine/compaction/utils/CompactionUtils.java | 84 +- .../iotdb/db/engine/flush/MemTableFlushTask.java | 1 + .../db/engine/storagegroup/TsFileResource.java | 14 +- .../{MLogWriter.java => MLogTxtWriter.java} | 72 +- .../org/apache/iotdb/db/metadata/MManager.java | 236 ++-- .../java/org/apache/iotdb/db/metadata/MTree.java | 127 ++- .../apache/iotdb/db/metadata/MetadataConstant.java | 10 +- .../iotdb/db/metadata/logfile/MLogReader.java | 74 ++ .../iotdb/db/metadata/logfile/MLogTxtReader.java | 79 ++ .../iotdb/db/metadata/logfile/MLogWriter.java | 454 ++++++++ .../org/apache/iotdb/db/metadata/mnode/MNode.java | 25 +- .../iotdb/db/metadata/mnode/MeasurementMNode.java | 37 +- .../iotdb/db/metadata/mnode/StorageGroupMNode.java | 22 +- .../org/apache/iotdb/db/qp/logical/Operator.java | 5 +- .../iotdb/db/qp/logical/crud/QueryOperator.java | 18 + .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 28 +- .../iotdb/db/qp/physical/crud/GroupByTimePlan.java | 19 + ...tStorageGroupPlan.java => ChangeAliasPlan.java} | 74 +- ...rageGroupPlan.java => ChangeTagOffsetPlan.java} | 76 +- .../qp/physical/sys/CreateMultiTimeSeriesPlan.java | 4 +- .../db/qp/physical/sys/CreateTimeSeriesPlan.java | 66 +- .../db/qp/physical/sys/DeleteTimeSeriesPlan.java | 4 + .../{SetStorageGroupPlan.java => MNodePlan.java} | 88 +- .../db/qp/physical/sys/MeasurementMNodePlan.java | 143 +++ .../db/qp/physical/sys/SetStorageGroupPlan.java | 18 +- .../iotdb/db/qp/physical/sys/SetTTLPlan.java | 1 - ...geGroupPlan.java => StorageGroupMNodePlan.java} | 79 +- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 18 +- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 2 + .../iotdb/db/query/control/TracingManager.java | 2 +- .../dataset/groupby/GroupByEngineDataSet.java | 70 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 18 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 5 +- .../db/sync/receiver/transfer/SyncServiceImpl.java | 37 +- .../org/apache/iotdb/db/tools/mlog/MLogParser.java | 194 ++++ .../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 1 + .../java/org/apache/iotdb/db/utils/QueryUtils.java | 1 - .../org/apache/iotdb/db/utils/SerializeUtils.java | 12 +- .../org/apache/iotdb/db/writelog/io/LogWriter.java | 56 +- .../db/writelog/node/ExclusiveWriteLogNode.java | 13 +- .../apache/iotdb/db/auth/AuthorityCheckerTest.java | 147 +++ .../{ => authorizer}/LocalFileAuthorizerTest.java | 295 +++-- .../db/auth/authorizer/OpenIdAuthorizerTest.java | 107 +- .../iotdb/db/auth/entity/PathPrivilegeTest.java | 42 + .../org/apache/iotdb/db/auth/entity/RoleTest.java | 36 +- .../org/apache/iotdb/db/auth/entity/UserTest.java | 44 + .../auth/{ => role}/LocalFileRoleAccessorTest.java | 13 +- .../auth/{ => role}/LocalFileRoleManagerTest.java | 45 +- .../auth/{ => user}/LocalFileUserAccessorTest.java | 13 +- .../auth/{ => user}/LocalFileUserManagerTest.java | 69 +- .../engine/compaction/LevelCompactionLogTest.java | 82 ++ .../compaction/LevelCompactionMergeTest.java | 142 +++ .../compaction/LevelCompactionRecoverTest.java | 507 +++++++++ .../compaction/LevelCompactionSelectorTest.java | 73 ++ .../LevelCompactionTest.java} | 68 +- .../LevelCompactionTsFileManagementTest.java | 120 ++ .../NoCompactionTsFileManagementTest.java | 127 +++ .../apache/iotdb/db/engine/merge/MergeTest.java | 2 +- .../iotdb/db/integration/IOTDBGroupByIT.java | 101 ++ .../iotdb/db/integration/IoTDBAddSubDeviceIT.java | 15 +- .../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 31 +- .../org/apache/iotdb/db/integration/IoTDBAsIT.java | 10 + .../db/integration/IoTDBAutoCreateSchemaIT.java | 19 +- .../iotdb/db/integration/IoTDBCompactionIT.java | 154 --- .../db/integration/IoTDBCreateSnapshotIT.java | 74 +- .../iotdb/db/integration/IoTDBDeletionIT.java | 18 + .../apache/iotdb/db/integration/IoTDBLastIT.java | 13 +- .../db/integration/IoTDBLevelCompactionIT.java | 1180 ++++++++++++++++++++ .../iotdb/db/integration/IoTDBRestartIT.java | 2 - .../IoTDBAggregationByLevelIT.java | 9 +- .../IoTDBAggregationDeleteIT.java | 16 +- .../{ => aggregation}/IoTDBAggregationIT.java | 2 +- .../IoTDBAggregationLargeDataIT.java | 247 +--- .../IoTDBAggregationSmallDataIT.java | 179 +-- .../{ => auth}/IoTDBAuthorizationIT.java | 2 +- .../iotdb/db/mqtt/BrokerAuthenticatorTest.java | 16 + .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 9 +- .../db/query/aggregation/AggregateResultTest.java | 19 +- .../query/aggregation/DescAggregateResultTest.java | 126 +++ .../iotdb/db/query/control/TracingManagerTest.java | 111 ++ .../db/query/dataset/ShowTimeSeriesResultTest.java | 57 + .../dataset/groupby/GroupByEngineDataSetTest.java | 476 ++++++++ .../{ => groupby}/GroupByFillDataSetTest.java | 2 +- .../{ => groupby}/GroupByLevelDataSetTest.java | 2 +- .../{ => groupby}/GroupByTimeDataSetTest.java | 2 +- .../query/executor/GroupByEngineDataSetTest.java | 177 --- .../org/apache/iotdb/db/tools/MLogParserTest.java | 150 +++ .../org/apache/iotdb/db/tools/WalCheckerTest.java | 5 +- .../iotdb/db/utils/CopyOnReadLinkedListTest.java | 67 ++ .../iotdb/db/utils/EncodingInferenceUtilsTest.java | 45 + .../org/apache/iotdb/db/utils/MemUtilsTest.java | 114 ++ .../org/apache/iotdb/db/utils/SchemaUtilsTest.java | 64 ++ .../apache/iotdb/db/utils/SerializeUtilsTest.java | 312 ++++++ .../db/utils/datastructure/BinaryTVListTest.java | 58 + .../db/utils/datastructure/BooleanTVListTest.java | 62 + .../db/utils/datastructure/DoubleTVListTest.java | 72 ++ .../db/utils/datastructure/FloatTVListTest.java | 72 ++ .../db/utils/datastructure/IntTVListTest.java | 71 ++ .../db/utils/datastructure/LongTVListTest.java | 18 + .../iotdb/db/writelog/io/LogWriterReaderTest.java | 4 +- .../db/writelog/io/MultiFileLogReaderTest.java | 4 +- .../apache/iotdb/session/IoTDBSessionSimpleIT.java | 10 +- .../theme/global-components/Contributor.vue | 7 + tsfile/format-changelist.md | 2 +- .../org/apache/iotdb/tsfile/file/MetaMarker.java | 4 + .../iotdb/tsfile/file/footer/ChunkGroupFooter.java | 31 +- .../file/metadata/MetadataIndexConstructor.java | 9 +- .../tsfile/file/metadata/MetadataIndexNode.java | 7 +- .../iotdb/tsfile/read/TsFileSequenceReader.java | 20 +- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 10 +- .../tsfile/read/TsFileSequenceReaderTest.java | 2 +- .../iotdb/tsfile/write/TsFileIOWriterTest.java | 8 + 147 files changed, 7529 insertions(+), 1759 deletions(-) diff --cc docs/UserGuide/Server/Cluster Setup.md index 2a5ff8d,8e18443..2fcaa5b --- a/docs/UserGuide/Server/Cluster Setup.md +++ b/docs/UserGuide/Server/Cluster Setup.md @@@ -140,9 -140,9 +140,9 @@@ The configuration items described belo |Name|seed\_nodes| |:---:|:---| - |Description|The address of the nodes in the cluster, `{IP/DOMAIN}:internal\_meta\_port:internal\_data\_port:cluster\_rpc\_port` format, separated by commas; for the pseudo-distributed mode, you can fill in `localhost`, or `127.0.0.1` or mixed, but the real ip address cannot appear; for the distributed mode, real ip or hostname is supported, but `localhost` or `127.0.0.1` cannot appear. When used by `start-node.sh(.bat)`, this configuration means the nodes that will form the initial clu [...] + |Description|The address of the nodes in the cluster, `{IP/DOMAIN}:internal_meta_port:internal_data_port:cluster_rpc_port` format, separated by commas; for the pseudo-distributed mode, you can fill in `localhost`, or `127.0.0.1` or mixed, but the real ip address cannot appear; for the distributed mode, real ip or hostname is supported, but `localhost` or `127.0.0.1` cannot appear. When used by `start-node.sh(.bat)`, this configuration means the nodes that will form the initial cluster, [...] |Type|String| -|Default|127.0.0.1:9003:40010:55560,127.0.0.1:9005:40012:55561,127.0.0.1:9007:40014:55562| +|Default|127.0.0.1:9003:40010:6667,127.0.0.1:9005:40012:6668,127.0.0.1:9007:40014:6669| |Effective| After restart system| * rpc\_thrift\_compression\_enable diff --cc docs/zh/UserGuide/Server/Cluster Setup.md index 7a27fdd,6f5a845..8ab0352 --- a/docs/zh/UserGuide/Server/Cluster Setup.md +++ b/docs/zh/UserGuide/Server/Cluster Setup.md @@@ -133,9 -133,9 +133,9 @@@ iotdb-engines.properties配置文件中 |名字|seed\_nodes| |:---:|:---| - |描述|集群中节点的地址，`{IP/DOMAIN}:internal\_meta\_port:internal\_data\_port:cluster\_rpc\_port`格式，用逗号分割；对于伪分布式模式，可以都填写`localhost`，或是`127.0.0.1` 或是混合填写，但是不能够出现真实的ip地址；对于分布式模式，支持填写real ip 或是hostname，但是不能够出现`localhost`或是`127.0.0.1`。当使用`start-node.sh(.bat)`启动节点时，此配置意味着形成初始群集的节点，每个节点的`seed_nodes`应该一致，否则群集将初始化失败；当使用`add-node.sh(.bat)`添加节点到集群中时，此配置项可以是集群中已经存在的任何节点，不需要是用`start-node.sh(bat)`构建初始集群的节点。| + |描述|集群中节点的地址，`{IP/DOMAIN}:internal_meta_port:internal_data_port:cluster_rpc_port`格式，用逗号分割；对于伪分布式模式，可以都填写`localhost`，或是`127.0.0.1` 或是混合填写，但是不能够出现真实的ip地址；对于分布式模式，支持填写real ip 或是hostname，但是不能够出现`localhost`或是`127.0.0.1`。当使用`start-node.sh(.bat)`启动节点时，此配置意味着形成初始群集的节点，每个节点的`seed_nodes`应该一致，否则群集将初始化失败；当使用`add-node.sh(.bat)`添加节点到集群中时，此配置项可以是集群中已经存在的任何节点，不需要是用`start-node.sh(bat)`构建初始集群的节点。| |类型|String| -|默认值|127.0.0.1:9003:40010:55560,127.0.0.1:9005:40012:55561,127.0.0.1:9007:40014:55562| +|默认值|127.0.0.1:9003:40010:6667,127.0.0.1:9005:40012:6668,127.0.0.1:9007:40014:6669| |改后生效方式|重启服务器生效| * rpc\_thrift\_compression\_enable
