This is an automated email from the ASF dual-hosted git repository. xingtanzjr pushed a commit to branch tiered_storage in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f5fd6ee748db918df0c6e267a7e09d70bb2ac916 Author: Jinrui.Zhang <[email protected]> AuthorDate: Tue May 23 16:13:12 2023 +0800 tmp test save --- .../iotdb/os/HybridFileInputFactoryDecorator.java | 2 +- .../fileInputFactory/HybridFileInputFactory.java | 5 ++-- .../org/apache/iotdb/tsfile/utils/FSUtils.java | 30 +++++++++++++--------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/object-storage/src/main/java/org/apache/iotdb/os/HybridFileInputFactoryDecorator.java b/object-storage/src/main/java/org/apache/iotdb/os/HybridFileInputFactoryDecorator.java index 2f7e425ca60..476aa450daf 100644 --- a/object-storage/src/main/java/org/apache/iotdb/os/HybridFileInputFactoryDecorator.java +++ b/object-storage/src/main/java/org/apache/iotdb/os/HybridFileInputFactoryDecorator.java @@ -49,7 +49,7 @@ public class HybridFileInputFactoryDecorator implements FileInputFactory { public TsFileInput getTsFileInput(String filePath) throws IOException { File file = new File(filePath); if (!file.exists()) { - fileInputFactory.getTsFileInput( + return fileInputFactory.getTsFileInput( FSUtils.parseLocalTsFile2OSFile(file, AWSS3Config.getBucketName(), dataNodeId).getPath()); } return fileInputFactory.getTsFileInput(filePath); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HybridFileInputFactory.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HybridFileInputFactory.java index f9140af71e9..3a7cc7d099e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HybridFileInputFactory.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/HybridFileInputFactory.java @@ -42,7 +42,8 @@ public class HybridFileInputFactory implements FileInputFactory { @Override public TsFileInput getTsFileInput(String filePath) throws IOException { - FSPath path = FSUtils.parse(filePath); - return inputFactories.get(path.getFsType()).getTsFileInput(path.getPath()); + return inputFactories.get(FSType.OBJECT_STORAGE).getTsFileInput(filePath); +// FSPath path = FSUtils.parse(filePath); +// return inputFactories.get(path.getFsType()).getTsFileInput(path.getPath()); } } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FSUtils.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FSUtils.java index 7133841052c..37aaa64d06e 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FSUtils.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FSUtils.java @@ -102,20 +102,26 @@ public class FSUtils { .getPath(); } +// public static FSPath parseLocalTsFile2OSFile(File lcoalFile, String bucket, int dataNodeId) +// throws IOException { +// String[] filePathSplits = FilePathUtils.splitTsFilePath(lcoalFile.getCanonicalPath()); +// return new FSPath( +// FSType.OBJECT_STORAGE, +// fsPrefix[0] +// + bucket +// + OS_FILE_SEPARATOR +// + dataNodeId +// + OS_FILE_SEPARATOR +// + String.join( +// OS_FILE_SEPARATOR, +// Arrays.copyOfRange( +// filePathSplits, filePathSplits.length - 5, filePathSplits.length))); +// } + public static FSPath parseLocalTsFile2OSFile(File lcoalFile, String bucket, int dataNodeId) throws IOException { - String[] filePathSplits = FilePathUtils.splitTsFilePath(lcoalFile.getCanonicalPath()); - return new FSPath( - FSType.OBJECT_STORAGE, - fsPrefix[0] - + bucket - + OS_FILE_SEPARATOR - + dataNodeId - + OS_FILE_SEPARATOR - + String.join( - OS_FILE_SEPARATOR, - Arrays.copyOfRange( - filePathSplits, filePathSplits.length - 5, filePathSplits.length))); + String fileName = lcoalFile.getName(); + return new FSPath(FSType.LOCAL, "/Users/jinruizhangjinrui/Documents/work/iotdb/data/datanode/s3/" + fileName); } public static boolean isLocal(String fsPath) {
