[Refactor] unified-cache: Factor match validators and match completion into helpers (#45714)

Co-authored-by: Jialin <Jialin@users.noreply.github.com>
This commit is contained in:
metamergebot
2026-10-22 18:58:15 -07:00
committed by GitHub
co-authored by Jialin
parent 92e57d5de7
commit 94e4611eac
3 changed files with 103 additions and 15 deletions
@@ -881,6 +881,14 @@ class UnifiedTreeCore(UnifiedTreeCoreInterface):
return self._match_prefix_helper(key, params)
def _create_match_validators(
self, params: MatchPrefixParams, match_device_only: bool
) -> tuple[Callable[[UnifiedTreeNode], bool], ...]:
return tuple(
comp.create_match_validator(match_device_only=match_device_only)
for comp in self.components
)
def _match_prefix_helper(
self, key: RadixKey, params: MatchPrefixParams
) -> MatchResult:
@@ -898,23 +906,17 @@ class UnifiedTreeCore(UnifiedTreeCoreInterface):
full_kv_hit_length = 0
action: Optional[CacheAction | ComponentAction] = None
separate_device_match = self.enable_hicache
if separate_device_match:
validators = tuple(
comp.create_match_validator() for comp in self.components
)
device_validators = tuple(
comp.create_match_validator(match_device_only=True)
for comp in self.components
)
else:
validators = tuple(
comp.create_match_validator(match_device_only=True)
for comp in self.components
)
device_validators = validators
validators = self._create_match_validators(
params, match_device_only=not separate_device_match
)
device_validators = (
self._create_match_validators(params, match_device_only=True)
if separate_device_match
else validators
)
def _all_valid(validators, node):
return all([v(node) for v in validators])
return all([validator(node) for validator in validators])
def _update_best_if_valid(node):
nonlocal best_match_node
@@ -621,6 +621,11 @@ class UnifiedRadixCache(BasePrefixCache):
# Apply the walk's actions (e.g. a pending write-through relocation on
# a split) before the finalizers, which can evict or raise.
self._apply_cache_actions(result.cache_actions)
return self._finalize_match_result(params, result)
def _finalize_match_result(
self, params: MatchPrefixParams, result: MatchResult
) -> MatchResult:
for component in self._components_tuple:
result = component.finalize_match_result_in_cache(params, result)
# Finalizers must not emit actions; the walk's were applied above.