Reconciles two independently-developed lines from base 006d3d0:
ours — M9/M10 community layers, retroactive purge + re-materialization,
signal revocation, agent capability boundaries, P1 feedback loop,
reason labels, instrumented metrics
theirs — M11/M12 cluster mode (tidal-net gRPC transport, tidal-server
cluster/scatter-gather, tidal-stress), multi-vector preference,
ANN candidate-gen, warm-tier day buckets, keyed signal snapshots
Notable semantic resolutions:
* storage::keys::Tag — both sides allocated 0x0E..0x11 for different
records. Kept theirs' 0x0E..0x1A (shipped on-disk format) and renumbered
ours to 0x1B..0x1E (CommunityMembership/Revocation/PurgeManifest/
CommunityLeave); Tag::ALL grown to 30 so the contiguity drift guard holds.
* ranking executor — took theirs' rewrite (SignalReadPlan pre-pass, keyed
SignalKey snapshots, Result-returning reads, finalize()) and re-applied
ours' M10 read suppression at the chokepoints it introduced:
single_signal_score, score_hot/trending/controversial,
CreatorEngagementRate, and the Stage-4 boost loop.
* signals::warm — theirs' day-bucket/read-time-rotation rewrite, with ours'
subtract_bucket and Clone extended to the new day tier; ours' test split
kept (warm/tests.rs, warm/proptests.rs) carrying theirs' updated bodies.
* db::signals — kept ours' contribution-logging try_cohort_attribution in
signal_dispatch.rs and theirs' event-time try_update_preference_vector;
dropped the superseded duplicates.
* db::mod / from_parts — theirs' constructors, with ours' purge/
re-materialization/revocation/community/skip-counter fields and restart
rebuilds; from_parts kept in its own file per the 600-line guideline.
* schema::validation::builders — ours' module split with theirs' expanded
tests; policy validation runs both sides' checks (read-signal lists +
profile overrides, then the zero-duration limit guard).
* feedback Unhide no longer writes a -1.0 "hide" signal: theirs' engine
rejects negative weights (spec §8). Reverses index state only, matching
every other undo action.
* SessionState::new is now the single construction path (gains
overrides_rejected/default_profile); AuditEntry gains kind on the
deserialize path, inferred from the accepted flag as before.
* Removed tidal/src/replication/tcp_transport.rs and its test: never
declared in replication/mod.rs on either branch, so it had never
compiled and nothing referenced it. Superseded by tidal-net's
GrpcTransport.
Verified: cargo clippy -p tidaldb (lib) clean; --all-targets compiles for
tidaldb/tidal-net/tidal-server/tidal-stress; 2094/2094 lib tests and the
integration suite pass except m8p3_reconcile_production's two CRDT-count
assertions, which fail identically on MERGE_HEAD (pre-existing).
tidalctl cannot build locally: its aws-sdk deps need rustc 1.91.1, local
toolchain is 1.91.0.
177 lines
5.6 KiB
Rust
177 lines
5.6 KiB
Rust
//! Integration tests for M7P4 Operational Visibility — `QueryStats` + Prometheus format.
|
|
//!
|
|
//! - Task 01: `QueryStats` — per-query execution statistics attached to every result
|
|
//! - Task 05: Prometheus exposition format correctness
|
|
#![allow(clippy::too_many_lines, clippy::unwrap_used)]
|
|
|
|
use std::{collections::HashMap, time::Duration};
|
|
|
|
use tidaldb::{
|
|
TidalDb,
|
|
schema::{DecaySpec, EntityId, EntityKind, Timestamp, Window},
|
|
};
|
|
|
|
// ── Shared test schema ───────────────────────────────────────────────────────
|
|
|
|
fn build_test_schema() -> tidaldb::schema::Schema {
|
|
use tidaldb::{AgentPolicy, schema::SchemaBuilder};
|
|
|
|
let mut builder = SchemaBuilder::new();
|
|
let _ = builder
|
|
.signal(
|
|
"view",
|
|
EntityKind::Item,
|
|
DecaySpec::Exponential {
|
|
half_life: Duration::from_secs(7 * 24 * 3600),
|
|
},
|
|
)
|
|
.windows(&[Window::OneHour])
|
|
.add();
|
|
let _ = builder
|
|
.signal(
|
|
"like",
|
|
EntityKind::Item,
|
|
DecaySpec::Exponential {
|
|
half_life: Duration::from_secs(30 * 24 * 3600),
|
|
},
|
|
)
|
|
.windows(&[Window::OneHour])
|
|
.add();
|
|
builder.session_policy(
|
|
"default",
|
|
AgentPolicy {
|
|
allowed_signals: vec!["view".to_string(), "like".to_string()],
|
|
denied_signals: vec![],
|
|
max_session_duration: Duration::from_secs(3600),
|
|
max_signals_per_session: 1000,
|
|
..AgentPolicy::default()
|
|
},
|
|
);
|
|
builder.build().unwrap()
|
|
}
|
|
|
|
// ── Task 01: QueryStats ──────────────────────────────────────────────────────
|
|
|
|
/// RETRIEVE results carry `QueryStats` with the profile name and pipeline counts.
|
|
#[test]
|
|
fn retrieve_results_include_query_stats() {
|
|
use tidaldb::query::retrieve::{ProfileRef, RetrieveBuilder};
|
|
|
|
let schema = build_test_schema();
|
|
let db = TidalDb::builder()
|
|
.ephemeral()
|
|
.with_schema(schema)
|
|
.open()
|
|
.unwrap();
|
|
|
|
// Write items so the candidate generation stage has something to score.
|
|
for i in 1u64..=5 {
|
|
let mut meta = HashMap::new();
|
|
meta.insert("category".to_string(), "news".to_string());
|
|
db.write_item_with_metadata(EntityId::new(i), &meta)
|
|
.unwrap();
|
|
db.signal("view", EntityId::new(i), 1.0, Timestamp::now())
|
|
.unwrap();
|
|
}
|
|
|
|
let query = RetrieveBuilder::new(EntityKind::Item, ProfileRef::new("new"))
|
|
.limit(5)
|
|
.build()
|
|
.unwrap();
|
|
let results = db.retrieve(&query).unwrap();
|
|
|
|
// QueryStats is unconditionally populated (not feature-gated).
|
|
assert_eq!(
|
|
results.stats.profile_name, "new",
|
|
"stats must capture the profile name used for scoring"
|
|
);
|
|
// Pipeline stage fields are accessible; exact values depend on item count.
|
|
let _ = results.stats.candidates_considered;
|
|
let _ = results.stats.candidates_after_filter;
|
|
let _ = results.stats.total_time_us;
|
|
let _ = results.stats.scoring_time_us;
|
|
let _ = results.stats.diversity_time_us;
|
|
}
|
|
|
|
/// SEARCH results carry `QueryStats` with the "search" profile name.
|
|
#[test]
|
|
fn search_results_include_query_stats() {
|
|
use tidaldb::query::search::Search;
|
|
|
|
let schema = build_test_schema();
|
|
let db = TidalDb::builder()
|
|
.ephemeral()
|
|
.with_schema(schema)
|
|
.open()
|
|
.unwrap();
|
|
|
|
// No text schema, so BM25 returns empty — but stats are still populated.
|
|
let query = Search::builder()
|
|
.query("test article")
|
|
.limit(5)
|
|
.build()
|
|
.unwrap();
|
|
let results = db.search(&query).unwrap();
|
|
|
|
assert_eq!(
|
|
results.stats.profile_name, "search",
|
|
"search pipeline must record the 'search' builtin profile in stats"
|
|
);
|
|
let _ = results.stats.candidates_considered;
|
|
let _ = results.stats.total_time_us;
|
|
}
|
|
|
|
// ── Task 05: Prometheus Exposition Format ────────────────────────────────────
|
|
|
|
/// Every `# HELP` line must be immediately followed by a `# TYPE` line.
|
|
#[test]
|
|
fn prometheus_format_help_always_followed_by_type() {
|
|
let schema = build_test_schema();
|
|
let db = TidalDb::builder()
|
|
.ephemeral()
|
|
.with_schema(schema)
|
|
.open()
|
|
.unwrap();
|
|
|
|
let prom = db.metrics().render_prometheus();
|
|
let lines: Vec<&str> = prom.lines().collect();
|
|
|
|
for (i, line) in lines.iter().enumerate() {
|
|
if line.starts_with("# HELP ") {
|
|
assert!(
|
|
i + 1 < lines.len() && lines[i + 1].starts_with("# TYPE "),
|
|
"# HELP line must be immediately followed by # TYPE at index {i}: {line:?}"
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// /healthz JSON contains the required fields.
|
|
#[test]
|
|
fn healthz_json_contains_required_fields() {
|
|
let schema = build_test_schema();
|
|
let db = TidalDb::builder()
|
|
.ephemeral()
|
|
.with_schema(schema)
|
|
.open()
|
|
.unwrap();
|
|
|
|
let healthz = db.metrics().render_healthz();
|
|
assert!(
|
|
healthz.contains("\"status\":"),
|
|
"healthz must contain status"
|
|
);
|
|
assert!(
|
|
healthz.contains("\"uptime_seconds\":"),
|
|
"healthz must contain uptime_seconds"
|
|
);
|
|
assert!(
|
|
healthz.contains("\"version\":"),
|
|
"healthz must contain version"
|
|
);
|
|
assert!(
|
|
healthz.contains("\"build_hash\":"),
|
|
"healthz must contain build_hash"
|
|
);
|
|
}
|