You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/11/22 16:46:24 UTC
[incubator-iotdb] branch dev_new_merge_strategy updated: fix new
file's naming
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 e15c7dd fix new file's naming
e15c7dd is described below
commit e15c7dd06bd2e958c3991070429bd66192a193cc
Author: jt2594838 <jt...@163.com>
AuthorDate: Sat Nov 23 00:46:11 2019 +0800
fix new file's naming
---
.../apache/iotdb/db/engine/merge/squeeze/task/MergeSeriesTask.java | 5 ++++-
1 file changed, 4 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 4e85275..af0196d 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
@@ -186,9 +186,12 @@ class MergeSeriesTask {
long currFileVersion =
Long.parseLong(
resource.getSeqFiles().get(0).getFile().getName().replace(TSFILE_SUFFIX, "").split(TSFILE_SEPARATOR)[1]);
+ long prevMergeNum =
+ Long.parseLong(
+ resource.getSeqFiles().get(0).getFile().getName().replace(TSFILE_SUFFIX, "").split(TSFILE_SEPARATOR)[2]);
File parent = resource.getSeqFiles().get(0).getFile().getParentFile();
File newFile = FSFactoryProducer.getFSFactory().getFile(parent,
- System.currentTimeMillis() + TSFILE_SEPARATOR + currFileVersion + TSFILE_SUFFIX + MERGE_SUFFIX);
+ System.currentTimeMillis() + TSFILE_SEPARATOR + currFileVersion + TSFILE_SEPARATOR + (prevMergeNum + 1) + TSFILE_SUFFIX + MERGE_SUFFIX);
newFileWriter = new RestorableTsFileIOWriter(newFile);
newResource = new TsFileResource(newFile);
}