This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch hot_compaction
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from cf15a27 add some comments
new 09f0bcb add merge version
new 592612c Merge commit '2f71fb218d32646396f34e5fd2819968923b125a' into
fix_hot_compaction_recover
new 3471ff9 Merge branch 'hot_compaction' into fix_hot_compaction_recover
new 451d422 add tmp remove logic
new a622a26 Merge pull request #1427 from
zhanglingzhe0820/fix_hot_compaction_recover
The 3702 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:
.../iotdb/db/engine/flush/MemTableFlushTask.java | 6 ++++++
.../org/apache/iotdb/db/engine/flush/VmMergeTask.java | 3 +++
.../iotdb/db/engine/storagegroup/TsFileProcessor.java | 18 ++++++++++++------
.../db/writelog/recover/TsFileRecoverPerformer.java | 2 +-
.../db/engine/memtable/MemTableFlushTaskTest.java | 1 +
.../apache/iotdb/db/integration/IoTDBMergeTest.java | 2 +-
.../db/writelog/recover/UnseqTsFileRecoverTest.java | 14 ++++++++++++++
7 files changed, 38 insertions(+), 8 deletions(-)