You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/06/28 09:06:51 UTC
[incubator-iotdb] 03/03: merge and resolve conflict
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit cccfd82a2d8a5439759c0c77dcc7f85ef83db663
Merge: b94b795 febd351
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Jun 28 17:06:46 2019 +0800
merge and resolve conflict
.../{FlushTaskPool.java => ChunkBufferPool.java} | 16 ++---
.../iotdb/db/engine/memtable/EmptyMemTable.java | 18 +++++
.../db/engine/memtable/MemTableFlushTaskV2.java | 8 +--
.../iotdb/db/engine/memtable/MemTablePool.java | 3 +
.../db/engine/memtable/ChunkBufferPoolTest.java | 81 ++++++++++++++++++++++
.../iotdb/db/engine/memtable/MemTablePoolTest.java | 23 +++++-
.../db/utils/datastructure/LongTVListTest.java | 18 +++++
.../iotdb/tsfile/write/chunk/ChunkBuffer.java | 4 +-
8 files changed, 155 insertions(+), 16 deletions(-)
diff --cc iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskV2.java
index af54162,feea3e4..a6f182d
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskV2.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskV2.java
@@@ -138,8 -136,9 +136,8 @@@ public class MemTableFlushTaskV2
} else {
long starTime = System.currentTimeMillis();
Pair<TVList, MeasurementSchema> encodingMessage = (Pair<TVList, MeasurementSchema>) task;
- ChunkBuffer chunkBuffer = FlushTaskPool.getInstance().getEmptyChunkBuffer(this, encodingMessage.right);
-
+ ChunkBuffer chunkBuffer = ChunkBufferPool
+ .getInstance().getEmptyChunkBuffer(this, encodingMessage.right);
-
IChunkWriter seriesWriter = new ChunkWriterImpl(encodingMessage.right, chunkBuffer,
PAGE_SIZE_THRESHOLD);
try {
@@@ -198,9 -199,7 +196,9 @@@
if (ioMessage instanceof String) {
tsFileIoWriter.startChunkGroup((String) ioMessage);
} else if (ioMessage instanceof IChunkWriter) {
- ((IChunkWriter) ioMessage).writeToFileWriter(tsFileIoWriter);
+ ChunkWriterImpl writer = (ChunkWriterImpl) ioMessage;
+ writer.writeToFileWriter(tsFileIoWriter);
- FlushTaskPool.getInstance().putBack(writer.getChunkBuffer());
++ ChunkBufferPool.getInstance().putBack(writer.getChunkBuffer());
} else {
ChunkGroupIoTask endGroupTask = (ChunkGroupIoTask) ioMessage;
tsFileIoWriter.endChunkGroup(endGroupTask.version);