[incubator-iotdb] branch dev_new_merge_strategy updated: fix new file 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 04ac46e  fix new file unrenamed
04ac46e is described below

commit 04ac46ef29ebb3c5d163176c923793e75cd6768e
Author: jt2594838 <jt...@163.com>
AuthorDate: Sat Nov 23 09:48:11 2019 +0800

    fix new file unrenamed
---
 .../org/apache/iotdb/db/engine/merge/squeeze/task/MergeSeriesTask.java | 1 -
 .../org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/squeeze/task/MergeSeriesTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/squeeze/task/MergeSeriesTask.java
index af0196d..a6b6a3c 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/squeeze/task/MergeSeriesTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/squeeze/task/MergeSeriesTask.java
@@ -120,7 +120,6 @@ class MergeSeriesTask {
     }
 
     newFileWriter.endFile(new Schema(newFileWriter.getKnownSchema()));
-    newResource.serialize();
     // the new file is ready to replace the old ones, write logs so we will not need to start from
     // the beginning after system failure
     mergeLogger.logAllTsEnd();
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 d3e3c24..b603356 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,6 +1173,9 @@ 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, "")));
+      newFile.serialize();
       mergeLog.delete();
     } catch (IOException e) {
       logger.error("{} fails to do the after merge action,", storageGroupName, e);