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:50 UTC

[iotdb] 04/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 ae1e677ea89c2f60d83f20dea426949bf8429a96
Merge: bba25de 40fa7b3
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Aug 8 00:02:00 2021 +0800

    Merge remote-tracking branch 'origin/master' into cluster-

 client-cpp/src/main/Session.cpp                    |   9 +-
 client-cpp/src/main/Session.h                      |   4 +-
 client-cpp/src/test/main.cpp                       |   6 +-
 .../main/java/org/apache/iotdb/SessionExample.java |  33 +++++++
 .../resources/conf/iotdb-engine.properties         |   6 +-
 .../apache/iotdb/db/cost/statistic/Operation.java  |   3 +-
 .../compaction/CompactionMergeTaskPoolManager.java |  13 +--
 .../engine/storagegroup/StorageGroupProcessor.java |   3 +
 .../iotdb/db/engine/upgrade/UpgradeTask.java       |  60 ++++++++++---
 .../iotdb/db/query/control/SessionManager.java     |  17 ++--
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  19 ++--
 .../org/apache/iotdb/db/service/UpgradeSevice.java |  24 ++---
 .../apache/iotdb/db/tools/TsFileRewriteTool.java   |  30 +++++--
 .../db/tools/upgrade/TsFileOnlineUpgradeTool.java  |   4 +-
 .../org/apache/iotdb/db/utils/UpgradeUtils.java    |  10 ---
 site/README-zh.md                                  |   9 +-
 site/README.md                                     |   5 ++
 site/pom.xml                                       | 100 ++++++++++++---------
 site/src/main/.asf.yaml                            |  25 ++++++
 .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java  |  28 ++++--
 20 files changed, 281 insertions(+), 127 deletions(-)