[incubator-iotdb] branch dev_new_merge_strategy updated: fix merge empty file condition

[ji...@apache.org]

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

jiangtian pushed a commit to branch dev_new_merge_strategy
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/dev_new_merge_strategy by this push:
     new ff56e16  fix merge empty file condition
ff56e16 is described below

commit ff56e1684c93c778c430ad47c2f0c0ad427abdc9
Author: jt2594838 <jt...@163.com>
AuthorDate: Fri Nov 22 21:41:21 2019 +0800

    fix merge empty file condition
---
 .../org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 47b9631..df1bb85 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -1028,7 +1028,7 @@ public class StorageGroupProcessor {
         }
         return;
       }
-      if (unSequenceFileList.isEmpty() || sequenceFileList.isEmpty()) {
+      if (unSequenceFileList.isEmpty() && sequenceFileList.isEmpty()) {
         logger.info("{} no files to be merged", storageGroupName);
         return;
       }