[incubator-iotdb] branch dev_new_merge updated: fix3

[ejttianyu]

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

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


The following commit(s) were added to refs/heads/dev_new_merge by this push:
     new 2d9a0c2  fix3
2d9a0c2 is described below

commit 2d9a0c2c57f2ad43cacb2065240a8fe277d092c3
Author: EJTTianyu <1653503...@qq.com>
AuthorDate: Sat Jun 13 00:22:03 2020 +0800

    fix3
---
 .../main/java/org/apache/iotdb/db/engine/merge/BaseFileSelector.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/merge/BaseFileSelector.java 
b/server/src/main/java/org/apache/iotdb/db/engine/merge/BaseFileSelector.java
index 53faaa6..25ea658 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/merge/BaseFileSelector.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/merge/BaseFileSelector.java
@@ -61,7 +61,7 @@ public abstract class BaseFileSelector implements 
IMergeFileSelector {
 
   public Pair<MergeResource, SelectorContext> select() throws MergeException {
     selectorContext.setStartTime(System.currentTimeMillis());
-    MergeResource resource = new MergeResource();
+//    MergeResource resource = new MergeResource();
     try {
       logger.info("Selecting merge candidates from {} seqFile, {} unseqFiles", 
seqFiles.size(),
           unseqFiles.size());