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 4b2f88f Merge branch 'pull_up_file_close' into cluster_new
add 7548a46 Track the merge history in TsFileResource
add bea51cd record allDirectFileVersions in SGProcessor
add b80cd18 fix tests
add bcadae4 fix asf header
add b375de9 Merge branch 'master' into track_file_historical_versions
add 279c551 Merge branch 'track_file_historical_versions' into cluster_new
No new revisions were added by this update.
Summary of changes:
.../iotdb/db/engine/merge/task/MergeFileTask.java | 18 +++++++
.../engine/storagegroup/StorageGroupProcessor.java | 13 +++++
.../db/engine/storagegroup/TsFileProcessor.java | 3 ++
.../db/engine/storagegroup/TsFileResource.java | 57 +++++++++++++++-------
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 31 +++++++-----
.../writelog/recover/TsFileRecoverPerformer.java | 22 +++------
.../iotdb/db/engine/merge/MergeOverLapTest.java | 3 ++
.../apache/iotdb/db/engine/merge/MergeTest.java | 3 ++
8 files changed, 105 insertions(+), 45 deletions(-)
