You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ka...@apache.org on 2019/06/12 01:58:55 UTC
[incubator-iotdb] 03/03: 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.
kangrong pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit c3bbccf7e8ade25f2e487689266dbd6cbfb5a960
Merge: c9b8dad 63f4311
Author: kr11 <30...@qq.com>
AuthorDate: Wed Jun 12 09:58:06 2019 +0800
Merge branch 'feature_async_close_tsfile' of github.com:apache/incubator-iotdb into feature_async_close_tsfile
# Conflicts:
# iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowIO.java
# iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowResource.java
.../java/org/apache/iotdb/db/engine/Processor.java | 31 +++++++-
.../engine/bufferwrite/BufferWriteProcessor.java | 70 +++++++++++++-----
.../db/engine/filenode/CopyOnWriteLinkedList.java | 12 ++--
.../iotdb/db/engine/filenode/FileNodeManager.java | 61 ++++++++++++++--
.../db/engine/filenode/FileNodeProcessor.java | 84 ++++++++++++----------
.../iotdb/db/engine/memtable/MemTablePool.java | 5 +-
.../db/engine/overflow/io/OverflowResource.java | 2 -
.../iotdb/db/query/control/FileReaderManager.java | 2 +-
.../recover/StorageGroupRecoverPerformer.java | 12 ++--
.../engine/bufferwrite/BufferWriteBenchmark.java | 76 ++++++++++----------
10 files changed, 239 insertions(+), 116 deletions(-)
diff --cc iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowResource.java
index a5484fb,d56eb3f..a37653c
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowResource.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowResource.java
@@@ -235,13 -232,8 +235,11 @@@ public class OverflowResource
long lastPosition = insertIO.getPos();
// MemTableFlushUtil.flushMemTable(fileSchema, insertIO, memTable,
// versionController.nextVersion());
-
- MemTableFlushTask task = new MemTableFlushTask(insertIO, processorName, 0L, (a, b) -> {});
- task.flushMemTable(fileSchema, memTable, versionController.nextVersion());
+// MemTableFlushTask task = new MemTableFlushTask(insertIO, processorName);
+ MemTableFlushTask tableFlushTask = new MemTableFlushTask(insertIO, processorName, flushId,
+ removeFlushedMemTable);
+ tableFlushTask.flushMemTable(fileSchema, memTable, versionController.nextVersion());
+
-
List<ChunkGroupMetaData> rowGroupMetaDatas = insertIO.getChunkGroupMetaDatas();
appendInsertMetadatas.addAll(rowGroupMetaDatas);
if (!rowGroupMetaDatas.isEmpty()) {