This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch tiered_storage_sync_code
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 340148a7684 Merge branch 'master' into tiered_storage
add 0819828ee7a support hot modify data_dirs
add 8132effa340 Merge branch 'tiered_storage' of github.com:apache/iotdb
into tiered_storage
new 64dd4fe33bd remove some files
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.
Summary of changes:
.../iotdb/commons/concurrent/ThreadName.java | 2 -
.../apache/iotdb/commons/service/ServiceType.java | 1 -
object-storage/README.md | 21 -
object-storage/pom.xml | 192 ---------
.../iotdb/os/HybridFileInputFactoryDecorator.java | 56 ---
.../apache/iotdb/os/cache/CacheFileManager.java | 116 ------
.../apache/iotdb/os/cache/CacheRecoverTask.java | 89 ----
.../org/apache/iotdb/os/cache/OSFileCache.java | 104 -----
.../org/apache/iotdb/os/cache/OSFileCacheKey.java | 86 ----
.../apache/iotdb/os/cache/OSFileCacheValue.java | 133 ------
.../org/apache/iotdb/os/cache/OSFileChannel.java | 185 ---------
.../org/apache/iotdb/os/cache/OSInputStream.java | 96 -----
.../apache/iotdb/os/conf/ObjectStorageConfig.java | 117 ------
.../iotdb/os/conf/ObjectStorageDescriptor.java | 37 --
.../apache/iotdb/os/conf/provider/AWSS3Config.java | 22 -
.../iotdb/os/conf/provider/OSProviderConfig.java | 58 ---
.../apache/iotdb/os/conf/provider/TestConfig.java | 33 --
.../iotdb/os/exception/ObjectStorageException.java | 41 --
.../org/apache/iotdb/os/fileSystem/OSFile.java | 461 ---------------------
.../apache/iotdb/os/fileSystem/OSTsFileInput.java | 81 ----
.../apache/iotdb/os/fileSystem/OSTsFileOutput.java | 74 ----
.../java/org/apache/iotdb/os/fileSystem/OSURI.java | 78 ----
.../java/org/apache/iotdb/os/io/IMetaData.java | 25 --
.../apache/iotdb/os/io/ObjectStorageConnector.java | 50 ---
.../org/apache/iotdb/os/io/aws/S3MetaData.java | 42 --
.../iotdb/os/io/aws/S3ObjectStorageConnector.java | 248 -----------
.../os/io/test/TestObjectStorageConnector.java | 142 -------
.../iotdb/os/utils/ObjectStorageConstant.java | 25 --
.../apache/iotdb/os/utils/ObjectStorageType.java | 44 --
.../org/apache/iotdb/os/cache/OSFileCacheTest.java | 137 ------
.../apache/iotdb/os/cache/OSFileChannelTest.java | 219 ----------
.../apache/iotdb/os/cache/OSInputStreamTest.java | 181 --------
object-storage/src/test/resources/logback.xml | 41 --
pom.xml | 1 -
server/pom.xml | 5 -
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 108 +----
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 76 +---
.../iotdb/db/conf/directories/TierManager.java | 15 +-
.../execute/recover/CompactionRecoverManager.java | 1 -
.../execute/recover/CompactionRecoverTask.java | 1 -
.../db/engine/migration/LocalMigrationTask.java | 88 ----
.../iotdb/db/engine/migration/MigrationCause.java | 24 --
.../iotdb/db/engine/migration/MigrationTask.java | 109 -----
.../db/engine/migration/MigrationTaskManager.java | 211 ----------
.../db/engine/migration/RemoteMigrationTask.java | 76 ----
.../java/org/apache/iotdb/db/service/DataNode.java | 16 +-
.../iotdb/db/service/metrics/SystemMetrics.java | 1 -
47 files changed, 11 insertions(+), 3958 deletions(-)
delete mode 100644 object-storage/README.md
delete mode 100644 object-storage/pom.xml
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/HybridFileInputFactoryDecorator.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/cache/CacheFileManager.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/cache/CacheRecoverTask.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/cache/OSFileCache.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/cache/OSFileCacheKey.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/cache/OSFileCacheValue.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/cache/OSFileChannel.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/cache/OSInputStream.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/conf/ObjectStorageConfig.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/conf/ObjectStorageDescriptor.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/conf/provider/AWSS3Config.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/conf/provider/OSProviderConfig.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/conf/provider/TestConfig.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/exception/ObjectStorageException.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/fileSystem/OSFile.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/fileSystem/OSTsFileInput.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/fileSystem/OSTsFileOutput.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/fileSystem/OSURI.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/io/IMetaData.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/io/ObjectStorageConnector.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/io/aws/S3MetaData.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/io/aws/S3ObjectStorageConnector.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/io/test/TestObjectStorageConnector.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/utils/ObjectStorageConstant.java
delete mode 100644
object-storage/src/main/java/org/apache/iotdb/os/utils/ObjectStorageType.java
delete mode 100644
object-storage/src/test/java/org/apache/iotdb/os/cache/OSFileCacheTest.java
delete mode 100644
object-storage/src/test/java/org/apache/iotdb/os/cache/OSFileChannelTest.java
delete mode 100644
object-storage/src/test/java/org/apache/iotdb/os/cache/OSInputStreamTest.java
delete mode 100644 object-storage/src/test/resources/logback.xml
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/migration/LocalMigrationTask.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationCause.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTask.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTaskManager.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/migration/RemoteMigrationTask.java
