You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/07/13 08:04:46 UTC

[iotdb] 02/02: Merge branch 'rel/0.12' of https://github.com/apache/iotdb into template_mlog

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch template_mlog
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 65d768da3f098ff5f21f6581690b45701f7df29b
Merge: d5ece8d bf6d83c
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Jul 13 14:24:53 2021 +0800

    Merge branch 'rel/0.12' of https://github.com/apache/iotdb into template_mlog

 .../iotdb/cluster/client/DataClientProvider.java   | 45 ++++++++++++--
 .../cluster/client/async/AsyncClientPool.java      | 22 +++++++
 .../iotdb/cluster/client/sync/SyncClientPool.java  | 21 +++++++
 .../iotdb/cluster/server/DataClusterServer.java    |  9 +++
 .../iotdb/cluster/server/MetaClusterServer.java    |  9 +++
 .../cluster/server/member/MetaGroupMember.java     | 72 ++++++++++++++++++++++
 .../cluster/server/service/BaseAsyncService.java   |  4 ++
 .../cluster/server/service/BaseSyncService.java    |  4 ++
 .../compaction/CompactionMergeTaskPoolManager.java | 11 +++-
 .../storagegroup/timeindex/DeviceTimeIndex.java    |  6 +-
 .../storagegroup/timeindex/FileTimeIndex.java      |  6 +-
 .../org/apache/iotdb/db/metadata/MManager.java     |  3 +
 .../org/apache/iotdb/db/qp/logical/Operator.java   | 10 +--
 thrift-cluster/src/main/thrift/cluster.thrift      |  6 +-
 14 files changed, 214 insertions(+), 14 deletions(-)