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 7e530030dcbf7ee784fbac744959e76c3cff607e Merge: f5fd6ee748d 95eb0f17a66 Author: Jinrui.Zhang <[email protected]> AuthorDate: Tue May 23 16:15:57 2023 +0800 Merge branch 'tiered_storage' of github.com:apache/iotdb into tiered_storage .../iotdb/hadoop/tsfile/TsFileWriteToHDFS.java | 2 +- .../iotdb/hadoop/fileSystem/HDFSConfUtil.java | 11 ++- .../apache/iotdb/hadoop/tsfile/TSFHadoopTest.java | 6 +- .../apache/iotdb/hive/TSFHiveInputFormatTest.java | 4 +- .../apache/iotdb/hive/TSFHiveRecordReaderTest.java | 4 +- .../resources/conf/iotdb-common.properties | 21 ++++- .../iotdb/os/HybridFileInputFactoryDecorator.java | 3 +- .../apache/iotdb/os/conf/ObjectStorageConfig.java | 59 ++++++++++++-- .../provider/AWSS3Config.java} | 24 +----- .../provider/OSProviderConfig.java} | 45 +++++++---- .../provider/TestConfig.java} | 28 ++----- .../iotdb/os/io/aws/S3ObjectStorageConnector.java | 15 +++- .../os/io/test/TestObjectStorageConnector.java | 80 +++++++++++++++++++ .../apache/iotdb/os/utils/ObjectStorageType.java | 2 + .../org/apache/iotdb/os/cache/OSFileCacheTest.java | 14 ++++ .../apache/iotdb/os/cache/OSFileChannelTest.java | 14 ++++ .../apache/iotdb/os/cache/OSInputStreamTest.java | 14 ++++ .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 89 +++++++++++++++++++--- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 56 ++++++++++++-- .../iotdb/tsfile/common/conf/TSFileConfig.java | 6 +- .../org/apache/iotdb/tsfile/utils/FSUtils.java | 16 +++- .../apache/iotdb/tsfile/utils/FilePathUtils.java | 14 ++-- 22 files changed, 416 insertions(+), 111 deletions(-) diff --cc object-storage/src/main/java/org/apache/iotdb/os/HybridFileInputFactoryDecorator.java index 476aa450daf,12f0d05710c..975fa86f986 --- 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,8 -48,8 +48,8 @@@ public class HybridFileInputFactoryDeco 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()); + FSUtils.parseLocalTsFile2OSFile(file, config.getBucketName(), dataNodeId).getPath()); } return fileInputFactory.getTsFileInput(filePath); }
