Skip to content

Commit 99e61ba

Browse files
committed
Add Bytes serde feature
1 parent c98d16a commit 99e61ba

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

Cargo.lock

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ validator = { version = "0.16", features = ["derive"] }
6969
zerocopy = { version = "0.6.1", features = ["alloc", "simd"] }
7070
zune-inflate = "0.2.54"
7171
cached = { version = "0.54.0", features = ["disk_store", "async"] }
72+
bytes = { version = "1.9.0", features = ["serde"] }
7273

7374
[dev-dependencies]
7475
criterion = { version = "0.4", features = ["async_tokio", "html_reports"] }

src/app.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ use crate::validated_json::ValidatedJson;
1414

1515
use axum::middleware;
1616
use axum::{
17-
body::Bytes,
1817
extract::{Path, State},
1918
headers::authorization::{Authorization, Basic},
2019
http::header,
2120
response::{IntoResponse, Response},
2221
routing::{get, post},
2322
Router, TypedHeader,
2423
};
25-
use cached::{proc_macro::io_cached, stores::DiskCacheBuilder};
24+
use bytes::Bytes;
25+
// use cached::{proc_macro::io_cached, stores::DiskCacheBuilder};
2626

2727
use std::sync::Arc;
2828
use tokio::sync::SemaphorePermit;
@@ -172,13 +172,13 @@ async fn schema() -> &'static str {
172172
level = "DEBUG",
173173
skip(client, request_data, resource_manager, mem_permits)
174174
)]
175-
#[io_cached(
176-
map_error = r##"|e| ActiveStorageError::CacheError{ error: format!("{:?}", e) }"##,
177-
disk = true,
178-
create = r##"{ DiskCacheBuilder::new("test-cache").set_disk_directory("./").build().expect("valid disk cache builder") }"##,
179-
key = "String",
180-
convert = r##"{ format!("{:?},{:?},{:?},{:?}", client, request_data, resource_manager, mem_permits) }"##
181-
)]
175+
// #[io_cached(
176+
// map_error = r##"|e| ActiveStorageError::CacheError{ error: format!("{:?}", e) }"##,
177+
// disk = true,
178+
// create = r##"{ DiskCacheBuilder::new("test-cache").set_disk_directory("./").build().expect("valid disk cache builder") }"##,
179+
// key = "String",
180+
// convert = r##"{ format!("{:?},{:?},{:?},{:?}", client, request_data, resource_manager, mem_permits) }"##
181+
// )]
182182
async fn download_object<'a>(
183183
client: &s3_client::S3Client,
184184
request_data: &models::RequestData,

src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ impl From<ActiveStorageError> for ErrorResponse {
274274
_ => Self::internal_server_error(&error),
275275
}
276276
}
277-
ActiveStorageError::CacheError { error } => todo!(),
277+
ActiveStorageError::CacheError { error: _ } => todo!(),
278278
};
279279

280280
// Log server errors.

src/s3_client.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,7 @@ pub fn get_range(offset: Option<usize>, size: Option<usize>) -> Option<String> {
206206
#[cfg(test)]
207207
mod tests {
208208
use super::*;
209-
use cached::{
210-
proc_macro::{cached, io_cached},
211-
stores::DiskCacheBuilder,
212-
};
209+
use cached::{proc_macro::io_cached, stores::DiskCacheBuilder};
213210
use url::Url;
214211

215212
// #[cached(

0 commit comments

Comments
 (0)