You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2021/08/17 05:47:13 UTC
[iotdb] 05/05: Merge remote-tracking branch 'origin/master' into
cluster-
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cluster-
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9b10199a4112209c04dc08a2d3a656e4c2efeb3b
Merge: d5c9e7c 9d21b20
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Aug 17 13:46:36 2021 +0800
Merge remote-tracking branch 'origin/master' into cluster-
.gitattributes | 1 +
client-cpp/src/main/Session.cpp | 2190 ++++++++++----------
client-cpp/src/main/Session.h | 1474 ++++++-------
.../apache/iotdb/cluster/metadata/CMManager.java | 2 +-
.../cluster/server/heartbeat/HeartbeatThread.java | 34 +-
docs/UserGuide/API/Programming-Java-Native-API.md | 6 +-
.../Data-Concept/Data-Model-and-Terminology.md | 6 +-
.../UserGuide/Data-Concept/Measurement-Template.md | 84 +
.../UserGuide/API/Programming-Java-Native-API.md | 8 +-
.../Data-Concept/Data-Model-and-Terminology.md | 4 +-
.../UserGuide/Data-Concept/Measurement-Template.md | 81 +
pom.xml | 1 +
.../iotdb/db/engine/memtable/AbstractMemTable.java | 2 +-
.../engine/storagegroup/StorageGroupProcessor.java | 28 +-
.../exception/metadata/IllegalPathException.java | 6 +
.../metadata/StorageGroupAlreadySetException.java | 7 +
.../org/apache/iotdb/db/metadata/MManager.java | 6 +
.../java/org/apache/iotdb/db/metadata/MTree.java | 87 +-
.../org/apache/iotdb/db/metadata/PartialPath.java | 1 +
.../iotdb/db/metadata/mnode/InternalMNode.java | 2 +-
.../db/metadata/template/TemplateManager.java | 10 +
.../iotdb/db/metadata/utils/MetaFormatUtils.java | 169 ++
.../iotdb/db/metadata/{ => utils}/MetaUtils.java | 5 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 11 +
.../org/apache/iotdb/db/utils/FilePathUtils.java | 2 +-
.../iotdb/db/integration/IoTDBDeletionIT.java | 81 +
.../iotdb/db/metadata/MManagerBasicTest.java | 144 ++
.../apache/iotdb/db/metadata/MetaUtilsTest.java | 1 +
.../apache/iotdb/db/metadata/mnode/MNodeTest.java | 2 +-
29 files changed, 2504 insertions(+), 1951 deletions(-)