Skip to content

Fix query cache hit aggregation #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 8, 2025
Merged

Fix query cache hit aggregation #252

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49db770
Deduplicate aggregated query cache hit counts
Kobzol Jul 8, 2025
1d2c017
Do not add cache hits to invocation count
Kobzol Jul 8, 2025
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
15 changes: 11 additions & 4 deletions analyzeme/src/analysis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ impl ProfilingData {
if !query_cache_hit_counts_found.contains(current_event.label.as_ref()) {
data.number_of_cache_hits += 1;
}
data.invocation_count += 1;
});
}
}
Expand Down Expand Up @@ -219,7 +218,9 @@ impl ProfilingData {
data.self_time += current_event_duration;
data.time += current_event_duration;
data.blocked_time += current_event_duration;
data.invocation_count += 1;
// We don't increment invocation_count here, because the query
// was actually a cache hit, just a blocked one.
// Rustc also records a cache hit when this happens.
});
}

Expand Down Expand Up @@ -272,8 +273,11 @@ impl ProfilingData {
// Aggregated query cache hit counts
QUERY_CACHE_HIT_COUNT_EVENT_KIND => {
record_event_data(&current_event.label, &|data| {
assert_eq!(data.number_of_cache_hits, 0);
data.number_of_cache_hits = value as usize;
// rustc produces aggregated cache hits per **query invocation**,
// so a query + specific instances of arguments.
// We need to deduplicate the aggregated counts here to sum them up
// for individual queries, according to the event label.
data.number_of_cache_hits += value as usize;
});
query_cache_hit_counts_found.insert(current_event.label.into_owned());
}
Expand Down Expand Up @@ -327,6 +331,9 @@ pub struct QueryData {
pub self_time: Duration,
pub number_of_cache_misses: usize,
pub number_of_cache_hits: usize,
/// How many times was the query/event actually executed (without a cache hit).
/// Note that for queries, this should correspond to `number_of_cache_misses`, however
/// for other types of activities we don't actually count cache misses.
pub invocation_count: usize,
pub blocked_time: Duration,
pub incremental_load_time: Duration,
Expand Down