refactor: prune consumer storage compat paths (#3704)

This commit is contained in:
安正超
2026-06-22 02:31:30 +08:00
committed by GitHub
parent e528ee9452
commit d39815470e
14 changed files with 280 additions and 196 deletions
@@ -12,22 +12,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
pub(crate) fn check_bucket_and_object_names(bucket: &str, object: &str) -> rustfs_ecstore::api::error::Result<()> {
rustfs_ecstore::api::bucket::utils::check_bucket_and_object_names(bucket, object)
use rustfs_ecstore::api::{bucket as ecstore_bucket, error as ecstore_error};
pub(crate) fn check_bucket_and_object_names(bucket: &str, object: &str) -> ecstore_error::Result<()> {
ecstore_bucket::utils::check_bucket_and_object_names(bucket, object)
}
pub(crate) fn check_list_objs_args(
bucket: &str,
prefix: &str,
marker: &Option<String>,
) -> rustfs_ecstore::api::error::Result<()> {
rustfs_ecstore::api::bucket::utils::check_list_objs_args(bucket, prefix, marker)
) -> ecstore_error::Result<()> {
ecstore_bucket::utils::check_list_objs_args(bucket, prefix, marker)
}
pub(crate) fn check_valid_bucket_name_strict(bucket_name: &str) -> rustfs_ecstore::api::error::Result<()> {
rustfs_ecstore::api::bucket::utils::check_valid_bucket_name_strict(bucket_name)
pub(crate) fn check_valid_bucket_name_strict(bucket_name: &str) -> ecstore_error::Result<()> {
ecstore_bucket::utils::check_valid_bucket_name_strict(bucket_name)
}
pub(crate) fn is_meta_bucketname(name: &str) -> bool {
rustfs_ecstore::api::bucket::utils::is_meta_bucketname(name)
ecstore_bucket::utils::is_meta_bucketname(name)
}
@@ -12,17 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use rustfs_ecstore::api::{bucket as ecstore_bucket, error as ecstore_error};
pub(crate) fn check_object_name_for_length_and_slash(
bucket: &str,
object: &str,
) -> rustfs_ecstore::api::error::Result<()> {
rustfs_ecstore::api::bucket::utils::check_object_name_for_length_and_slash(bucket, object)
) -> ecstore_error::Result<()> {
ecstore_bucket::utils::check_object_name_for_length_and_slash(bucket, object)
}
pub(crate) fn has_bad_path_component(path: &str) -> bool {
rustfs_ecstore::api::bucket::utils::has_bad_path_component(path)
ecstore_bucket::utils::has_bad_path_component(path)
}
pub(crate) fn is_valid_object_prefix(object: &str) -> bool {
rustfs_ecstore::api::bucket::utils::is_valid_object_prefix(object)
ecstore_bucket::utils::is_valid_object_prefix(object)
}