mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 19:08:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix incorrect unknown size marker in traces (#600)

Browse source 
It said `(unknown size)` for _all_ disk-based wheels.
This commit is contained in:
Charlie Marsh 2023-12-08 23:46:01 -05:00 • committed by GitHub
parent 24d81912cf
commit 0499fe0613
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/puffin-client/src/cached_client.rs
View file

@ -220,8 +220,7 @@ impl CachedClient {
}
}
} else {
debug!("Not cached {url}");
// No reusable cache
debug!("No cache entry for: {url}");
self.fresh_request(req, converted_req).await?
};
Ok(cached_response)

25
crates/puffin-distribution/src/distribution_database.rs
View file

@ -153,21 +153,11 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
let reader = self.client.stream_external(&url).await?;
// If the file is greater than 5MB, write it to disk; otherwise, keep it in memory.
let small_size = if let Some(size) = wheel.file.size {
let byte_size = ByteSize::b(size as u64);
if byte_size < ByteSize::mb(5) {
Some(size)
} else {
None
}
} else {
None
};
let local_wheel = if let Some(small_size) = small_size {
debug!(
"Fetching in-memory wheel from registry: {dist} ({})",
ByteSize::b(small_size as u64)
);
let byte_size = wheel.file.size.map(|size| ByteSize::b(size as u64));
let local_wheel = if let Some(byte_size) =
byte_size.filter(|byte_size| *byte_size < ByteSize::mb(5))
{
debug!("Fetching in-memory wheel from registry: {dist} ({byte_size})",);
let cache_entry = self.cache.entry(
CacheBucket::Wheels,
@ -176,7 +166,7 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
);
// Read into a buffer.
let mut buffer = Vec::with_capacity(small_size);
let mut buffer = Vec::with_capacity(wheel.file.size.unwrap_or(0));
let mut reader = tokio::io::BufReader::new(reader.compat());
tokio::io::copy(&mut reader, &mut buffer).await?;
@ -188,7 +178,8 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
})
} else {
let size =
small_size.map_or("unknown size".to_string(), |size| size.to_string());
byte_size.map_or("unknown size".to_string(), |size| size.to_string());
debug!("Fetching disk-based wheel from registry: {dist} ({size})");
let cache_entry = self.cache.entry(