You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2021/08/04 03:47:38 UTC
[iotdb] 05/05: merge 0.12 and fix conflicts
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch query-memory-leak
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8d5d616f18be4d7f6e9531a6d022bd8f3ae258c0
Merge: 24e74f9 f26bc84
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Wed Aug 4 10:52:22 2021 +0800
merge 0.12 and fix conflicts
client-cpp/src/main/Session.cpp | 47 +++---
client-cpp/src/main/Session.h | 41 +++---
compile-tools/thrift/pom.xml | 3 +-
docs/SystemDesign/SchemaManager/SchemaManager.md | 2 +-
.../zh/SystemDesign/SchemaManager/SchemaManager.md | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 33 +----
.../java/org/apache/iotdb/db/metadata/MTree.java | 36 +++++
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 24 +++-
.../iotdb/db/query/reader/series/SeriesReader.java | 2 +
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 54 +++++++
.../iotdb/db/metadata/MManagerBasicTest.java | 160 ++++++++++-----------
11 files changed, 226 insertions(+), 178 deletions(-)