diff options
Diffstat (limited to 'src/model/helper')
| -rw-r--r-- | src/model/helper/bucket.rs | 73 | ||||
| -rw-r--r-- | src/model/helper/locked.rs | 5 |
2 files changed, 43 insertions, 35 deletions
diff --git a/src/model/helper/bucket.rs b/src/model/helper/bucket.rs index e5506d7e..fe86c9d9 100644 --- a/src/model/helper/bucket.rs +++ b/src/model/helper/bucket.rs @@ -73,41 +73,48 @@ impl<'a> BucketHelper<'a> { pattern: &String, ) -> Result<Uuid, Error> { if let Some(uuid) = self.resolve_global_bucket_name(pattern).await? { - return Ok(uuid); - } else if pattern.len() >= 2 { - let hexdec = pattern - .get(..pattern.len() & !1) - .and_then(|x| hex::decode(x).ok()); - if let Some(hex) = hexdec { - let mut start = [0u8; 32]; - start - .as_mut_slice() - .get_mut(..hex.len()) - .ok_or_bad_request("invalid length")? - .copy_from_slice(&hex); - let mut candidates = self - .0 - .bucket_table - .get_range( - &EmptyKey, - Some(start.into()), - Some(DeletedFilter::NotDeleted), - 10, - EnumerationOrder::Forward, - ) - .await? - .into_iter() - .collect::<Vec<_>>(); - candidates.retain(|x| hex::encode(x.id).starts_with(pattern)); - if candidates.len() == 1 { - return Ok(candidates.into_iter().next().unwrap().id); - } + Ok(uuid) + } else { + let hexdec = if pattern.len() >= 2 { + pattern + .get(..pattern.len() & !1) + .and_then(|x| hex::decode(x).ok()) + } else { + None + }; + let hex = hexdec.ok_or_else(|| Error::NoSuchBucket(pattern.clone()))?; + + let mut start = [0u8; 32]; + start + .as_mut_slice() + .get_mut(..hex.len()) + .ok_or_bad_request("invalid length")? + .copy_from_slice(&hex); + let mut candidates = self + .0 + .bucket_table + .get_range( + &EmptyKey, + Some(start.into()), + Some(DeletedFilter::NotDeleted), + 10, + EnumerationOrder::Forward, + ) + .await? + .into_iter() + .collect::<Vec<_>>(); + candidates.retain(|x| hex::encode(x.id).starts_with(pattern)); + if candidates.is_empty() { + Err(Error::NoSuchBucket(pattern.clone())) + } else if candidates.len() == 1 { + Ok(candidates.into_iter().next().unwrap().id) + } else { + Err(Error::BadRequest(format!( + "Several matching buckets: {}", + pattern + ))) } } - Err(Error::BadRequest(format!( - "Bucket not found / several matching buckets: {}", - pattern - ))) } /// Returns a Bucket if it is present in bucket table, diff --git a/src/model/helper/locked.rs b/src/model/helper/locked.rs index f8e06add..43f4f363 100644 --- a/src/model/helper/locked.rs +++ b/src/model/helper/locked.rs @@ -231,7 +231,7 @@ impl<'a> LockedHelper<'a> { let bucket_p_local_alias_key = (key.key_id.clone(), alias_name.clone()); // Calculate the timestamp to assign to this aliasing in the two local_aliases maps - // (the one from key to bucket, and the reverse one stored in the bucket iself) + // (the one from key to bucket, and the reverse one stored in the bucket itself) // so that merges on both maps in case of a concurrent operation resolve // to the same alias being set let alias_ts = increment_logical_clock_2( @@ -279,7 +279,8 @@ impl<'a> LockedHelper<'a> { .local_aliases .get(alias_name) .cloned() - .flatten() != Some(bucket_id) + .flatten() + != Some(bucket_id) { return Err(GarageError::Message(format!( "Bucket {:?} does not have alias {} in namespace of key {}", |