Skip to content

fix(gorilla-s3): prefix bare-basename keys from agent-produced index entries #93

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
zzylol merged 3 commits into from
May 7, 2026
Merged

fix(gorilla-s3): prefix bare-basename keys from agent-produced index entries #93

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
144a3c1
fix(gorilla-s3): align prefix-template placeholder vocabulary with agent
zzylol May 7, 2026
43e4904
Merge branch 'main' of github.com:ProjectASAP/ASAPQuery-backend into …
zzylol May 7, 2026
5374fa3
fix(gorilla-s3): prefix bare-basename keys from agent-produced index …
zzylol May 7, 2026
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: 14 additions & 1 deletion asap-query-engine/src/drivers/query/fallback/cold_store/gorilla_s3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,13 +531,26 @@ impl ColdStore for GorillaS3ColdStore {
let mut out = Vec::new();
for hour_ms in Self::hour_starts(start_ms, end_ms) {
let idx = self.fetch_index(metric, hour_ms).await?;
let bucket_prefix = self.bucket_prefix(metric, hour_ms);
for entry in idx.prune_by_time((start_ns, end_ns)) {
let (entry_start_ms, entry_end_ms) = (
(entry.time_range.0 / 1_000_000) as i64,
(entry.time_range.1 / 1_000_000) as i64,
);
// v7: agent-produced index entries carry just the
// chunk's basename (`part-NNNN-MMMM.gor`), not the
// full S3 key. Detect a bare basename (no `/`) and
// prepend the bucket prefix so the subsequent
// `read_chunk` GET hits the right object.
// Backend-produced entries carry the full key; we
// leave those unchanged.
let key = if entry.key.contains('/') {
entry.key.clone()
} else {
format!("{}{}", bucket_prefix, entry.key)
};
out.push(ChunkRef {
key: entry.key.clone(),
key,
metric: metric.to_string(),
time_range_ms: (entry_start_ms, entry_end_ms),
label_hash: entry.label_hash,
Expand Down