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/23 06:51:19 UTC
[incubator-iotdb] branch feature_async_close_tsfile updated: add
doc in Empty memtable
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
The following commit(s) were added to refs/heads/feature_async_close_tsfile by this push:
new 6a97bd8 add doc in Empty memtable
6a97bd8 is described below
commit 6a97bd8b86e8313ab37c4bdb45bf5d8ada2953c1
Author: qiaojialin <64...@qq.com>
AuthorDate: Sun Jun 23 14:51:16 2019 +0800
add doc in Empty memtable
---
.../apache/iotdb/db/engine/filenodeV2/UnsealedTsFileProcessorV2.java | 2 +-
.../main/java/org/apache/iotdb/db/engine/memtable/EmptyMemTable.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenodeV2/UnsealedTsFileProcessorV2.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenodeV2/UnsealedTsFileProcessorV2.java
index 3181892..a97ac80 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenodeV2/UnsealedTsFileProcessorV2.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenodeV2/UnsealedTsFileProcessorV2.java
@@ -375,7 +375,7 @@ public class UnsealedTsFileProcessorV2 {
memSeriesLazyMerger
.addMemSeries(flushingMemTable.query(deviceId, measurementId, dataType, props));
}
- if (workMemTable != null) {
+ if (workMemTable != null && workMemTable.isManagedByMemPool()) {
memSeriesLazyMerger
.addMemSeries(workMemTable.query(deviceId, measurementId, dataType, props));
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/EmptyMemTable.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/EmptyMemTable.java
index 4607b4d..5b31b57 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/EmptyMemTable.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/EmptyMemTable.java
@@ -2,6 +2,10 @@ package org.apache.iotdb.db.engine.memtable;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+/**
+ * Only used in sync flush and async close,
+ * This memtable is not managed by MemTablePool and does not store any data.
+ */
public class EmptyMemTable extends AbstractMemTable {
@Override