gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-19 11:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: clean Swift ECStore boundaries (#3570)

Browse Source
This commit is contained in:
安正超
2026-06-18 15:18:55 +08:00
committed by GitHub
parent 0e7e2660bb
commit c76e4dc6bc
6 changed files with 102 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/protocols/src/swift/versioning.rs
+4 -4
View File
@@ -54,9 +54,9 @@
use super::account::validate_account_access;
use super::container::ContainerMapper;
use super::object::{ObjectKeyMapper, SwiftObjectOptions as ObjectOptions, head_object};
use super::storage_compat::resolve_swift_object_store_handle;
use super::{SwiftError, SwiftResult};
use rustfs_credentials::Credentials;
use rustfs_ecstore::resolve_object_store_handle;
use rustfs_storage_api::{ListOperations as _, ObjectOperations as _};
use std::time::{SystemTime, UNIX_EPOCH};
use tracing::{debug, error};
@@ -197,7 +197,7 @@ pub async fn archive_current_version(
let version_key = ObjectKeyMapper::swift_to_s3_key(&version_name)?;
// Get storage layer
let Some(store) = resolve_object_store_handle() else {
let Some(store) = resolve_swift_object_store_handle() else {
return Err(SwiftError::InternalServerError("Storage layer not initialized".to_string()));
};
@@ -340,7 +340,7 @@ pub async fn restore_previous_version(
let version_key = ObjectKeyMapper::swift_to_s3_key(newest_version)?;
// Get storage layer
let Some(store) = resolve_object_store_handle() else {
let Some(store) = resolve_swift_object_store_handle() else {
return Err(SwiftError::InternalServerError("Storage layer not initialized".to_string()));
};
@@ -476,7 +476,7 @@ pub async fn list_object_versions(
let archive_bucket = mapper.swift_to_s3_bucket(archive_container, &project_id);
// Get storage layer
let Some(store) = resolve_object_store_handle() else {
let Some(store) = resolve_swift_object_store_handle() else {
return Err(SwiftError::InternalServerError("Storage layer not initialized".to_string()));
};