Skip to content

storage: use Bytes instead of Vec<u8> to prevent some cloning #3338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GuillaumeGomez merged 1 commit into from
May 17, 2026
Merged

storage: use Bytes instead of Vec<u8> to prevent some cloning #3338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/bin/docs_rs_web/src/handlers/rustdoc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3254,7 +3254,7 @@ mod test {
storage
.store_one(
format!("{RUSTDOC_STATIC_STORAGE_PREFIX}{path}"),
b"static content",
"static content",
)
.await?;

Expand Down Expand Up @@ -3298,8 +3298,8 @@ mod test {
const ROOT_ASSET: &str = "normalize-20200403-1.44.0-nightly-74bd074ee.css";

let storage = env.storage()?;
storage.store_one(ROOT_ASSET, *b"content").await?;
storage.store_one(path, *b"more_content").await?;
storage.store_one(ROOT_ASSET, "content").await?;
storage.store_one(path, "more_content").await?;

let web = env.web_app().await;

Expand Down
8 changes: 4 additions & 4 deletions crates/lib/docs_rs_storage/src/blob.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ impl From<BlobUpload> for StreamUpload {
Self {
path: value.path,
mime: value.mime,
source: StreamUploadSource::Bytes(value.content.into()),
source: StreamUploadSource::Bytes(value.content),
compression: value.compression,
}
}
Expand All @@ -44,7 +44,7 @@ impl From<BlobUpload> for StreamUpload {
pub struct BlobUpload {
pub path: String,
pub mime: Mime,
pub content: Vec<u8>,
pub content: Bytes,
pub compression: Option<CompressionAlgorithm>,
}

Expand All @@ -53,7 +53,7 @@ impl From<Blob> for BlobUpload {
Self {
path: value.path,
mime: value.mime,
content: value.content,
content: value.content.into(),
compression: value.compression,
}
}
Expand All @@ -76,7 +76,7 @@ impl From<BlobUpload> for Blob {
mime: value.mime,
date_updated: Utc::now(),
etag: compute_etag(&value.content).into(),
content: value.content,
content: value.content.into(),
compression: value.compression,
}
}
Expand Down
5 changes: 3 additions & 2 deletions crates/lib/docs_rs_storage/src/storage/blocking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use anyhow::Result;
use docs_rs_types::{BuildId, CompressionAlgorithm, KrateName, Version};
use std::{fmt, path::Path, sync::Arc};
use tokio::runtime;
use tokio_util::bytes::Bytes;

/// Sync wrapper around `AsyncStorage` for parts of the codebase that are not async.
pub struct Storage {
Expand Down Expand Up @@ -112,7 +113,7 @@ impl Storage {
pub fn store_one_uncompressed(
&self,
path: impl Into<String> + std::fmt::Debug,
content: impl Into<Vec<u8>>,
content: impl Into<Bytes>,
) -> Result<()> {
self.runtime
.block_on(self.inner.store_one_uncompressed(path, content))
Expand All @@ -123,7 +124,7 @@ impl Storage {
pub fn store_one(
&self,
path: impl Into<String> + std::fmt::Debug,
content: impl Into<Vec<u8>>,
content: impl Into<Bytes>,
) -> Result<CompressionAlgorithm> {
self.runtime.block_on(self.inner.store_one(path, content))
}
Expand Down
36 changes: 17 additions & 19 deletions crates/lib/docs_rs_storage/src/storage/non_blocking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ use std::{
sync::Arc,
};
use tokio::{fs, io, io::AsyncWriteExt as _};
use tokio_util::bytes::Bytes;
use tracing::{info_span, instrument, trace, warn};

/// buffer size when writing zip files.
Expand Down Expand Up @@ -491,7 +492,7 @@ impl AsyncStorage {
pub async fn store_one_uncompressed(
&self,
path: impl Into<String> + fmt::Debug,
content: impl Into<Vec<u8>>,
content: impl Into<Bytes>,
) -> Result<()> {
let path = path.into();
let content = content.into();
Expand All @@ -501,7 +502,7 @@ impl AsyncStorage {
.upload_stream(StreamUpload {
path,
mime,
source: StreamUploadSource::Bytes(content.into()),
source: StreamUploadSource::Bytes(content),
compression: None,
})
.await?;
Expand All @@ -515,11 +516,11 @@ impl AsyncStorage {
pub async fn store_one(
&self,
path: impl Into<String> + fmt::Debug,
content: impl Into<Vec<u8>>,
content: impl Into<Bytes>,
) -> Result<CompressionAlgorithm> {
let path = path.into();
let alg = CompressionAlgorithm::default();
let content = compress(Cursor::new(content.into()), alg)?;
let content = compress(Cursor::new(content.into().as_ref()), alg)?;
let mime = detect_mime(&path).to_owned();

self.backend
Expand Down Expand Up @@ -615,7 +616,7 @@ mod backend_tests {
path: path.into(),
mime: mime::TEXT_PLAIN,
compression: None,
content: b"test content\n".to_vec(),
content: "test content\n".into(),
};

storage.store_blobs(vec![blob.clone()]).await?;
Expand Down Expand Up @@ -646,7 +647,7 @@ mod backend_tests {
path: "foo/bar.txt".into(),
mime: mime::TEXT_PLAIN,
compression: None,
content: b"test content\n".to_vec(),
content: "test content\n".into(),
};

let full_etag = compute_etag(&blob.content);
Expand Down Expand Up @@ -697,7 +698,7 @@ mod backend_tests {
path: filename.into(),
mime: mime::TEXT_PLAIN,
compression: None,
content: b"test content\n".to_vec(),
content: "test content\n".into(),
})
.collect(),
)
Expand Down Expand Up @@ -746,13 +747,13 @@ mod backend_tests {
let small_blob = BlobUpload {
path: "small-blob.bin".into(),
mime: mime::TEXT_PLAIN,
content: vec![0; MAX_SIZE],
content: [0; MAX_SIZE].as_ref().into(),
compression: None,
};
let big_blob = BlobUpload {
path: "big-blob.bin".into(),
mime: mime::TEXT_PLAIN,
content: vec![0; MAX_SIZE * 2],
content: [0; MAX_SIZE * 2].as_ref().into(),
compression: None,
};

Expand Down Expand Up @@ -792,7 +793,7 @@ mod backend_tests {
path: path.into(),
mime: mime::TEXT_PLAIN,
compression: None,
content: b"Hello world!\n".to_vec(),
content: "Hello world!\n".into(),
})
.collect::<Vec<_>>();

Expand Down Expand Up @@ -975,14 +976,11 @@ mod backend_tests {

async fn test_batched_uploads(storage: &AsyncStorage) -> Result<()> {
let uploads: Vec<_> = (0..=100)
.map(|i| {
let content = format!("const IDX: usize = {i};").as_bytes().to_vec();
BlobUpload {
mime: mimes::TEXT_RUST.clone(),
content,
path: format!("{i}.rs"),
compression: None,
}
.map(|i| BlobUpload {
mime: mimes::TEXT_RUST.clone(),
content: format!("const IDX: usize = {i};").into(),
path: format!("{i}.rs"),
compression: None,
})
.collect();

Expand Down Expand Up @@ -1043,7 +1041,7 @@ mod backend_tests {
.iter()
.map(|path| BlobUpload {
path: (*path).to_string(),
content: b"foo\n".to_vec(),
content: "foo\n".into(),
compression: None,
mime: mime::TEXT_PLAIN,
})
Expand Down
4 changes: 2 additions & 2 deletions crates/lib/docs_rs_test_fakes/src/legacy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ impl FakeBuild {

let prefix = format!("build-logs/{build_id}/");

if let Some(s3_build_log) = self.s3_build_log.as_deref() {
if let Some(s3_build_log) = self.s3_build_log.clone() {
let path = format!("{prefix}{default_target}.txt");
storage.store_one(path, s3_build_log).await?;
}
Expand All @@ -743,7 +743,7 @@ impl FakeBuild {
bail!("build log for default target has to be set via `s3_build_log`");
}
let path = format!("{prefix}{target}.txt");
storage.store_one(path, log.as_str()).await?;
storage.store_one(path, log.clone()).await?;
}

Ok(())
Expand Down
Loading