mirror of
https://github.com/astral-sh/uv.git
synced 2025-08-03 18:38:21 +00:00
Use BTreeMap::range
to avoid iterating over unnecessary versions (#10266)
Some checks are pending
CI / Determine changes (push) Waiting to run
CI / lint (push) Waiting to run
CI / cargo clippy | ubuntu (push) Blocked by required conditions
CI / cargo clippy | windows (push) Blocked by required conditions
CI / cargo dev generate-all (push) Blocked by required conditions
CI / cargo shear (push) Waiting to run
CI / cargo test | ubuntu (push) Blocked by required conditions
CI / cargo test | macos (push) Blocked by required conditions
CI / cargo test | windows (push) Blocked by required conditions
CI / check windows trampoline | aarch64 (push) Blocked by required conditions
CI / check windows trampoline | i686 (push) Blocked by required conditions
CI / check windows trampoline | x86_64 (push) Blocked by required conditions
CI / test windows trampoline | i686 (push) Blocked by required conditions
CI / test windows trampoline | x86_64 (push) Blocked by required conditions
CI / typos (push) Waiting to run
CI / mkdocs (push) Waiting to run
CI / build binary | linux (push) Blocked by required conditions
CI / build binary | macos aarch64 (push) Blocked by required conditions
CI / build binary | macos x86_64 (push) Blocked by required conditions
CI / build binary | windows (push) Blocked by required conditions
CI / cargo build (msrv) (push) Blocked by required conditions
CI / build binary | freebsd (push) Blocked by required conditions
CI / ecosystem test | prefecthq/prefect (push) Blocked by required conditions
CI / ecosystem test | pallets/flask (push) Blocked by required conditions
CI / integration test | conda on ubuntu (push) Blocked by required conditions
CI / integration test | free-threaded on linux (push) Blocked by required conditions
CI / integration test | free-threaded on windows (push) Blocked by required conditions
CI / integration test | pypy on ubuntu (push) Blocked by required conditions
CI / integration test | pypy on windows (push) Blocked by required conditions
CI / integration test | graalpy on ubuntu (push) Blocked by required conditions
CI / integration test | graalpy on windows (push) Blocked by required conditions
CI / integration test | github actions (push) Blocked by required conditions
CI / integration test | determine publish changes (push) Blocked by required conditions
CI / integration test | uv publish (push) Blocked by required conditions
CI / check cache | ubuntu (push) Blocked by required conditions
CI / check cache | macos aarch64 (push) Blocked by required conditions
CI / check system | python on debian (push) Blocked by required conditions
CI / check system | python on fedora (push) Blocked by required conditions
CI / check system | python on ubuntu (push) Blocked by required conditions
CI / check system | python on opensuse (push) Blocked by required conditions
CI / check system | python on rocky linux 8 (push) Blocked by required conditions
CI / check system | python on rocky linux 9 (push) Blocked by required conditions
CI / check system | pypy on ubuntu (push) Blocked by required conditions
CI / check system | pyston (push) Blocked by required conditions
CI / check system | alpine (push) Blocked by required conditions
CI / check system | python on macos aarch64 (push) Blocked by required conditions
CI / check system | homebrew python on macos aarch64 (push) Blocked by required conditions
CI / check system | python on macos x86_64 (push) Blocked by required conditions
CI / check system | python3.10 on windows (push) Blocked by required conditions
CI / check system | python3.10 on windows x86 (push) Blocked by required conditions
CI / check system | python3.13 on windows (push) Blocked by required conditions
CI / check system | python3.12 via chocolatey (push) Blocked by required conditions
CI / check system | python3.9 via pyenv (push) Blocked by required conditions
CI / check system | python3.13 (push) Blocked by required conditions
CI / check system | conda3.11 on linux (push) Blocked by required conditions
CI / check system | conda3.8 on linux (push) Blocked by required conditions
CI / check system | conda3.11 on macos (push) Blocked by required conditions
CI / check system | conda3.8 on macos (push) Blocked by required conditions
CI / check system | conda3.11 on windows (push) Blocked by required conditions
CI / check system | conda3.8 on windows (push) Blocked by required conditions
CI / check system | amazonlinux (push) Blocked by required conditions
CI / check system | embedded python3.10 on windows (push) Blocked by required conditions
CI / benchmarks (push) Blocked by required conditions
Some checks are pending
CI / Determine changes (push) Waiting to run
CI / lint (push) Waiting to run
CI / cargo clippy | ubuntu (push) Blocked by required conditions
CI / cargo clippy | windows (push) Blocked by required conditions
CI / cargo dev generate-all (push) Blocked by required conditions
CI / cargo shear (push) Waiting to run
CI / cargo test | ubuntu (push) Blocked by required conditions
CI / cargo test | macos (push) Blocked by required conditions
CI / cargo test | windows (push) Blocked by required conditions
CI / check windows trampoline | aarch64 (push) Blocked by required conditions
CI / check windows trampoline | i686 (push) Blocked by required conditions
CI / check windows trampoline | x86_64 (push) Blocked by required conditions
CI / test windows trampoline | i686 (push) Blocked by required conditions
CI / test windows trampoline | x86_64 (push) Blocked by required conditions
CI / typos (push) Waiting to run
CI / mkdocs (push) Waiting to run
CI / build binary | linux (push) Blocked by required conditions
CI / build binary | macos aarch64 (push) Blocked by required conditions
CI / build binary | macos x86_64 (push) Blocked by required conditions
CI / build binary | windows (push) Blocked by required conditions
CI / cargo build (msrv) (push) Blocked by required conditions
CI / build binary | freebsd (push) Blocked by required conditions
CI / ecosystem test | prefecthq/prefect (push) Blocked by required conditions
CI / ecosystem test | pallets/flask (push) Blocked by required conditions
CI / integration test | conda on ubuntu (push) Blocked by required conditions
CI / integration test | free-threaded on linux (push) Blocked by required conditions
CI / integration test | free-threaded on windows (push) Blocked by required conditions
CI / integration test | pypy on ubuntu (push) Blocked by required conditions
CI / integration test | pypy on windows (push) Blocked by required conditions
CI / integration test | graalpy on ubuntu (push) Blocked by required conditions
CI / integration test | graalpy on windows (push) Blocked by required conditions
CI / integration test | github actions (push) Blocked by required conditions
CI / integration test | determine publish changes (push) Blocked by required conditions
CI / integration test | uv publish (push) Blocked by required conditions
CI / check cache | ubuntu (push) Blocked by required conditions
CI / check cache | macos aarch64 (push) Blocked by required conditions
CI / check system | python on debian (push) Blocked by required conditions
CI / check system | python on fedora (push) Blocked by required conditions
CI / check system | python on ubuntu (push) Blocked by required conditions
CI / check system | python on opensuse (push) Blocked by required conditions
CI / check system | python on rocky linux 8 (push) Blocked by required conditions
CI / check system | python on rocky linux 9 (push) Blocked by required conditions
CI / check system | pypy on ubuntu (push) Blocked by required conditions
CI / check system | pyston (push) Blocked by required conditions
CI / check system | alpine (push) Blocked by required conditions
CI / check system | python on macos aarch64 (push) Blocked by required conditions
CI / check system | homebrew python on macos aarch64 (push) Blocked by required conditions
CI / check system | python on macos x86_64 (push) Blocked by required conditions
CI / check system | python3.10 on windows (push) Blocked by required conditions
CI / check system | python3.10 on windows x86 (push) Blocked by required conditions
CI / check system | python3.13 on windows (push) Blocked by required conditions
CI / check system | python3.12 via chocolatey (push) Blocked by required conditions
CI / check system | python3.9 via pyenv (push) Blocked by required conditions
CI / check system | python3.13 (push) Blocked by required conditions
CI / check system | conda3.11 on linux (push) Blocked by required conditions
CI / check system | conda3.8 on linux (push) Blocked by required conditions
CI / check system | conda3.11 on macos (push) Blocked by required conditions
CI / check system | conda3.8 on macos (push) Blocked by required conditions
CI / check system | conda3.11 on windows (push) Blocked by required conditions
CI / check system | conda3.8 on windows (push) Blocked by required conditions
CI / check system | amazonlinux (push) Blocked by required conditions
CI / check system | embedded python3.10 on windows (push) Blocked by required conditions
CI / benchmarks (push) Blocked by required conditions
## Summary Closes https://github.com/astral-sh/uv/issues/6174.
This commit is contained in:
parent
7bbec6b2e4
commit
ed4e4ff4b5
1 changed files with 48 additions and 15 deletions
|
@ -1,6 +1,9 @@
|
|||
use pubgrub::Range;
|
||||
use std::collections::btree_map::{BTreeMap, Entry};
|
||||
use std::collections::Bound;
|
||||
use std::ops::RangeBounds;
|
||||
use std::sync::OnceLock;
|
||||
|
||||
use pubgrub::Ranges;
|
||||
use tracing::instrument;
|
||||
|
||||
use uv_client::{OwnedArchive, SimpleMetadata, VersionFiles};
|
||||
|
@ -156,8 +159,8 @@ impl VersionMap {
|
|||
/// for each version.
|
||||
pub(crate) fn iter(
|
||||
&self,
|
||||
range: &Range<Version>,
|
||||
) -> impl DoubleEndedIterator<Item = (&Version, VersionMapDistHandle)> + ExactSizeIterator {
|
||||
range: &Ranges<Version>,
|
||||
) -> impl DoubleEndedIterator<Item = (&Version, VersionMapDistHandle)> {
|
||||
// Performance optimization: If we only have a single version, return that version directly.
|
||||
if let Some(version) = range.as_singleton() {
|
||||
either::Either::Left(match self.inner {
|
||||
|
@ -185,20 +188,24 @@ impl VersionMap {
|
|||
} else {
|
||||
either::Either::Right(match self.inner {
|
||||
VersionMapInner::Eager(ref eager) => {
|
||||
either::Either::Left(eager.map.iter().map(|(version, dist)| {
|
||||
let version_map_dist = VersionMapDistHandle {
|
||||
inner: VersionMapDistHandleInner::Eager(dist),
|
||||
};
|
||||
(version, version_map_dist)
|
||||
}))
|
||||
either::Either::Left(eager.map.range(BoundingRange::from(range)).map(
|
||||
|(version, dist)| {
|
||||
let version_map_dist = VersionMapDistHandle {
|
||||
inner: VersionMapDistHandleInner::Eager(dist),
|
||||
};
|
||||
(version, version_map_dist)
|
||||
},
|
||||
))
|
||||
}
|
||||
VersionMapInner::Lazy(ref lazy) => {
|
||||
either::Either::Right(lazy.map.iter().map(|(version, dist)| {
|
||||
let version_map_dist = VersionMapDistHandle {
|
||||
inner: VersionMapDistHandleInner::Lazy { lazy, dist },
|
||||
};
|
||||
(version, version_map_dist)
|
||||
}))
|
||||
either::Either::Right(lazy.map.range(BoundingRange::from(range)).map(
|
||||
|(version, dist)| {
|
||||
let version_map_dist = VersionMapDistHandle {
|
||||
inner: VersionMapDistHandleInner::Lazy { lazy, dist },
|
||||
};
|
||||
(version, version_map_dist)
|
||||
},
|
||||
))
|
||||
}
|
||||
})
|
||||
}
|
||||
|
@ -609,3 +616,29 @@ struct SimplePrioritizedDist {
|
|||
/// of writing, is to use `--exclude-newer 1900-01-01`.)
|
||||
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…
Add table
Add a link
Reference in a new issue