[incubator-iotdb] branch dev_new_merge_strategy updated: fix resource unrenamed

[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 d617727  fix resource unrenamed
d617727 is described below

commit d617727f0fae1a6c2e9f311b0cab023132fae565
Author: jt2594838 <jt...@163.com>
AuthorDate: Mon Nov 25 08:53:15 2019 +0800

    fix resource unrenamed
---
 .../apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 b603356..1bd1155 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
@@ -1173,8 +1173,11 @@ public class StorageGroupProcessor {
         seqFile.remove();
         seqFile.getWriteQueryLock().writeLock().unlock();
       }
-      File newTsFile = newFile.getFile();
-      newTsFile.renameTo(new File(newTsFile.getParent(), newTsFile.getName().replace(SqueezeMergeTask.MERGE_SUFFIX, "")));
+      File oldTsFile = newFile.getFile();
+      File newTsFile = new File(oldTsFile.getParent(),
+          oldTsFile.getName().replace(SqueezeMergeTask.MERGE_SUFFIX, ""));
+      oldTsFile.renameTo(newTsFile);
+      newFile.setFile(newTsFile);
       newFile.serialize();
       mergeLog.delete();
     } catch (IOException e) {