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

Posted to commits@iotdb.apache.org by lt...@apache.org on 2020/12/23 08:12:49 UTC

[iotdb] 03/05: Merge branch 'fix_sync_schema_bug' into cluster_multi_raft

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

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

commit 2a2e1cddd6253f4af82ce13a608e57b926a4dde0
Merge: 2487976 128e191
Author: lta <li...@163.com>
AuthorDate: Wed Dec 23 00:39:51 2020 +0800

    Merge branch 'fix_sync_schema_bug' into cluster_multi_raft

 .github/workflows/sonar_and_coverall.yml           |   2 +-
 .../java/org/apache/iotdb/cluster/ClusterMain.java |   6 +-
 .../iotdb/cluster/client/DataClientProvider.java   |  17 +-
 .../cluster/client/async/AsyncClientPool.java      |  11 +-
 .../iotdb/cluster/client/sync/SyncClientPool.java  |  21 ++-
 .../apache/iotdb/cluster/metadata/CMManager.java   |   4 +-
 .../cluster/query/fill/ClusterPreviousFill.java    |  11 +-
 .../iotdb/cluster/query/reader/DataSourceInfo.java |   2 +-
 .../cluster/server/member/MetaGroupMember.java     |  14 +-
 .../iotdb/cluster/server/member/RaftMember.java    |   2 +-
 .../cluster/client/DataClientProviderTest.java     |  12 +-
 .../Ecosystem Integration/Zeppelin-IoTDB.md        | 184 ++++++++++++++++++++
 .../Ecosystem Integration/Zeppelin-IoTDB.md        | 186 +++++++++++++++++++++
 .../iotdb/db/engine/memtable/AbstractMemTable.java |   4 +-
 .../engine/storagegroup/StorageGroupProcessor.java |   5 +-
 .../iotdb/db/metadata/logfile/MLogWriter.java      |   2 +-
 .../db/sync/receiver/transfer/SyncServiceImpl.java |   5 +-
 .../iotdb/db/sync/sender/transfer/SyncClient.java  |  45 ++---
 zeppelin-interpreter/README.md                     | 186 ---------------------
 zeppelin-interpreter/pom.xml                       |  32 +++-
 20 files changed, 480 insertions(+), 271 deletions(-)