You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/06/24 13:29:15 UTC

[incubator-iotdb] 02/02: Merge branch 'feature_async_close_tsfile' of github.com:apache/incubator-iotdb into feature_async_close_tsfile

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

jiangtian pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit e20eb9e2a2171c3a9444b7f2fcfc0382ed0b3518
Merge: 44561c9 69a113c
Author: 江天 <jt...@163.com>
AuthorDate: Mon Jun 24 21:27:03 2019 +0800

    Merge branch 'feature_async_close_tsfile' of github.com:apache/incubator-iotdb into feature_async_close_tsfile

 iotdb/iotdb/conf/iotdb-engine.properties           |  3 ++
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 22 ++++----
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  4 ++
 .../db/engine/filenodeV2/FileNodeManagerV2.java    |  1 +
 .../db/engine/filenodeV2/FileNodeProcessorV2.java  | 32 +++++++++---
 .../iotdb/db/engine/filenodeV2/FlushManager.java   |  7 +--
 .../db/engine/filenodeV2/TsFileResourceV2.java     | 59 ++++++++++++++++++++++
 .../filenodeV2/UnsealedTsFileProcessorV2.java      |  3 ++
 .../db/engine/memtable/MemTableFlushTaskV2.java    | 41 ++++++++-------
 .../iotdb/db/engine/memtable/MemTablePool.java     |  2 +-
 .../writelog/recover/TsFileRecoverPerformer.java   | 31 ++++++++----
 .../tsfile/common/constant/SystemConstant.java     |  1 +
 .../iotdb/tsfile/read/TsFileRestorableReader.java  |  2 +-
 .../apache/iotdb/tsfile/write/TsFileWriter.java    | 10 ----
 .../write/writer/NativeRestorableIOWriter.java     | 37 ++++++++------
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  |  1 -
 .../write/writer/NativeRestorableIOWriterTest.java |  4 +-
 17 files changed, 173 insertions(+), 87 deletions(-)