You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2021/06/05 01:44:26 UTC
[iotdb] branch fix_bug_caused_by_incorrect_file_name created (now
604252a)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch fix_bug_caused_by_incorrect_file_name
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at 604252a fix file name format issue in tests
This branch includes the following new commits:
new 604252a fix file name format issue in tests
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: fix file name format issue in tests
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_bug_caused_by_incorrect_file_name
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 604252a3ea29a0dfa7584c75c9072659160c021f
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sat Jun 5 09:43:44 2021 +0800
fix file name format issue in tests
---
.../org/apache/iotdb/cluster/common/TestUtils.java | 2 +-
.../db/engine/storagegroup/TsFileResource.java | 58 ++++++++++------------
2 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java
index 2ad2b46..055e505 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java
@@ -378,7 +378,7 @@ public class TestUtils {
+ File.separator
+ 0
+ File.separator
- + "0-%d-0"
+ + "0-%d-0-0"
+ TsFileConstant.TSFILE_SUFFIX,
i);
if (asHardLink) {
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 3f46ac2..c84c5c2 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
@@ -32,11 +32,7 @@ import org.apache.iotdb.db.service.UpgradeSevice;
import org.apache.iotdb.db.utils.FilePathUtils;
import org.apache.iotdb.db.utils.TestOnly;
import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
-import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata;
-import org.apache.iotdb.tsfile.file.metadata.ITimeSeriesMetadata;
-import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata;
-import org.apache.iotdb.tsfile.file.metadata.VectorChunkMetadata;
-import org.apache.iotdb.tsfile.file.metadata.VectorTimeSeriesMetadata;
+import org.apache.iotdb.tsfile.file.metadata.*;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics;
import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer;
@@ -54,21 +50,9 @@ import java.io.OutputStream;
import java.nio.file.FileAlreadyExistsException;
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Random;
-import java.util.Set;
-
-import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SEPARATOR;
-import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_INDEX;
-import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_MERGECNT_INDEX;
-import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_SEPARATOR;
-import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_TIME_INDEX;
-import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_UNSEQMERGECNT_INDEX;
-import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_VERSION_INDEX;
+import java.util.*;
+
+import static org.apache.iotdb.db.conf.IoTDBConstant.*;
import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX;
@SuppressWarnings("java:S1135") // ignore todos
@@ -850,20 +834,28 @@ public class TsFileResource {
+ TSFILE_SUFFIX;
}
- public static TsFileName getTsFileName(String FileName) {
- String[] fileName =
- FileName.split(FILE_NAME_SUFFIX_SEPARATOR)[FILE_NAME_SUFFIX_INDEX].split(
+ public static TsFileName getTsFileName(String fileName) throws IOException {
+ String[] fileNameParts =
+ fileName.split(FILE_NAME_SUFFIX_SEPARATOR)[FILE_NAME_SUFFIX_INDEX].split(
FILE_NAME_SEPARATOR);
- TsFileName tsFileName =
- new TsFileName(
- Long.parseLong(fileName[FILE_NAME_SUFFIX_TIME_INDEX]),
- Long.parseLong(fileName[FILE_NAME_SUFFIX_VERSION_INDEX]),
- Integer.parseInt(fileName[FILE_NAME_SUFFIX_MERGECNT_INDEX]),
- Integer.parseInt(fileName[FILE_NAME_SUFFIX_UNSEQMERGECNT_INDEX]));
- return tsFileName;
+ if (fileNameParts.length != 4) {
+ throw new IOException("tsfile file name format is incorrect:" + fileName);
+ }
+ try {
+ TsFileName tsFileName =
+ new TsFileName(
+ Long.parseLong(fileNameParts[FILE_NAME_SUFFIX_TIME_INDEX]),
+ Long.parseLong(fileNameParts[FILE_NAME_SUFFIX_VERSION_INDEX]),
+ Integer.parseInt(fileNameParts[FILE_NAME_SUFFIX_MERGECNT_INDEX]),
+ Integer.parseInt(fileNameParts[FILE_NAME_SUFFIX_UNSEQMERGECNT_INDEX]));
+ return tsFileName;
+ } catch (NumberFormatException e) {
+ throw new IOException("tsfile file name format is incorrect:" + fileName);
+ }
}
- public static TsFileResource modifyTsFileNameUnseqMergCnt(TsFileResource tsFileResource) {
+ public static TsFileResource modifyTsFileNameUnseqMergCnt(TsFileResource tsFileResource)
+ throws IOException {
File tsFile = tsFileResource.getTsFile();
String path = tsFile.getParent();
TsFileName tsFileName = getTsFileName(tsFileResource.getTsFile().getName());
@@ -882,7 +874,7 @@ public class TsFileResource {
return tsFileResource;
}
- public static File modifyTsFileNameUnseqMergCnt(File tsFile) {
+ public static File modifyTsFileNameUnseqMergCnt(File tsFile) throws IOException {
String path = tsFile.getParent();
TsFileName tsFileName = getTsFileName(tsFile.getName());
tsFileName.setUnSeqMergeCnt(tsFileName.getUnSeqMergeCnt() + 1);
@@ -898,7 +890,7 @@ public class TsFileResource {
+ TSFILE_SUFFIX);
}
- public static File modifyTsFileNameMergeCnt(File tsFile) {
+ public static File modifyTsFileNameMergeCnt(File tsFile) throws IOException {
String path = tsFile.getParent();
TsFileName tsFileName = getTsFileName(tsFile.getName());
tsFileName.setMergeCnt(tsFileName.getMergeCnt() + 1);