get/put BucketVersionin done

This commit is contained in:
weisd
2024-10-10 09:40:30 +08:00
parent 1bbd5168c9
commit 22463c9eb1
5 changed files with 53 additions and 16 deletions
+6 -4
View File
@@ -1,4 +1,7 @@
use crate::error::{Error, Result};
use crate::{
error::{Error, Result},
utils,
};
use rmp_serde::Serializer as rmpSerializer;
use serde::{Deserialize, Serialize};
@@ -69,7 +72,6 @@ impl Versioning {
return Err(Error::new(VersioningErr::TooManyExcludedPrefixes));
}
}
_ => return Err(Error::msg(format!("unsupported versioning status {}", self.status))),
}
Ok(())
@@ -97,7 +99,7 @@ impl Versioning {
for sprefix in self.excluded_prefixes.iter() {
let full_prefix = format!("{}*", sprefix.prefix);
if utils::wildcard::match_simple(full_prefix, prefix) {
if utils::wildcard::match_simple(&full_prefix, prefix) {
return false;
}
}
@@ -124,7 +126,7 @@ impl Versioning {
for sprefix in self.excluded_prefixes.iter() {
let full_prefix = format!("{}*", sprefix.prefix);
if utils::wildcard::match_simple(full_prefix, prefix) {
if utils::wildcard::match_simple(&full_prefix, prefix) {
return true;
}
}
+2 -1
View File
@@ -1,6 +1,7 @@
use super::get_bucket_metadata_sys;
use super::versioning::Versioning;
use crate::disk::RUSTFS_META_BUCKET;
use crate::error::Result;
use tracing::warn;
pub struct BucketVersioningSys {}
@@ -52,7 +53,7 @@ impl BucketVersioningSys {
}
let bucket_meta_sys_lock = get_bucket_metadata_sys().await;
let mut bucket_meta_sys = bucket_meta_sys_lock.write().await;
let bucket_meta_sys = bucket_meta_sys_lock.write().await;
let (cfg, _) = bucket_meta_sys.get_versioning_config(bucket).await?;
+1 -1
View File
@@ -4,4 +4,4 @@ pub mod fs;
pub mod hash;
pub mod net;
pub mod path;
mod wildcard;
pub mod wildcard;
+4 -4
View File
@@ -6,7 +6,7 @@ pub fn match_simple(pattern: &str, name: &str) -> bool {
return true;
}
// Do an extended wildcard '*' and '?' match.
deep_match_rune(name, pattern, true)
deep_match_rune(name.as_bytes(), pattern.as_bytes(), true)
}
pub fn match_pattern(pattern: &str, name: &str) -> bool {
@@ -17,11 +17,11 @@ pub fn match_pattern(pattern: &str, name: &str) -> bool {
return true;
}
// Do an extended wildcard '*' and '?' match.
deep_match_rune(name, pattern, false)
deep_match_rune(name.as_bytes(), pattern.as_bytes(), false)
}
fn deep_match_rune(str_: &str, pattern: &str, simple: bool) -> bool {
let (mut str_, mut pattern) = (str_.as_bytes(), pattern.as_bytes());
fn deep_match_rune(str_: &[u8], pattern: &[u8], simple: bool) -> bool {
let (mut str_, mut pattern) = (str_, pattern);
while !pattern.is_empty() {
match pattern[0] as char {
'*' => {