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/10 16:46:48 UTC
[iotdb] 02/07: 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 19c9456e9f57d38f1e6a8923e0f865fe89a44072
Merge: 5bdf918 204b7d3
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Aug 3 20:56:24 2021 +0800
Merge remote-tracking branch 'origin/master' into cluster-
CONTRIBUTING.md | 2 +-
Jenkinsfile | 2 +-
README.md | 2 +-
README_ZH.md | 4 +-
client-cpp/src/main/Session.cpp | 754 +++++++++------------
client-cpp/src/main/Session.h | 563 ++++++++-------
.../apache/iotdb/cluster/metadata/CMManager.java | 3 +-
compile-tools/thrift/pom.xml | 3 +-
.../Data-Concept/Data-Model-and-Terminology.md | 195 ++----
docs/UserGuide/Data-Concept/Data-Type.md | 125 ++++
.../Data-Concept/Data-Model-and-Terminology.md | 195 ++----
docs/zh/UserGuide/Data-Concept/Data-Type.md | 123 ++++
.../org/apache/iotdb/db/metadata/MManager.java | 156 ++---
.../java/org/apache/iotdb/db/metadata/MTree.java | 65 +-
.../org/apache/iotdb/db/metadata/MetaUtils.java | 4 +-
.../db/metadata/template/TemplateManager.java | 63 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 3 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 24 +-
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 54 ++
.../iotdb/db/metadata/MManagerBasicTest.java | 251 ++++---
.../iotdb/db/metadata/MManagerImproveTest.java | 2 +-
.../theme/global-components/Contributor.vue | 7 +
22 files changed, 1338 insertions(+), 1262 deletions(-)