Update pearl to v0.9.6

CHANGELOG.md

@@ -13,7 +13,7 @@ Bob versions changelog
 
 
 #### Updated
-
+- Pearl updated to v0.9.6 (#859)
 
 
 ## [v2.0.14-alpha.9] - 2023-10-19

bob-backend/Cargo.toml

@@ -35,7 +35,7 @@ tower = "0.4"
 tower-service = "0.3"
 
 [dependencies.pearl]
-version = "=0.9.5"
+version = "=0.9.6"
 
 [dependencies.tokio]
 version = "1.14"

bob-backend/src/lib.rs

@@ -20,7 +20,6 @@ pub(crate) mod prelude {
     pub use anyhow::{Context, Result as AnyResult};
     pub use bob_common::{
         configs::{
-            cluster::Cluster as ClusterConfig,
             node::{BackendType, Node as NodeConfig, Pearl as PearlConfig},
         },
         data::{BobData, BobKey, BobMeta, BobOptions, DiskPath, VDiskId},
@@ -36,7 +35,7 @@ pub(crate) mod prelude {
         Error as PearlError, ErrorKind as PearlErrorKind, Key as KeyTrait, Storage,
     };
     pub use std::{
-        collections::{hash_map::Entry, HashMap},
+        collections::HashMap,
         convert::TryInto,
         fmt::{Debug, Display, Formatter, Result as FmtResult},
         fs::Metadata,

bob-backend/src/pearl/tests.rs

@@ -2,6 +2,7 @@ use crate::prelude::*;
 
 use super::{core::BackendResult, Pearl as PearlBackend};
 use crate::core::{BackendStorage, Operation};
+use bob_common::configs::cluster::Cluster as ClusterConfig;
 
 static DISK_NAME: &str = "disk1";
 static PEARL_PATH: &str = "/tmp/d1/";

bob/Cargo.toml

@@ -28,7 +28,7 @@ metrics = { version = "0.17", features = ["std"] }
 mockall = "0.10.2"
 prost = "0.9"
 ring = "0.16"
-rocket = { version = "0.5.0-rc.2", features = ["json", "uuid"] }
+rocket = { version = "0.5.0", features = ["json", "uuid"] }
 serde = "1.0"
 serde_derive = "1.0"
 serde_yaml = "0.8"
@@ -40,7 +40,7 @@ tower = "0.4"
 tower-service = "0.3"
 
 [dependencies.pearl]
-version = "=0.9.5"
+version = "=0.9.6"
 
 [dependencies.tokio]
 version = "1.14"

bob/src/api/http/s3.rs

@@ -164,7 +164,7 @@ impl<'r> FromRequest<'r> for CopyObjectHeaders {
             .and_then(|x| x.parse().ok())
         {
             Some(key) => key,
-            None => return Outcome::Forward(()),
+            None => return Outcome::Forward(Status::BadRequest),
         };
         Outcome::Success(CopyObjectHeaders {
             if_modified_since: headers

bob/src/lib.rs

@@ -70,7 +70,6 @@ mod prelude {
     pub use std::{
         collections::HashMap,
         fmt::{Debug, Formatter, Result as FmtResult},
-        io::Write,
         pin::Pin,
         sync::Arc,
         time::{Duration, Instant},
@@ -92,6 +91,7 @@ pub(crate) mod test_utils {
     use chrono::Local;
     use env_logger::fmt::{Color, Formatter as EnvFormatter};
     use log::{Level, Record};
+    use std::io::Write;
     use std::io::Result as IOResult;
 
     use crate::prelude::*;