gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-18 10:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: prune consumer ecstore object aliases (#3622)

Browse Source
This commit is contained in:
安正超
2026-06-19 21:33:00 +08:00
committed by GitHub
parent 08b8f58e64
commit afe46c01e7
13 changed files with 169 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/heal/src/heal/storage_compat.rs
+3 -3
View File
@@ -29,6 +29,6 @@ pub(crate) use rustfs_ecstore::global::GLOBAL_LOCAL_DISK_MAP;
#[cfg(test)]
pub(crate) use rustfs_ecstore::disk::{DiskOption, new_disk};
pub type HealObjectInfo = rustfs_ecstore::object_api::ObjectInfo;
pub type HealObjectOptions = rustfs_ecstore::object_api::ObjectOptions;
pub type HealPutObjReader = rustfs_ecstore::object_api::PutObjReader;
pub type HealObjectInfo = <ECStore as rustfs_storage_api::ObjectOperations>::ObjectInfo;
pub type HealObjectOptions = <ECStore as rustfs_storage_api::ObjectOperations>::ObjectOptions;
pub type HealPutObjReader = <ECStore as rustfs_storage_api::ObjectIO>::PutObjectReader;
crates/protocols/src/swift/storage_compat.rs
+4 -5
View File
@@ -17,11 +17,10 @@ use std::sync::Arc;
pub(super) type SwiftBucketMetadata = rustfs_ecstore::bucket::metadata::BucketMetadata;
pub(super) type SwiftStorageResult<T> = rustfs_ecstore::error::Result<T>;
pub(super) type SwiftStore = rustfs_ecstore::store::ECStore;
pub type SwiftGetObjectReader = rustfs_ecstore::object_api::GetObjectReader;
pub type SwiftObjectInfo = rustfs_ecstore::object_api::ObjectInfo;
pub type SwiftObjectOptions = rustfs_ecstore::object_api::ObjectOptions;
pub type SwiftPutObjReader = rustfs_ecstore::object_api::PutObjReader;
pub type SwiftGetObjectReader = <SwiftStore as rustfs_storage_api::ObjectIO>::GetObjectReader;
pub type SwiftObjectInfo = <SwiftStore as rustfs_storage_api::ObjectOperations>::ObjectInfo;
pub type SwiftObjectOptions = <SwiftStore as rustfs_storage_api::ObjectOperations>::ObjectOptions;
pub type SwiftPutObjReader = <SwiftStore as rustfs_storage_api::ObjectIO>::PutObjectReader;
pub fn resolve_swift_object_store_handle() -> Option<Arc<SwiftStore>> {
rustfs_ecstore::resolve_object_store_handle()
crates/s3select-api/src/storage_compat.rs
+3 -3
View File
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
pub(crate) type SelectGetObjectReader = rustfs_ecstore::object_api::GetObjectReader;
pub(crate) type SelectObjectInfo = rustfs_ecstore::object_api::ObjectInfo;
pub(crate) type SelectObjectOptions = rustfs_ecstore::object_api::ObjectOptions;
pub(crate) type SelectStorageError = rustfs_ecstore::error::StorageError;
pub(crate) type SelectStore = rustfs_ecstore::store::ECStore;
pub(crate) type SelectGetObjectReader = <SelectStore as rustfs_storage_api::ObjectIO>::GetObjectReader;
pub(crate) type SelectObjectInfo = <SelectStore as rustfs_storage_api::ObjectOperations>::ObjectInfo;
pub(crate) type SelectObjectOptions = <SelectStore as rustfs_storage_api::ObjectOperations>::ObjectOptions;
pub(crate) const SELECT_DEFAULT_READ_BUFFER_SIZE: usize = rustfs_ecstore::set_disk::DEFAULT_READ_BUFFER_SIZE;
crates/scanner/src/storage_compat.rs
+6 -6
View File
@@ -47,6 +47,12 @@ pub(crate) use rustfs_ecstore::bucket::{
pub(crate) use rustfs_ecstore::disk::{DiskAPI, DiskInfoOptions};
pub(crate) use rustfs_ecstore::global::GLOBAL_TierConfigMgr;
pub type ScannerGetObjectReader = <ECStore as ObjectIO>::GetObjectReader;
pub type ScannerObjectInfo = <ECStore as rustfs_storage_api::ObjectOperations>::ObjectInfo;
pub type ScannerObjectOptions = <ECStore as rustfs_storage_api::ObjectOperations>::ObjectOptions;
pub type ScannerObjectToDelete = ObjectToDelete;
pub type ScannerPutObjReader = <ECStore as ObjectIO>::PutObjectReader;
pub(crate) mod storageclass {
pub(crate) const RRS: &str = rustfs_ecstore::config::storageclass::RRS;
pub(crate) const STANDARD: &str = rustfs_ecstore::config::storageclass::STANDARD;
@@ -58,12 +64,6 @@ pub(crate) use rustfs_ecstore::config::init as init_ecstore_config_for_scanner_t
#[cfg(test)]
pub(crate) use rustfs_ecstore::disk::{DiskOption, endpoint::Endpoint, new_disk};
pub type ScannerGetObjectReader = rustfs_ecstore::object_api::GetObjectReader;
pub type ScannerObjectInfo = rustfs_ecstore::object_api::ObjectInfo;
pub type ScannerObjectOptions = rustfs_ecstore::object_api::ObjectOptions;
pub type ScannerObjectToDelete = ObjectToDelete;
pub type ScannerPutObjReader = rustfs_ecstore::object_api::PutObjReader;
pub(crate) fn resolve_scanner_object_store_handle() -> Option<Arc<ECStore>> {
rustfs_ecstore::resolve_object_store_handle()
}