You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2019/06/24 15:31:58 UTC
[incubator-iotdb] 02/03: Merge branch 'feature_async_close_tsfile'
of https://github.com/apache/incubator-iotdb into
feature_async_close_tsfile
This is an automated email from the ASF dual-hosted git repository.
suyue pushed a commit to branch qovc
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 75f0c34837869183ce96a351385123307a8d63fe
Merge: 0550925 e20eb9e
Author: suyue <23...@qq.com>
AuthorDate: Mon Jun 24 22:50:50 2019 +0800
Merge branch 'feature_async_close_tsfile' of https://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/filenode/FileNodeProcessor.java | 6 +-
.../db/engine/filenodeV2/FileNodeManagerV2.java | 1 +
.../db/engine/filenodeV2/FileNodeProcessorV2.java | 43 +++++---
.../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 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 13 ++-
...rPerformer.java => TsFileRecoverPerformer.java} | 43 +++++---
.../recover/UnSeqTsFileRecoverPerformer.java | 117 ---------------------
.../db/writelog/recover/SeqTsFileRecoverTest.java | 5 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 4 +-
.../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 +-
22 files changed, 204 insertions(+), 224 deletions(-)