mirror of https://github.com/astral-sh/uv
Use `BTreeMap::range` to avoid iterating over unnecessary versions (#10266)
## Summary Closes https://github.com/astral-sh/uv/issues/6174.
This commit is contained in:
parent
7bbec6b2e4
commit
ed4e4ff4b5
|
|
@ -1,6 +1,9 @@
|
||||||
use pubgrub::Range;
|
|
||||||
use std::collections::btree_map::{BTreeMap, Entry};
|
use std::collections::btree_map::{BTreeMap, Entry};
|
||||||
|
use std::collections::Bound;
|
||||||
|
use std::ops::RangeBounds;
|
||||||
use std::sync::OnceLock;
|
use std::sync::OnceLock;
|
||||||
|
|
||||||
|
use pubgrub::Ranges;
|
||||||
use tracing::instrument;
|
use tracing::instrument;
|
||||||
|
|
||||||
use uv_client::{OwnedArchive, SimpleMetadata, VersionFiles};
|
use uv_client::{OwnedArchive, SimpleMetadata, VersionFiles};
|
||||||
|
|
@ -156,8 +159,8 @@ impl VersionMap {
|
||||||
/// for each version.
|
/// for each version.
|
||||||
pub(crate) fn iter(
|
pub(crate) fn iter(
|
||||||
&self,
|
&self,
|
||||||
range: &Range<Version>,
|
range: &Ranges<Version>,
|
||||||
) -> impl DoubleEndedIterator<Item = (&Version, VersionMapDistHandle)> + ExactSizeIterator {
|
) -> impl DoubleEndedIterator<Item = (&Version, VersionMapDistHandle)> {
|
||||||
// Performance optimization: If we only have a single version, return that version directly.
|
// Performance optimization: If we only have a single version, return that version directly.
|
||||||
if let Some(version) = range.as_singleton() {
|
if let Some(version) = range.as_singleton() {
|
||||||
either::Either::Left(match self.inner {
|
either::Either::Left(match self.inner {
|
||||||
|
|
@ -185,20 +188,24 @@ impl VersionMap {
|
||||||
} else {
|
} else {
|
||||||
either::Either::Right(match self.inner {
|
either::Either::Right(match self.inner {
|
||||||
VersionMapInner::Eager(ref eager) => {
|
VersionMapInner::Eager(ref eager) => {
|
||||||
either::Either::Left(eager.map.iter().map(|(version, dist)| {
|
either::Either::Left(eager.map.range(BoundingRange::from(range)).map(
|
||||||
let version_map_dist = VersionMapDistHandle {
|
|(version, dist)| {
|
||||||
inner: VersionMapDistHandleInner::Eager(dist),
|
let version_map_dist = VersionMapDistHandle {
|
||||||
};
|
inner: VersionMapDistHandleInner::Eager(dist),
|
||||||
(version, version_map_dist)
|
};
|
||||||
}))
|
(version, version_map_dist)
|
||||||
|
},
|
||||||
|
))
|
||||||
}
|
}
|
||||||
VersionMapInner::Lazy(ref lazy) => {
|
VersionMapInner::Lazy(ref lazy) => {
|
||||||
either::Either::Right(lazy.map.iter().map(|(version, dist)| {
|
either::Either::Right(lazy.map.range(BoundingRange::from(range)).map(
|
||||||
let version_map_dist = VersionMapDistHandle {
|
|(version, dist)| {
|
||||||
inner: VersionMapDistHandleInner::Lazy { lazy, dist },
|
let version_map_dist = VersionMapDistHandle {
|
||||||
};
|
inner: VersionMapDistHandleInner::Lazy { lazy, dist },
|
||||||
(version, version_map_dist)
|
};
|
||||||
}))
|
(version, version_map_dist)
|
||||||
|
},
|
||||||
|
))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -609,3 +616,29 @@ struct SimplePrioritizedDist {
|
||||||
/// of writing, is to use `--exclude-newer 1900-01-01`.)
|
/// of writing, is to use `--exclude-newer 1900-01-01`.)
|
||||||
dist: OnceLock<Option<PrioritizedDist>>,
|
dist: OnceLock<Option<PrioritizedDist>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A range that can be used to iterate over a subset of a [`BTreeMap`].
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct BoundingRange<'a> {
|
||||||
|
min: Bound<&'a Version>,
|
||||||
|
max: Bound<&'a Version>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> From<&'a Ranges<Version>> for BoundingRange<'a> {
|
||||||
|
fn from(value: &'a Ranges<Version>) -> Self {
|
||||||
|
let (min, max) = value
|
||||||
|
.bounding_range()
|
||||||
|
.unwrap_or((Bound::Unbounded, Bound::Unbounded));
|
||||||
|
Self { min, max }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> RangeBounds<Version> for BoundingRange<'a> {
|
||||||
|
fn start_bound(&self) -> Bound<&'a Version> {
|
||||||
|
self.min
|
||||||
|
}
|
||||||
|
|
||||||
|
fn end_bound(&self) -> Bound<&'a Version> {
|
||||||
|
self.max
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue