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

TryInto cover

Browse Source
This commit is contained in:
houseme
2025-03-31 18:32:22 +08:00
parent 96cc708b5b
commit f2692b78dd
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+1 -1
View File
@@ -100,7 +100,7 @@ serde_json = "1.0.138"
sha2 = "0.10.8" sha2 = "0.10.8"
tempfile = "3.16.0" tempfile = "3.16.0"
thiserror = "2.0.12" thiserror = "2.0.12"
time = { version = "0.3.37", features = [ time = { version = "0.3.41", features = [
"std", "std",
"parsing", "parsing",
"formatting", "formatting",
ecstore/src/heal/data_scanner.rs
+9 -15
View File
@@ -352,7 +352,7 @@ impl CurrentScannerCycle {
let str_len = rmp::decode::read_str_len(&mut cur)?; let str_len = rmp::decode::read_str_len(&mut cur)?;
// ！！！ Vec::with_capacity(str_len) 失败，vec!正常 // ！！！Vec::with_capacity(str_len) 失败，vec! 正常
let mut field_buff = vec![0u8; str_len as usize]; let mut field_buff = vec![0u8; str_len as usize];
cur.read_exact(&mut field_buff)?; cur.read_exact(&mut field_buff)?;
@@ -435,7 +435,7 @@ impl ScannerItem {
pub async fn apply_versions_actions(&self, fivs: &[FileInfo]) -> Result<Vec<ObjectInfo>> { pub async fn apply_versions_actions(&self, fivs: &[FileInfo]) -> Result<Vec<ObjectInfo>> {
let obj_infos = self.apply_newer_noncurrent_version_limit(fivs).await?; let obj_infos = self.apply_newer_noncurrent_version_limit(fivs).await?;
if obj_infos.len() >= SCANNER_EXCESS_OBJECT_VERSIONS.load(Ordering::SeqCst).try_into().unwrap() { if obj_infos.len() >= <u64 as TryInto<usize>>::try_into(SCANNER_EXCESS_OBJECT_VERSIONS.load(Ordering::SeqCst)).unwrap() {
// todo // todo
} }
@@ -445,10 +445,7 @@ impl ScannerItem {
} }
if cumulative_size if cumulative_size
>= SCANNER_EXCESS_OBJECT_VERSIONS_TOTAL_SIZE >= <u64 as TryInto<usize>>::try_into(SCANNER_EXCESS_OBJECT_VERSIONS_TOTAL_SIZE.load(Ordering::SeqCst)).unwrap()
.load(Ordering::SeqCst)
.try_into()
.unwrap()
{ {
//todo //todo
} }
@@ -684,16 +681,13 @@ impl FolderScanner {
} }
let should_compact = self.new_cache.info.name != folder.name let should_compact = self.new_cache.info.name != folder.name
&& existing_folders.len() + new_folders.len() >= DATA_SCANNER_COMPACT_AT_FOLDERS.try_into().unwrap() && existing_folders.len() + new_folders.len()
|| existing_folders.len() + new_folders.len() >= DATA_SCANNER_FORCE_COMPACT_AT_FOLDERS.try_into().unwrap(); >= <u64 as TryInto<usize>>::try_into(DATA_SCANNER_COMPACT_AT_FOLDERS).unwrap()
|| existing_folders.len() + new_folders.len()
>= <u64 as TryInto<usize>>::try_into(DATA_SCANNER_FORCE_COMPACT_AT_FOLDERS).unwrap();
let total_folders = existing_folders.len() + new_folders.len(); let total_folders = existing_folders.len() + new_folders.len();
if total_folders if total_folders > <u64 as TryInto<usize>>::try_into(SCANNER_EXCESS_FOLDERS.load(Ordering::SeqCst)).unwrap() {
> SCANNER_EXCESS_FOLDERS
.load(std::sync::atomic::Ordering::SeqCst)
.try_into()
.unwrap()
{
let _prefix_name = format!("{}/", folder.name.trim_end_matches('/')); let _prefix_name = format!("{}/", folder.name.trim_end_matches('/'));
// todo: notification // todo: notification
} }
@@ -957,7 +951,7 @@ impl FolderScanner {
if !into.compacted && self.new_cache.info.name != folder.name { if !into.compacted && self.new_cache.info.name != folder.name {
let mut flat = self.new_cache.size_recursive(&this_hash.key()).unwrap_or_default(); let mut flat = self.new_cache.size_recursive(&this_hash.key()).unwrap_or_default();
flat.compacted = true; flat.compacted = true;
let compact = if flat.objects < DATA_SCANNER_COMPACT_LEAST_OBJECT.try_into().unwrap() { let compact = if flat.objects < <u64 as TryInto<usize>>::try_into(DATA_SCANNER_COMPACT_LEAST_OBJECT).unwrap() {
true true
} else { } else {
// Compact if we only have objects as children... // Compact if we only have objects as children...
ecstore/src/heal/data_usage_cache.rs
+1 -1
View File
@@ -588,7 +588,7 @@ impl DataUsageCache {
Some(e) => e, Some(e) => e,
None => return, None => return,
}; };
if top_e.children.len() > DATA_SCANNER_FORCE_COMPACT_AT_FOLDERS.try_into().unwrap() { if top_e.children.len() > <u64 as TryInto<usize>>::try_into(DATA_SCANNER_FORCE_COMPACT_AT_FOLDERS).unwrap() {
self.reduce_children_of(&hash_path(&self.info.name), limit, true); self.reduce_children_of(&hash_path(&self.info.name), limit, true);
} }
if self.cache.len() <= limit { if self.cache.len() <= limit {