Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions hamilton/plugins/h_diskcache.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,17 @@ def evict_all_except(nodes_to_keep: dict[str, node.Node], cache: diskcache.Cache
if len(history) < 1:
continue

# a hash appears once per cache miss, so a node run with several inputs repeats it
hashes_to_evict = list(dict.fromkeys(history))
if node_name in nodes_to_keep.keys():
node_to_keep = nodes_to_keep[node_name]
hash_to_keep = graph_types.hash_source_code(node_to_keep.callable, strip=True)
history.remove(hash_to_keep)
new_nodes_history[node_name] = [hash_to_keep]
# the current version may have no cached results yet, e.g. right after an edit
if hash_to_keep in hashes_to_evict:
hashes_to_evict.remove(hash_to_keep)
new_nodes_history[node_name] = [hash_to_keep]

for hash_to_evict in history:
for hash_to_evict in hashes_to_evict:
cache.evict(tag=f"{node_name}.{hash_to_evict}")
eviction_counter += 1

Expand Down
39 changes: 39 additions & 0 deletions tests/plugins/test_h_diskcache.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,42 @@ def test_evict_from_driver(

assert output["eviction_counter"] == 1
assert hook.cache[h_diskcache.DiskCacheAdapter.nodes_history_key] == dict(A=[node_a_hash])


def test_evict_all_except_keeps_results_of_node_run_with_several_inputs(
hook: h_diskcache.DiskCacheAdapter,
node_a: node.Node,
node_a_body: node.Node,
):
"""A node run with two different inputs appears twice in its history; its results must stay"""
node_a_hash = graph_types.hash_source_code(node_a.callable, strip=True)
node_a_body_hash = graph_types.hash_source_code(node_a_body.callable, strip=True)
hook.cache[h_diskcache.DiskCacheAdapter.nodes_history_key] = dict(
A=[node_a_hash, node_a_hash, node_a_body_hash]
)
hook.cache.set(key=(node_a_hash, 1), value=1, tag=f"A.{node_a_hash}")
hook.cache.set(key=(node_a_hash, 2), value=2, tag=f"A.{node_a_hash}")
hook.cache.set(key=(node_a_body_hash, 1), value=1, tag=f"A.{node_a_body_hash}")

eviction_counter = h_diskcache.evict_all_except(nodes_to_keep=dict(A=node_a), cache=hook.cache)

assert eviction_counter == 1
assert hook.cache.get((node_a_hash, 1)) == 1
assert hook.cache.get((node_a_hash, 2)) == 2
assert hook.cache.get((node_a_body_hash, 1)) is None
assert hook.cache[h_diskcache.DiskCacheAdapter.nodes_history_key] == dict(A=[node_a_hash])


def test_evict_all_except_when_current_version_was_never_run(
hook: h_diskcache.DiskCacheAdapter,
node_a: node.Node,
node_a_body: node.Node,
):
"""Only an older version of the node is in the cache, e.g. right after editing it"""
node_a_body_hash = graph_types.hash_source_code(node_a_body.callable, strip=True)
hook.cache[h_diskcache.DiskCacheAdapter.nodes_history_key] = dict(A=[node_a_body_hash])

eviction_counter = h_diskcache.evict_all_except(nodes_to_keep=dict(A=node_a), cache=hook.cache)

assert eviction_counter == 1
assert hook.cache[h_diskcache.DiskCacheAdapter.nodes_history_key] == dict()