Skip to content

fix(rollup): preserve provider through the rollup index #4

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
bravo1goingdark merged 1 commit into from
May 5, 2026
Merged

fix(rollup): preserve provider through the rollup index #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions crates/keplor-store/src/kdb_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,16 @@ impl KdbStore {
wal_sync_bytes: config.wal_sync_bytes,
schema_id: SCHEMA_ID,
bloom_dim: DIM_USER_ID,
rollup_dims: vec![mapping::DIM_USER_ID, mapping::DIM_API_KEY_ID, mapping::DIM_MODEL],
// Order matters — query_rollups reads dim[0..4] in this
// exact order to rebuild RollupKey. Adding provider as a
// grouping dim so /v1/rollups can return per-provider rows
// instead of collapsing onto provider="".
rollup_dims: vec![
mapping::DIM_USER_ID,
mapping::DIM_API_KEY_ID,
mapping::DIM_MODEL,
mapping::DIM_PROVIDER,
],
mmap_cache_capacity: config.mmap_cache_capacity,
wal_shard_count: config.wal_shard_count,
rollup_replay_days: config.rollup_replay_days,
Expand Down Expand Up @@ -392,7 +401,11 @@ impl KdbStore {
limit: u32,
offset: u32,
) -> Result<Vec<RollupRow>, StoreError> {
let dim_filters: [Option<&str>; 3] = [user_id, api_key_id, None];
// 4-slot filter aligns with the 4-dim rollup index
// (user, api_key, model, provider). Caller-side filtering is
// only available for user/api_key today; model + provider slots
// are unfiltered here and handled by the cross-engine merge.
let dim_filters: [Option<&str>; 4] = [user_id, api_key_id, None, None];
let mut merged: HashMap<RollupKey, RollupAcc> = HashMap::new();
for eng in self.all_engines() {
let rows = eng.query_rollups(from_day, to_day, &dim_filters).map_err(kdb_err)?;
Expand All @@ -402,6 +415,7 @@ impl KdbStore {
user: key.dims.first().cloned().unwrap_or_default(),
api_key: key.dims.get(1).cloned().unwrap_or_default(),
model: key.dims.get(2).cloned().unwrap_or_default(),
provider: key.dims.get(3).cloned().unwrap_or_default(),
};
let acc = merged.entry(k).or_default();
acc.event_count += val.event_count as i64;
Expand All @@ -423,7 +437,7 @@ impl KdbStore {
day: k.day,
user_id: k.user,
api_key_id: k.api_key,
provider: String::new(),
provider: k.provider,
model: k.model,
event_count: a.event_count,
error_count: a.error_count,
Expand Down Expand Up @@ -841,6 +855,7 @@ struct RollupKey {
user: String,
api_key: String,
model: String,
provider: String,
}

#[derive(Default)]
Expand Down
Loading