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 7ef8298 Merge branch 'cluster_new' of
github.com:apache/incubator-iotdb into cluster_new
add 4ff5694 Resolve file duplications by historical versions.
add d8106f2 Merge branches 'cluster_new' and 'cluster_new' of
github.com:apache/incubator-iotdb into cluster_new
No new revisions were added by this update.
Summary of changes:
.../apache/iotdb/cluster/RemoteTsFileResource.java | 15 ++++++++
.../cluster/server/member/DataGroupMember.java | 38 +++----------------
.../org/apache/iotdb/db/engine/StorageEngine.java | 6 +++
.../engine/storagegroup/StorageGroupProcessor.java | 44 ++++++++++++++++++++++
4 files changed, 70 insertions(+), 33 deletions(-)