[incubator-iotdb] branch feature_async_close_tsfile updated: update BWP query

[ea...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

east 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 60d2732  update BWP query
60d2732 is described below

commit 60d27323058d1aca53c46af998a7c932743a751f
Author: mdf369 <95...@qq.com>
AuthorDate: Tue Jun 11 16:51:34 2019 +0800

    update BWP query
---
 .../apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 b331a57..c98a76d 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
@@ -277,8 +277,10 @@ public class BufferWriteProcessor extends Processor {
     flushQueryLock.lock();
     try {
       MemSeriesLazyMerger memSeriesLazyMerger = new MemSeriesLazyMerger();
-      if (flushMemTable != null) {
-        memSeriesLazyMerger.addMemSeries(flushMemTable.query(deviceId, measurementId, dataType, props));
+      if (flushingMemTables != null) {
+        for (int i = flushingMemTables.size() - 1; i >= 0; i--) {
+          memSeriesLazyMerger.addMemSeries(flushingMemTables.get(i).query(deviceId, measurementId, dataType, props));
+        }
       }
       memSeriesLazyMerger.addMemSeries(workMemTable.query(deviceId, measurementId, dataType, props));
       // memSeriesLazyMerger has handled the props,