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/14 12:58:51 UTC
[incubator-iotdb] branch feature_async_close_tsfile updated: fix
some tests
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
The following commit(s) were added to refs/heads/feature_async_close_tsfile by this push:
new 6329233 fix some tests
6329233 is described below
commit 6329233bff18e2eaa71b3be60ca35b93d25f2f93
Author: 江天 <jt...@163.com>
AuthorDate: Fri Jun 14 20:56:49 2019 +0800
fix some tests
---
.../iotdb/db/engine/bufferwrite/BufferWriteProcessor.java | 12 ++++++------
.../apache/iotdb/db/engine/memtable/MemTableFlushTask.java | 6 +++++-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
index 7b35348..9bca6ca 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
@@ -143,12 +143,10 @@ public class BufferWriteProcessor extends Processor {
TsFileRecoverPerformer recoverPerformer =
new TsFileRecoverPerformer(insertFilePath, logNodePrefix(),
- fileSchema, versionController, currentTsFileResource, currentTsFileResource.getModFile());
+ fileSchema, versionController, currentTsFileResource,
+ currentTsFileResource != null ? currentTsFileResource.getModFile() : null);
try {
- if (recoverPerformer.recover()) {
- // recovered file is closed and receive no new data
- return;
- }
+ recoverPerformer.recover();
} catch (ProcessorException e) {
throw new BufferWriteProcessorException(e);
}
@@ -309,7 +307,9 @@ public class BufferWriteProcessor extends Processor {
memSeriesLazyMerger.addMemSeries(flushingMemTables.get(i).query(deviceId, measurementId, dataType, props));
}
}
- memSeriesLazyMerger.addMemSeries(workMemTable.query(deviceId, measurementId, dataType, props));
+ if (workMemTable != null) {
+ memSeriesLazyMerger.addMemSeries(workMemTable.query(deviceId, measurementId, dataType, props));
+ }
// memSeriesLazyMerger has handled the props,
// so we do not need to handle it again in the following readOnlyMemChunk
ReadOnlyMemChunk timeValuePairSorter = new ReadOnlyMemChunk(dataType, memSeriesLazyMerger,
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java
index 1c89439..ea053c4 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java
@@ -152,7 +152,6 @@ public class MemTableFlushTask {
MemTablePool.getInstance().release(memTable);
LOGGER.info("Processor {} return back a memtable to MemTablePool", processorName);
- flushCallBack.afterFlush(memTable, tsFileIoWriter);
if (tsFileIoWriter instanceof RestorableTsFileIOWriter) {
try {
((RestorableTsFileIOWriter) tsFileIoWriter).writeRestoreInfo();
@@ -160,6 +159,8 @@ public class MemTableFlushTask {
LOGGER.error("write restore file meet error", e);
}
}
+ flushCallBack.afterFlush(memTable, tsFileIoWriter);
+
// enable next flushMetadata task to IO
long newId = tsFileIoWriter.getFlushID().incrementAndGet();
@@ -241,6 +242,9 @@ public class MemTableFlushTask {
}
}
stop = true;
+ while (ioFlushThread.isAlive()) {
+ // wait until the after works are done
+ }
}