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

Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/08/25 12:32:43 UTC

[iotdb] 04/06: Merge branch 'master' of github.com:apache/iotdb

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

caogaofei pushed a commit to branch beyyes/remove_confignode_develop
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit c9a3325c63d569ac1db7ea1a79da93a573f90bc5
Merge: ec14d94098 94657cf836
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Thu Aug 25 12:07:31 2022 +0800

    Merge branch 'master' of github.com:apache/iotdb

 .../db/integration/sync/IoTDBSyncReceiverIT.java   |  6 ++---
 .../db/integration/sync/IoTDBSyncSenderIT.java     | 28 +++++++++++-----------
 ...ockTransportClient.java => MockSyncClient.java} |  6 ++---
 .../dataregion/StorageGroupManager.java            |  5 ++--
 .../db/mpp/execution/exchange/SinkHandle.java      | 28 +++++++++++++++-------
 .../org/apache/iotdb/db/mpp/plan/Coordinator.java  |  2 +-
 .../org/apache/iotdb/db/sync/sender/pipe/Pipe.java | 18 +++++++-------
 .../{ITransportClient.java => ISyncClient.java}    |  2 +-
 ...nkTransportClient.java => IoTDBSyncClient.java} |  6 ++---
 .../db/sync/transport/client/SenderManager.java    | 14 +++++------
 ...rtClientFactory.java => SyncClientFactory.java} |  8 +++----
 .../iotdb/db/sync/transport/SyncTransportTest.java |  8 +++----
 12 files changed, 71 insertions(+), 60 deletions(-)