Skip to content

feat(storage): effective-timestamp column + windowing fallback (RFC0005.13) #179

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
jensholdgaard merged 3 commits into from
Jun 11, 2026
Merged

feat(storage): effective-timestamp column + windowing fallback (RFC0005.13) #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
167aa41
feat(storage): effective_time_unix_nano column via the shared partiti…
jensholdgaard Jun 11, 2026
d2b23ff
feat(querier): window the effective timestamp + §3.9 old-file fallbac…
jensholdgaard Jun 11, 2026
de853de
feat(bench): b1 eligibility + spans key off the effective timestamp (…
jensholdgaard Jun 11, 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
23 changes: 14 additions & 9 deletions crates/ourios-bench/benches/b1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
//! reference (`<severity_text> <body>` per record — the flat file a
//! traditional logger would have written, one zstd block per hour)
//! and picks the severity to query (`ERROR`, or the busiest
//! error-band text). The query window is the corpus's full timestamp
//! span, so the reference scans the same in-window set. **OTLP
//! error-band text). The query window is the corpus's full
//! *effective*-timestamp span (RFC 0005 §3.2 — `timeUnixNano`, else
//! `observedTimeUnixNano`), so the reference scans the same in-window
//! set and observed-only corpora are B1-eligible. **OTLP
//! corpora only**: the RFC 0006 §3.3 plain-text loader fixes every
//! line at severity `9` / `INFO`, so a severity predicate over a
//! plain-text corpus has no selectivity — such dirs are skipped with
Expand Down Expand Up @@ -272,7 +274,9 @@ fn real_corpus(c: &mut Criterion) {
}

/// The B1 query for a built real-corpus store: the chosen error-band
/// severity over the corpus's full timestamp span, half-open
/// severity over the corpus's full *effective*-timestamp span
/// (RFC 0005 §3.2 amendment 2026-06-11 — observed-only corpora are
/// B1-eligible; only genuinely timeless rows disqualify), half-open
/// (`max + 1` keeps the last record in-window; clamped like b2's
/// windowed arm so a near-2262 corpus can't push the bound past the
/// querier's i64 range). `None` (with a skip note) when the corpus
Expand All @@ -291,22 +295,23 @@ fn severity_query(built: &ourios_bench::B1Store, dir: &str) -> Option<(String, Q
eprintln!("b1/real-corpus: {dir} has no error-band severity_text rows — skipping");
return None;
};
if built.min_time_unix_nano == 0 || built.zero_ts_rows > 0 {
if built.min_effective_time_unix_nano == 0 || built.zero_effective_ts_rows > 0 {
eprintln!(
"b1/real-corpus: {dir} — no usable timestamp span ({} zero-ts rows); the B1 \
query needs a real time window — skipping",
built.zero_ts_rows,
"b1/real-corpus: {dir} — no usable effective-timestamp span ({} \
zero-effective-ts rows, i.e. neither timeUnixNano nor \
observedTimeUnixNano); the B1 query needs a real time window — skipping",
built.zero_effective_ts_rows,
);
return None;
}
#[allow(clippy::cast_sign_loss)] // i64::MAX as u64 is exact
let window_end = built
.max_time_unix_nano
.max_effective_time_unix_nano
.saturating_add(1)
.min(i64::MAX as u64);
let query = QueryRequest {
tenant: TenantId::new(built.tenant),
time_range: Some((built.min_time_unix_nano, window_end)),
time_range: Some((built.min_effective_time_unix_nano, window_end)),
template_id: None,
severity_text: Some(severity.clone()),
};
Expand Down
5 changes: 3 additions & 2 deletions crates/ourios-bench/benches/b2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,13 +272,14 @@ fn first_hour_window(
dir: &str,
baseline_row_groups: u64,
) -> Option<QueryRequest> {
if built.min_time_unix_nano == 0 || built.files < 2 {
if built.min_effective_time_unix_nano == 0 || built.files < 2 {
eprintln!(
"b2/real-corpus: {dir} — single-partition or no timestamp span; skipping windowed arm"
);
return None;
}
let hour_start = built.min_time_unix_nano - (built.min_time_unix_nano % HOUR_NS);
let hour_start =
built.min_effective_time_unix_nano - (built.min_effective_time_unix_nano % HOUR_NS);
// Clamp the window end into the querier's i64-nanosecond range, so a
// corpus near the year-2262 boundary can't push the bound past
// i64::MAX (which the querier rejects as InvalidQuery, panicking the
Expand Down
Loading
Loading