Skip to content
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

Jump to bottom

fix: RepartitionExec metrics #10025

Merged
merged 1 commit into from
Apr 10, 2024
Merged

fix: RepartitionExec metrics #10025

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
37 changes: 20 additions & 17 deletions datafusion/physical-plan/src/repartition/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ impl RepartitionExecState {
})
.collect();

// TODO: metric input-output mapping is broken
let r_metrics = RepartitionMetrics::new(i, 0, &metrics);
let r_metrics = RepartitionMetrics::new(i, num_output_partitions, &metrics);

let input_task = SpawnedTask::spawn(RepartitionExec::pull_from_input(
input.clone(),
Expand Down Expand Up @@ -411,32 +410,36 @@ struct RepartitionMetrics {
fetch_time: metrics::Time,
/// Time in nanos to perform repartitioning
repartition_time: metrics::Time,
/// Time in nanos for sending resulting batches to channels
send_time: metrics::Time,
/// Time in nanos for sending resulting batches to channels.
///
/// One metric per output partition.
send_time: Vec<metrics::Time>,
}

impl RepartitionMetrics {
pub fn new(
output_partition: usize,
input_partition: usize,
num_output_partitions: usize,
metrics: &ExecutionPlanMetricsSet,
) -> Self {
let label = metrics::Label::new("inputPartition", input_partition.to_string());

// Time in nanos to execute child operator and fetch batches
let fetch_time = MetricBuilder::new(metrics)
.with_label(label.clone())
.subset_time("fetch_time", output_partition);
let fetch_time =
MetricBuilder::new(metrics).subset_time("fetch_time", input_partition);

// Time in nanos to perform repartitioning
let repart_time = MetricBuilder::new(metrics)
.with_label(label.clone())
.subset_time("repart_time", output_partition);
let repart_time =
MetricBuilder::new(metrics).subset_time("repart_time", input_partition);

// Time in nanos for sending resulting batches to channels
let send_time = MetricBuilder::new(metrics)
.with_label(label)
.subset_time("send_time", output_partition);
let send_time = (0..num_output_partitions)
.map(|output_partition| {
let label =
metrics::Label::new("outputPartition", output_partition.to_string());
MetricBuilder::new(metrics)
.with_label(label)
.subset_time("send_time", input_partition)
})
.collect();

Self {
fetch_time,
Expand Down Expand Up @@ -786,7 +789,7 @@ impl RepartitionExec {
let (partition, batch) = res?;
let size = batch.get_array_memory_size();

let timer = metrics.send_time.timer();
let timer = metrics.send_time[partition].timer();
// if there is still a receiver, send to it
if let Some((tx, reservation)) = output_channels.get_mut(&partition) {
reservation.lock().try_grow(size)?;
Expand Down
Loading