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

Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/06/12 02:54:08 UTC

[incubator-iotdb] branch cluster_new updated (aa27f32 -> 5a0c26e)

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

jiangtian pushed a change to branch cluster_new
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from aa27f32  Merge branch 'cluster_premerge2' into cluster_new
     add 5a0c26e  fix merge

No new revisions were added by this update.

Summary of changes:
 .../cluster/query/ClusterPhysicalGenerator.java    |  5 +-
 .../iotdb/cluster/query/ClusterPlanExecutor.java   |  3 +-
 .../query/dataset/ClusterAlignByDeviceDataSet.java |  2 +-
 .../cluster/query/reader/ClusterTimeGenerator.java |  2 +-
 .../apache/iotdb/cluster/server/ClientServer.java  |  4 +-
 .../cluster/server/member/MetaGroupMember.java     | 53 ++++++++++++++++------
 .../iotdb/cluster/server/member/MemberTest.java    | 11 +++--
 .../cluster/server/member/MetaGroupMemberTest.java |  4 +-
 .../org/apache/iotdb/db/metadata/MManager.java     |  2 +-
 9 files changed, 59 insertions(+), 27 deletions(-)