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 36f4fa1 Merge branch 'cluster_premerge2' into cluster_new
add c9da87f some refinements
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/iotdb/cluster/ClientMain.java | 2 +-
.../iotdb/cluster/client/async/ClientPool.java | 3 -
.../cluster/client/sync/SyncClientAdaptor.java | 1 -
.../apache/iotdb/cluster/config/ClusterConfig.java | 4 +-
.../iotdb/cluster/log/catchup/CatchUpTask.java | 89 +++++++++++++---------
.../iotdb/cluster/log/catchup/LogCatchUpTask.java | 27 +++----
.../cluster/log/catchup/SnapshotCatchUpTask.java | 6 +-
.../iotdb/cluster/log/logtypes/CloseFileLog.java | 4 +-
.../cluster/log/logtypes/EmptyContentLog.java | 3 +-
.../cluster/log/logtypes/PhysicalPlanLog.java | 4 +-
.../iotdb/cluster/log/logtypes/RemoveNodeLog.java | 27 ++++++-
.../iotdb/cluster/server/DataClusterServer.java | 2 +-
.../cluster/server/member/DataGroupMember.java | 11 +--
.../iotdb/cluster/utils/ClusterConsistent.java | 2 -
.../apache/iotdb/cluster/utils/StatusUtils.java | 5 --
15 files changed, 108 insertions(+), 82 deletions(-)