[incubator-iotdb] branch cluster_new updated (30ce0db -> 93dd1ee)

[ji...@apache.org]

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 30ce0db  fix ClusterMain
     new f59469c  split the heartbeat port with the data port
     new 5e20824  bug fix
     new c38d67a  bug fix
     new 23f7771  add some annotation
     new 2c5dbcb  fix bug test
     new 20bed6b  fix review
     new db5d959  remove blank lines
     new 93dd1ee  Merge pull request #1512 from neuyilan/apache_cluster_new_split_port

The 4689 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../resources/conf/iotdb-cluster.properties        |   5 +
 ...taClient.java => AsyncDataHeartbeatClient.java} |  66 +++------
 ...taClient.java => AsyncMetaHeartbeatClient.java} |  64 +++------
 ...ataClient.java => SyncDataHeartbeatClient.java} |  47 +++----
 ...etaClient.java => SyncMetaHeartbeatClient.java} |  48 +++----
 .../iotdb/cluster/server/MetaClusterServer.java    |   4 +
 .../server/heartbeat/DataHeartbeatServer.java      |  82 +++++++++++
 .../HeartbeatServer.java}                          | 150 ++++++++++-----------
 .../cluster/server/heartbeat/HeartbeatThread.java  |  12 +-
 .../server/heartbeat/MetaHeartbeatServer.java      |  83 ++++++++++++
 .../cluster/server/member/DataGroupMember.java     |  22 +--
 .../cluster/server/member/MetaGroupMember.java     |  18 ++-
 .../iotdb/cluster/server/member/RaftMember.java    |  81 ++++++++++-
 .../apache/iotdb/cluster/utils/ClusterUtils.java   |  16 ++-
 .../server/heartbeat/DataHeartbeatThreadTest.java  |   5 +
 .../server/heartbeat/HeartbeatThreadTest.java      |   5 +
 .../server/heartbeat/MetaHeartbeatThreadTest.java  |   5 +
 .../cluster/server/member/MetaGroupMemberTest.java |  64 ++++++++-
 18 files changed, 528 insertions(+), 249 deletions(-)
 copy cluster/src/main/java/org/apache/iotdb/cluster/client/async/{AsyncMetaClient.java => AsyncDataHeartbeatClient.java} (63%)
 copy cluster/src/main/java/org/apache/iotdb/cluster/client/async/{AsyncMetaClient.java => AsyncMetaHeartbeatClient.java} (65%)
 copy cluster/src/main/java/org/apache/iotdb/cluster/client/sync/{SyncDataClient.java => SyncDataHeartbeatClient.java} (56%)
 copy cluster/src/main/java/org/apache/iotdb/cluster/client/sync/{SyncMetaClient.java => SyncMetaHeartbeatClient.java} (55%)
 create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/DataHeartbeatServer.java
 copy cluster/src/main/java/org/apache/iotdb/cluster/server/{RaftServer.java => heartbeat/HeartbeatServer.java} (62%)
 create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/MetaHeartbeatServer.java