You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/06/30 00:59:15 UTC
[incubator-iotdb] 03/03: Change name
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 662a8bc882bb0ebc96042e4655c9c9ddf1b65e5a
Author: samperson1997 <sz...@mails.tsinghua.edu.cn>
AuthorDate: Mon Jun 29 16:08:28 2020 +0800
Change name
---
.../java/org/apache/iotdb/db/conf/IoTDBConstant.java | 2 +-
.../apache/iotdb/db/engine/merge/task/MergeFileTask.java | 6 +++---
.../db/engine/storagegroup/StorageGroupProcessor.java | 16 ++++++++--------
.../iotdb/db/engine/storagegroup/TsFileResource.java | 2 +-
.../org/apache/iotdb/db/metadata/MetadataConstant.java | 10 ++++++++--
.../db/writelog/recover/TsFileRecoverPerformer.java | 4 ++--
.../apache/iotdb/db/engine/merge/MergeOverLapTest.java | 16 ++++++++--------
.../java/org/apache/iotdb/db/engine/merge/MergeTest.java | 16 ++++++++--------
.../apache/iotdb/db/engine/merge/MergeUpgradeTest.java | 8 ++++----
.../iotdb/db/integration/IoTDBCreateSnapshotIT.java | 2 +-
.../db/query/reader/series/SeriesReaderTestUtil.java | 16 ++++++++--------
.../iotdb/db/sync/receiver/load/FileLoaderTest.java | 8 ++++----
.../receiver/recover/SyncReceiverLogAnalyzerTest.java | 4 ++--
13 files changed, 58 insertions(+), 52 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
index 8bc924a..a1c41b0 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
@@ -89,7 +89,7 @@ public class IoTDBConstant {
// data folder name
public static final String SEQUENCE_FLODER_NAME = "sequence";
public static final String UNSEQUENCE_FLODER_NAME = "unsequence";
- public static final String TSFILE_NAME_SEPARATOR = "-";
+ public static final String FILE_NAME_SEPARATOR = "-";
public static final String UPGRADE_FOLDER_NAME = "upgrade";
// system folder name
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java
index 4a2efbf..b31a5c8 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java
@@ -336,11 +336,11 @@ class MergeFileTask {
private File getNextMergeVersionFile(File seqFile) {
String[] splits = seqFile.getName().replace(TSFILE_SUFFIX, "")
- .split(IoTDBConstant.TSFILE_NAME_SEPARATOR);
+ .split(IoTDBConstant.FILE_NAME_SEPARATOR);
int mergeVersion = Integer.parseInt(splits[2]) + 1;
return fsFactory.getFile(seqFile.getParentFile(),
- splits[0] + IoTDBConstant.TSFILE_NAME_SEPARATOR + splits[1]
- + IoTDBConstant.TSFILE_NAME_SEPARATOR + mergeVersion + TSFILE_SUFFIX);
+ splits[0] + IoTDBConstant.FILE_NAME_SEPARATOR + splits[1]
+ + IoTDBConstant.FILE_NAME_SEPARATOR + mergeVersion + TSFILE_SUFFIX);
}
private long writeUnmergedChunks(List<Long> chunkStartTimes,
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 f8dd135..85c14d0 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
@@ -586,9 +586,9 @@ public class StorageGroupProcessor {
// ({systemTime}-{versionNum}-{mergeNum}.tsfile)
private int compareFileName(File o1, File o2) {
String[] items1 = o1.getName().replace(TSFILE_SUFFIX, "")
- .split(IoTDBConstant.TSFILE_NAME_SEPARATOR);
+ .split(IoTDBConstant.FILE_NAME_SEPARATOR);
String[] items2 = o2.getName().replace(TSFILE_SUFFIX, "")
- .split(IoTDBConstant.TSFILE_NAME_SEPARATOR);
+ .split(IoTDBConstant.FILE_NAME_SEPARATOR);
long ver1 = Long.parseLong(items1[0]);
long ver2 = Long.parseLong(items2[0]);
int cmp = Long.compare(ver1, ver2);
@@ -975,8 +975,8 @@ public class StorageGroupProcessor {
}
private String getNewTsFileName(long time, long version, int mergeCnt) {
- return time + IoTDBConstant.TSFILE_NAME_SEPARATOR + version
- + IoTDBConstant.TSFILE_NAME_SEPARATOR + mergeCnt + TSFILE_SUFFIX;
+ return time + IoTDBConstant.FILE_NAME_SEPARATOR + version
+ + IoTDBConstant.FILE_NAME_SEPARATOR + mergeCnt + TSFILE_SUFFIX;
}
@@ -2081,22 +2081,22 @@ public class StorageGroupProcessor {
private String getFileNameForLoadingFile(String tsfileName, int insertIndex,
long timePartitionId, List<TsFileResource> sequenceList) {
long currentTsFileTime = Long
- .parseLong(tsfileName.split(IoTDBConstant.TSFILE_NAME_SEPARATOR)[0]);
+ .parseLong(tsfileName.split(IoTDBConstant.FILE_NAME_SEPARATOR)[0]);
long preTime;
if (insertIndex == -1) {
preTime = 0L;
} else {
String preName = sequenceList.get(insertIndex).getFile().getName();
- preTime = Long.parseLong(preName.split(IoTDBConstant.TSFILE_NAME_SEPARATOR)[0]);
+ preTime = Long.parseLong(preName.split(IoTDBConstant.FILE_NAME_SEPARATOR)[0]);
}
if (insertIndex == sequenceFileTreeSet.size() - 1) {
return preTime < currentTsFileTime ? tsfileName : getNewTsFileName(timePartitionId);
} else {
String subsequenceName = sequenceList.get(insertIndex + 1).getFile().getName();
long subsequenceTime = Long
- .parseLong(subsequenceName.split(IoTDBConstant.TSFILE_NAME_SEPARATOR)[0]);
+ .parseLong(subsequenceName.split(IoTDBConstant.FILE_NAME_SEPARATOR)[0]);
long subsequenceVersion = Long
- .parseLong(subsequenceName.split(IoTDBConstant.TSFILE_NAME_SEPARATOR)[1]);
+ .parseLong(subsequenceName.split(IoTDBConstant.FILE_NAME_SEPARATOR)[1]);
if (preTime < currentTsFileTime && currentTsFileTime < subsequenceTime) {
return tsfileName;
} else {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
index c8a0bca..8a55537 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
@@ -313,7 +313,7 @@ public class TsFileResource {
}
} else {
// use the version in file name as the historical version for files of old versions
- long version = Long.parseLong(file.getName().split(IoTDBConstant.TSFILE_NAME_SEPARATOR)[1]);
+ long version = Long.parseLong(file.getName().split(IoTDBConstant.FILE_NAME_SEPARATOR)[1]);
historicalVersions = Collections.singleton(version);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java b/server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
index 36fb907..372e9fb 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
@@ -18,17 +18,23 @@
*/
package org.apache.iotdb.db.metadata;
+import org.apache.iotdb.db.conf.IoTDBConstant;
+
public class MetadataConstant {
private MetadataConstant() {
// allowed to do nothing
}
+ private static final String MTREE_VERSION = "1";
+
public static final String ROOT = "root";
public static final String METADATA_LOG = "mlog.txt";
public static final String TAG_LOG = "tlog.txt";
- public static final String MTREE_SNAPSHOT = "mtree-v1.snapshot";
- public static final String MTREE_SNAPSHOT_TMP = "mtree-v1.snapshot.tmp";
+ public static final String MTREE_SNAPSHOT =
+ "mtree" + IoTDBConstant.FILE_NAME_SEPARATOR + MTREE_VERSION + ".snapshot";
+ public static final String MTREE_SNAPSHOT_TMP =
+ "mtree" + IoTDBConstant.FILE_NAME_SEPARATOR + MTREE_VERSION + ".snapshot.tmp";
public static final short MNODE_TYPE = 0;
diff --git a/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java b/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
index c4818e3..39c9f63 100644
--- a/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
+++ b/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
@@ -113,7 +113,7 @@ public class TsFileRecoverPerformer {
// write .resource file
long fileVersion =
Long.parseLong(
- resource.getFile().getName().split(IoTDBConstant.TSFILE_NAME_SEPARATOR)[1]);
+ resource.getFile().getName().split(IoTDBConstant.FILE_NAME_SEPARATOR)[1]);
resource.setHistoricalVersions(Collections.singleton(fileVersion));
resource.serialize();
}
@@ -183,7 +183,7 @@ public class TsFileRecoverPerformer {
}
}
long fileVersion =
- Long.parseLong(resource.getFile().getName().split(IoTDBConstant.TSFILE_NAME_SEPARATOR)[1]);
+ Long.parseLong(resource.getFile().getName().split(IoTDBConstant.FILE_NAME_SEPARATOR)[1]);
resource.setHistoricalVersions(Collections.singleton(fileVersion));
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java
index 3fdb352..78c496d 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java
@@ -73,8 +73,8 @@ public class MergeOverLapTest extends MergeTest {
void prepareFiles(int seqFileNum, int unseqFileNum) throws IOException, WriteProcessException {
for (int i = 0; i < seqFileNum; i++) {
File file = new File(TestConstant.BASE_OUTPUT_PATH.concat(
- i + "seq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + i + IoTDBConstant.TSFILE_NAME_SEPARATOR
- + i + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ i + "seq" + IoTDBConstant.FILE_NAME_SEPARATOR + i + IoTDBConstant.FILE_NAME_SEPARATOR
+ + i + IoTDBConstant.FILE_NAME_SEPARATOR + 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
tsFileResource.setClosed(true);
@@ -84,9 +84,9 @@ public class MergeOverLapTest extends MergeTest {
}
for (int i = 0; i < unseqFileNum; i++) {
File file = new File(TestConstant.BASE_OUTPUT_PATH.concat(
- i + "unseq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + i
- + IoTDBConstant.TSFILE_NAME_SEPARATOR
- + i + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ i + "unseq" + IoTDBConstant.FILE_NAME_SEPARATOR + i
+ + IoTDBConstant.FILE_NAME_SEPARATOR
+ + i + IoTDBConstant.FILE_NAME_SEPARATOR + 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
tsFileResource.setClosed(true);
@@ -95,9 +95,9 @@ public class MergeOverLapTest extends MergeTest {
prepareUnseqFile(tsFileResource, i * ptNum, ptNum * (i + 1) / unseqFileNum, 10000);
}
File file = new File(TestConstant.BASE_OUTPUT_PATH.concat(
- unseqFileNum + "unseq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + unseqFileNum
- + IoTDBConstant.TSFILE_NAME_SEPARATOR + unseqFileNum
- + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ unseqFileNum + "unseq" + IoTDBConstant.FILE_NAME_SEPARATOR + unseqFileNum
+ + IoTDBConstant.FILE_NAME_SEPARATOR + unseqFileNum
+ + IoTDBConstant.FILE_NAME_SEPARATOR + 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
tsFileResource.setClosed(true);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
index 55cee97..3759ae3 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
@@ -117,8 +117,8 @@ abstract class MergeTest {
throws IOException, WriteProcessException {
for (int i = 0; i < seqFileNum; i++) {
File file = new File(TestConstant.BASE_OUTPUT_PATH.concat(
- i + "seq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + i + IoTDBConstant.TSFILE_NAME_SEPARATOR
- + i + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ i + "seq" + IoTDBConstant.FILE_NAME_SEPARATOR + i + IoTDBConstant.FILE_NAME_SEPARATOR
+ + i + IoTDBConstant.FILE_NAME_SEPARATOR + 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
tsFileResource.setClosed(true);
@@ -128,9 +128,9 @@ abstract class MergeTest {
}
for (int i = 0; i < unseqFileNum; i++) {
File file = new File(TestConstant.BASE_OUTPUT_PATH.concat(
- i + "unseq" + IoTDBConstant.TSFILE_NAME_SEPARATOR
- + i + IoTDBConstant.TSFILE_NAME_SEPARATOR
- + i + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ i + "unseq" + IoTDBConstant.FILE_NAME_SEPARATOR
+ + i + IoTDBConstant.FILE_NAME_SEPARATOR
+ + i + IoTDBConstant.FILE_NAME_SEPARATOR + 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
tsFileResource.setClosed(true);
@@ -140,9 +140,9 @@ abstract class MergeTest {
}
File file = new File(TestConstant.BASE_OUTPUT_PATH
- .concat(unseqFileNum + "unseq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + unseqFileNum
- + IoTDBConstant.TSFILE_NAME_SEPARATOR + unseqFileNum
- + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0 + ".tsfile"));
+ .concat(unseqFileNum + "unseq" + IoTDBConstant.FILE_NAME_SEPARATOR + unseqFileNum
+ + IoTDBConstant.FILE_NAME_SEPARATOR + unseqFileNum
+ + IoTDBConstant.FILE_NAME_SEPARATOR + 0 + ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
tsFileResource.setClosed(true);
tsFileResource.setHistoricalVersions(Collections.singleton((long) (seqFileNum + unseqFileNum)));
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeUpgradeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeUpgradeTest.java
index 422d8a2..ccbac42 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeUpgradeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeUpgradeTest.java
@@ -87,8 +87,8 @@ public class MergeUpgradeTest {
// prepare seqFiles
for (int i = 0; i < seqFileNum; i++) {
File seqfile = FSFactoryProducer.getFSFactory().getFile(TestConstant.BASE_OUTPUT_PATH.concat(
- "seq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + i + IoTDBConstant.TSFILE_NAME_SEPARATOR
- + i + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ "seq" + IoTDBConstant.FILE_NAME_SEPARATOR + i + IoTDBConstant.FILE_NAME_SEPARATOR
+ + i + IoTDBConstant.FILE_NAME_SEPARATOR + 0
+ ".tsfile"));
TsFileResource seqTsFileResource = new TsFileResource(seqfile);
seqResources.add(seqTsFileResource);
@@ -96,8 +96,8 @@ public class MergeUpgradeTest {
}
// prepare unseqFile
File unseqfile = FSFactoryProducer.getFSFactory().getFile(TestConstant.BASE_OUTPUT_PATH.concat(
- "unseq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0 + IoTDBConstant.TSFILE_NAME_SEPARATOR
- + 0 + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ "unseq" + IoTDBConstant.FILE_NAME_SEPARATOR + 0 + IoTDBConstant.FILE_NAME_SEPARATOR
+ + 0 + IoTDBConstant.FILE_NAME_SEPARATOR + 0
+ ".tsfile"));
TsFileResource unseqTsFileResource = new TsFileResource(unseqfile);
unseqResources.add(unseqTsFileResource);
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCreateSnapshotIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCreateSnapshotIT.java
index e20d08f..990bfe2 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCreateSnapshotIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCreateSnapshotIT.java
@@ -68,7 +68,7 @@ public class IoTDBCreateSnapshotIT {
// create snapshot
statement.execute("CREATE SNAPSHOT FOR SCHEMA");
- File snapshotFile = new File(config.getSchemaDir() + File.separator + "mtree-v1.snapshot");
+ File snapshotFile = new File(config.getSchemaDir() + File.separator + "mtree-1.snapshot");
// test snapshot file exists
Assert.assertTrue(snapshotFile.exists());
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
index 58177fd..72f01a1 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
@@ -82,8 +82,8 @@ public class SeriesReaderTestUtil {
List<String> deviceIds) throws IOException, WriteProcessException {
for (int i = 0; i < seqFileNum; i++) {
File file = new File(TestConstant.BASE_OUTPUT_PATH.concat(
- i + "seq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + i + IoTDBConstant.TSFILE_NAME_SEPARATOR
- + i + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ i + "seq" + IoTDBConstant.FILE_NAME_SEPARATOR + i + IoTDBConstant.FILE_NAME_SEPARATOR
+ + i + IoTDBConstant.FILE_NAME_SEPARATOR + 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
tsFileResource.setClosed(true);
@@ -93,9 +93,9 @@ public class SeriesReaderTestUtil {
}
for (int i = 0; i < unseqFileNum; i++) {
File file = new File(TestConstant.BASE_OUTPUT_PATH.concat(
- i + "unseq" + IoTDBConstant.TSFILE_NAME_SEPARATOR
- + i + IoTDBConstant.TSFILE_NAME_SEPARATOR
- + i + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ i + "unseq" + IoTDBConstant.FILE_NAME_SEPARATOR
+ + i + IoTDBConstant.FILE_NAME_SEPARATOR
+ + i + IoTDBConstant.FILE_NAME_SEPARATOR + 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
tsFileResource.setClosed(true);
@@ -106,9 +106,9 @@ public class SeriesReaderTestUtil {
}
File file = new File(TestConstant.BASE_OUTPUT_PATH
- .concat(unseqFileNum + "unseq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + unseqFileNum
- + IoTDBConstant.TSFILE_NAME_SEPARATOR + unseqFileNum
- + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0 + ".tsfile"));
+ .concat(unseqFileNum + "unseq" + IoTDBConstant.FILE_NAME_SEPARATOR + unseqFileNum
+ + IoTDBConstant.FILE_NAME_SEPARATOR + unseqFileNum
+ + IoTDBConstant.FILE_NAME_SEPARATOR + 0 + ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
tsFileResource.setClosed(true);
tsFileResource.setHistoricalVersions(Collections.singleton((long) (seqFileNum + unseqFileNum)));
diff --git a/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java b/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
index a30e18c..8b12267 100644
--- a/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
@@ -90,8 +90,8 @@ public class FileLoaderTest {
String rand = String.valueOf(r.nextInt(10000));
String fileName =
getSnapshotFolder() + File.separator + SG_NAME + i + File.separator
- + (time + i * 100 + j) + IoTDBConstant.TSFILE_NAME_SEPARATOR + rand
- + IoTDBConstant.TSFILE_NAME_SEPARATOR + "0.tsfile";
+ + (time + i * 100 + j) + IoTDBConstant.FILE_NAME_SEPARATOR + rand
+ + IoTDBConstant.FILE_NAME_SEPARATOR + "0.tsfile";
File syncFile = new File(fileName);
File dataFile = new File(
syncFile.getParentFile().getParentFile().getParentFile().getParentFile()
@@ -184,8 +184,8 @@ public class FileLoaderTest {
String rand = String.valueOf(r.nextInt(10000));
String fileName =
getSnapshotFolder() + File.separator + SG_NAME + i + File.separator + (time + i * 100
- + j) + IoTDBConstant.TSFILE_NAME_SEPARATOR + rand
- + IoTDBConstant.TSFILE_NAME_SEPARATOR + "0.tsfile";
+ + j) + IoTDBConstant.FILE_NAME_SEPARATOR + rand
+ + IoTDBConstant.FILE_NAME_SEPARATOR + "0.tsfile";
File syncFile = new File(fileName);
File dataFile = new File(
diff --git a/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java b/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java
index 1ea2f3a..f4da3d2 100644
--- a/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java
@@ -100,8 +100,8 @@ public class SyncReceiverLogAnalyzerTest {
String rand = String.valueOf(r.nextInt(10000) + i * j);
String fileName =
getSnapshotFolder() + File.separator + SG_NAME + i + File.separator + System
- .currentTimeMillis() + IoTDBConstant.TSFILE_NAME_SEPARATOR + rand
- + IoTDBConstant.TSFILE_NAME_SEPARATOR + "0.tsfile";
+ .currentTimeMillis() + IoTDBConstant.FILE_NAME_SEPARATOR + rand
+ + IoTDBConstant.FILE_NAME_SEPARATOR + "0.tsfile";
Thread.sleep(1);
File syncFile = new File(fileName);
receiverLogger