[incubator-iotdb] branch merge updated (8b916e8 -> f21fbdf)

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a change to branch merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 8b916e8  fix bug
     new 712e43a  recover TsFileProcessor(may not pass ci)
     new 625e826  fix ts bug
     new f21fbdf  Merge pull request #1550 from zhanglingzhe0820/recover_TsFileProcessor

The 3867 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   |  26 +-
 .../iotdb/db/engine/flush/VmLogAnalyzer.java       |  99 -----
 .../org/apache/iotdb/db/engine/flush/VmLogger.java |  83 ----
 .../apache/iotdb/db/engine/flush/VmMergeUtils.java | 225 ----------
 .../engine/storagegroup/StorageGroupProcessor.java | 159 ++-----
 .../db/engine/storagegroup/TsFileProcessor.java    | 487 +--------------------
 .../writelog/recover/TsFileRecoverPerformer.java   | 107 +----
 .../db/engine/memtable/MemTableFlushTaskTest.java  |   2 +-
 .../storagegroup/StorageGroupProcessorTest.java    |   3 -
 .../storagegroup/TsFileProcessorEnableVmTest.java  |   9 -
 .../engine/storagegroup/TsFileProcessorTest.java   |   4 -
 .../recover/RecoverResourceFromReaderTest.java     |   4 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |  10 +-
 .../writelog/recover/UnseqTsFileRecoverTest.java   |  12 +-
 .../tsfile/common/constant/TsFileConstant.java     |   2 -
 15 files changed, 64 insertions(+), 1168 deletions(-)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/flush/VmLogAnalyzer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/flush/VmLogger.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/flush/VmMergeUtils.java