Commit 0adc1c58 by Chris Kuehl Committed by Randy Döring

perf: avoid iterating through multiple caches for contradicted_incompatibilities (#7950)

parent f54864e4
...@@ -105,9 +105,10 @@ class VersionSolver: ...@@ -105,9 +105,10 @@ class VersionSolver:
self._provider = provider self._provider = provider
self._dependency_cache = DependencyCache(provider) self._dependency_cache = DependencyCache(provider)
self._incompatibilities: dict[str, list[Incompatibility]] = {} self._incompatibilities: dict[str, list[Incompatibility]] = {}
self._contradicted_incompatibilities: dict[int, set[Incompatibility]] = ( self._contradicted_incompatibilities: set[Incompatibility] = set()
collections.defaultdict(set) self._contradicted_incompatibilities_by_level: dict[
) int, set[Incompatibility]
] = collections.defaultdict(set)
self._solution = PartialSolution() self._solution = PartialSolution()
@property @property
...@@ -156,10 +157,7 @@ class VersionSolver: ...@@ -156,10 +157,7 @@ class VersionSolver:
# we can derive stronger assignments sooner and more eagerly find # we can derive stronger assignments sooner and more eagerly find
# conflicts. # conflicts.
for incompatibility in reversed(self._incompatibilities[package]): for incompatibility in reversed(self._incompatibilities[package]):
if any( if incompatibility in self._contradicted_incompatibilities:
incompatibility in c
for c in self._contradicted_incompatibilities.values()
):
continue continue
result = self._propagate_incompatibility(incompatibility) result = self._propagate_incompatibility(incompatibility)
...@@ -208,9 +206,10 @@ class VersionSolver: ...@@ -208,9 +206,10 @@ class VersionSolver:
# If term is already contradicted by _solution, then # If term is already contradicted by _solution, then
# incompatibility is contradicted as well and there's nothing new we # incompatibility is contradicted as well and there's nothing new we
# can deduce from it. # can deduce from it.
self._contradicted_incompatibilities[self._solution.decision_level].add( self._contradicted_incompatibilities.add(incompatibility)
incompatibility self._contradicted_incompatibilities_by_level[
) self._solution.decision_level
].add(incompatibility)
return None return None
elif relation == SetRelation.OVERLAPPING: elif relation == SetRelation.OVERLAPPING:
# If more than one term is inconclusive, we can't deduce anything about # If more than one term is inconclusive, we can't deduce anything about
...@@ -228,9 +227,10 @@ class VersionSolver: ...@@ -228,9 +227,10 @@ class VersionSolver:
if unsatisfied is None: if unsatisfied is None:
return _conflict return _conflict
self._contradicted_incompatibilities[self._solution.decision_level].add( self._contradicted_incompatibilities.add(incompatibility)
incompatibility self._contradicted_incompatibilities_by_level[
) self._solution.decision_level
].add(incompatibility)
adverb = "not " if unsatisfied.is_positive() else "" adverb = "not " if unsatisfied.is_positive() else ""
self._log(f"derived: {adverb}{unsatisfied.dependency}") self._log(f"derived: {adverb}{unsatisfied.dependency}")
...@@ -327,7 +327,9 @@ class VersionSolver: ...@@ -327,7 +327,9 @@ class VersionSolver:
for level in range( for level in range(
self._solution.decision_level, previous_satisfier_level, -1 self._solution.decision_level, previous_satisfier_level, -1
): ):
self._contradicted_incompatibilities.pop(level, None) self._contradicted_incompatibilities.difference_update(
self._contradicted_incompatibilities_by_level.pop(level, set()),
)
self._dependency_cache.clear_level(level) self._dependency_cache.clear_level(level)
self._solution.backtrack(previous_satisfier_level) self._solution.backtrack(previous_satisfier_level)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment