This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 6d8413f add release check doc (#702)
add 0734ec1 Track the merge history in TsFileResource (#683)
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 | 4 +-
.../db/engine/storagegroup/TsFileResource.java | 58 ++++++++++++++++------
.../iotdb/db/tools/TsFileResourcePrinter.java | 8 ++-
.../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 ++
9 files changed, 115 insertions(+), 45 deletions(-)
