Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 19 additions & 5 deletions crates/cost/src/node/usage/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,10 @@ pub(crate) fn node_usage_and_cost_terms<'a>(
let allocation_terms = state_allocation_terms(node.parameters.as_ref());
let allocation_ops = allocation_terms.operations();
let allocation_detail = if allocation_ops > 0.0 {
format!(", {allocation_ops} ops to allocate each state")
format!(
", {} ops to allocate each state",
operations_text(allocation_ops)
)
} else {
String::new()
};
Expand All @@ -1143,10 +1146,11 @@ pub(crate) fn node_usage_and_cost_terms<'a>(
out,
Ok(charged(terms, out.bytes, 0)),
format!(
"build {} into {group_count} states: {} rows x {update_ops} ops, \
"build {} into {group_count} states: {} rows x {} ops, \
{group_visits:.0} group visits{allocation_detail}",
summary_type_name(family),
input.rows
input.rows,
operations_text(update_ops)
),
)
}
Expand Down Expand Up @@ -1243,10 +1247,11 @@ pub(crate) fn node_usage_and_cost_terms<'a>(
)),
format!(
"build {} in tumbling windows of {tumbling_window_width_ms} ms for \
{group_count} groups: {} rows x {update_ops} ops, {group_visits:.0} \
{group_count} groups: {} rows x {} ops, {group_visits:.0} \
group visits, {emitted_states:.1} states emitted",
summary_type_name(family),
input.rows
input.rows,
operations_text(update_ops)
),
)
}
Expand Down Expand Up @@ -1816,6 +1821,15 @@ fn merged_states(producers: &[ProducerOutput<'_>]) -> Result<u64, AnalyticalCost
})
}

/// An operation count for a cost detail: three decimals, trailing zeros
/// dropped, so whole counts print as before ("121"), a fractional one keeps
/// its value ("304.926") and float noise does not show ("69.99993" is
/// "70").
fn operations_text(operations: f64) -> String {
let text = format!("{operations:.3}");
text.trim_end_matches('0').trim_end_matches('.').to_string()
}

/// A summary type's name in reports: a sketch by its algorithm, e.g.
/// `HydraCms`; an exact accumulator by its kind.
// Any other type prints its Debug form, which names a new variant too, so
Expand Down
97 changes: 97 additions & 0 deletions crates/cost/src/node/usage/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,103 @@ fn a_kmv_build_costs_per_retained_hash_it_compares() {
}
}

/// The cost detail of an `algorithm` sketch over `user_id` (`parameters`), built by a
/// `SummaryAgg` or, with `chain`, a 60 s tumbling-window chain, from
/// 300,000 rows of a 5 min time range over 100,000 users.
fn user_id_sketch_detail(
parameters: SketchParams,
algorithm: asap_types::summary_type::SketchAlgorithm,
chain: bool,
) -> String {
let settings = CostInputs::default();
let (data, schema) = sql_rows_of_t(100_000);
let range = PhysicalASAPDAGNode {
output_schema: schema,
..node(Payload::NonASAP(NonASAPOp::TimeRange {
range: Duration::from_secs(300),
kind: TimeRangeKind::Range,
child: 0,
}))
};
let mut rows = raw_rows(&range, "t", 300_000, 300_000);
rows.output_schema = &range.output_schema;
rows.unchanged_columns = ["job", "region", "instance", "user_id", "value"].into();
let summary_type = FieldDataType::Sketch(algorithm);
let input = SummaryUpdate::column(ColumnRef::Named("user_id".into()));
let reduction = Reduction::by(vec![]);
let build = PhysicalASAPDAGNode {
parameters: Some(parameters),
..node(Payload::ASAP(if chain {
ASAPOp::SummaryTumblingWindowChain {
child: 0,
summary_type,
input,
reduction,
filter: None,
tumbling_window_width_ms: 60_000,
}
} else {
ASAPOp::SummaryAgg {
child: 0,
summary_type,
input,
reduction,
filter: None,
}
}))
};
node_resource_usage_and_cost(&build, &[rows], (1, 1.0), None, &data, &settings)
.unwrap()
.cost
.detail
}

/// An operation count prints to three decimals without trailing zeros:
/// whole counts as before, fractional ones with their value, float noise
/// hidden.
#[test]
fn an_operation_count_prints_to_three_decimals() {
assert_eq!(operations_text(121.0), "121");
assert_eq!(operations_text(304.925_613_569_675_9), "304.926");
assert_eq!(operations_text(69.999_933_338_068_93), "70");
assert_eq!(operations_text(14.700_000_000_000_001), "14.7");
assert_eq!(operations_text(0.3), "0.3");
}

/// A build's detail prints its fractional operations per row (a KMV's
/// compared hashes) through `operations_text`, not in full.
#[test]
fn a_build_detail_prints_its_operations_per_row_to_three_decimals() {
use asap_types::summary_type::SketchAlgorithm;
let detail = user_id_sketch_detail(SketchParams::Kmv { k: 4_323 }, SketchAlgorithm::Kmv, false);
assert!(detail.contains("300000 rows x 304.926 ops"), "{detail}");
}

/// A tumbling-window chain's detail prints its operations per row the same
/// way.
#[test]
fn a_chain_detail_prints_its_operations_per_row_to_three_decimals() {
use asap_types::summary_type::SketchAlgorithm;
let detail = user_id_sketch_detail(SketchParams::Kmv { k: 4_323 }, SketchAlgorithm::Kmv, true);
assert!(detail.contains("300000 rows x 714.976 ops"), "{detail}");
}

/// A Count-Min state's allocation, 7 counters at 2.1 operations each, is
/// 14.700000000000001 in floating point and prints as 14.7.
#[test]
fn a_state_allocation_prints_to_three_decimals() {
use asap_types::summary_type::SketchAlgorithm;
let detail = user_id_sketch_detail(
SketchParams::Cms { width: 7, depth: 1 },
SketchAlgorithm::Cms,
false,
);
assert!(
detail.contains(", 14.7 ops to allocate each state"),
"{detail}"
);
}

/// A KMV build's time per row, measured on the executor (median of 3 runs
/// on one pinned core) over `user_id`s drawn from 1,000,000 values, in 10
/// states by `job` and 1,000 by `instance`, from 1,200 to 60,000 rows per
Expand Down
Loading