Skip to content

Commit adc1515

Browse files
committed
chore: refactor BuildProbeJoinMetrics to use BaselineMetrics
Closes apache#16495 Here's an example of an `explain analyze` of a hash join showing these metrics: ``` [(WatchID@0, WatchID@0)], metrics=[output_rows=100, elapsed_compute=2.313624ms, build_input_batches=1, build_input_rows=100, input_batches=1, input_rows=100, output_batches=1, build_mem_used=3688, build_time=865.832µs, join_time=1.369875ms] ``` Notice `output_rows=100, elapsed_compute=2.313624ms` in the above.
1 parent 85eebcd commit adc1515

4 files changed

Lines changed: 16 additions & 10 deletions

File tree

‎datafusion/physical-plan/src/joins/cross_join.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ impl<T: BatchTransformer> CrossJoinStream<T> {
632632
}
633633

634634
self.join_metrics.output_batches.add(1);
635-
self.join_metrics.output_rows.add(batch.num_rows());
635+
self.join_metrics.baseline.record_output(batch.num_rows());
636636
return Ok(StatefulStreamResult::Ready(Some(batch)));
637637
}
638638
}

‎datafusion/physical-plan/src/joins/hash_join.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@ impl HashJoinStream {
15821582
};
15831583

15841584
self.join_metrics.output_batches.add(1);
1585-
self.join_metrics.output_rows.add(result.num_rows());
1585+
self.join_metrics.baseline.record_output(result.num_rows());
15861586
timer.done();
15871587

15881588
if next_offset.is_none() {
@@ -1639,7 +1639,7 @@ impl HashJoinStream {
16391639
self.join_metrics.input_rows.add(batch.num_rows());
16401640

16411641
self.join_metrics.output_batches.add(1);
1642-
self.join_metrics.output_rows.add(batch.num_rows());
1642+
self.join_metrics.baseline.record_output(batch.num_rows());
16431643
}
16441644
timer.done();
16451645

‎datafusion/physical-plan/src/joins/nested_loop_join.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ impl<T: BatchTransformer> NestedLoopJoinStream<T> {
912912
}
913913

914914
self.join_metrics.output_batches.add(1);
915-
self.join_metrics.output_rows.add(batch.num_rows());
915+
self.join_metrics.baseline.record_output(batch.num_rows());
916916
Ok(StatefulStreamResult::Ready(Some(batch)))
917917
}
918918
}

‎datafusion/physical-plan/src/joins/utils.rs‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use std::sync::Arc;
2626
use std::task::{Context, Poll};
2727

2828
use crate::joins::SharedBitmapBuilder;
29-
use crate::metrics::{self, ExecutionPlanMetricsSet, MetricBuilder};
29+
use crate::metrics::{self, BaselineMetrics, ExecutionPlanMetricsSet, MetricBuilder};
3030
use crate::projection::ProjectionExec;
3131
use crate::{
3232
ColumnStatistics, ExecutionPlan, ExecutionPlanProperties, Partitioning, Statistics,
@@ -1196,6 +1196,7 @@ fn append_probe_indices_in_order(
11961196
/// Metrics for build & probe joins
11971197
#[derive(Clone, Debug)]
11981198
pub(crate) struct BuildProbeJoinMetrics {
1199+
pub(crate) baseline: BaselineMetrics,
11991200
/// Total time for collecting build-side of join
12001201
pub(crate) build_time: metrics::Time,
12011202
/// Number of batches consumed by build-side
@@ -1212,12 +1213,19 @@ pub(crate) struct BuildProbeJoinMetrics {
12121213
pub(crate) input_rows: metrics::Count,
12131214
/// Number of batches produced by this operator
12141215
pub(crate) output_batches: metrics::Count,
1215-
/// Number of rows produced by this operator
1216-
pub(crate) output_rows: metrics::Count,
1216+
}
1217+
1218+
impl Drop for BuildProbeJoinMetrics {
1219+
fn drop(&mut self) {
1220+
self.baseline.elapsed_compute().add(&self.build_time);
1221+
self.baseline.elapsed_compute().add(&self.join_time);
1222+
}
12171223
}
12181224

12191225
impl BuildProbeJoinMetrics {
12201226
pub fn new(partition: usize, metrics: &ExecutionPlanMetricsSet) -> Self {
1227+
let baseline = BaselineMetrics::new(metrics, partition);
1228+
12211229
let join_time = MetricBuilder::new(metrics).subset_time("join_time", partition);
12221230

12231231
let build_time = MetricBuilder::new(metrics).subset_time("build_time", partition);
@@ -1239,8 +1247,6 @@ impl BuildProbeJoinMetrics {
12391247
let output_batches =
12401248
MetricBuilder::new(metrics).counter("output_batches", partition);
12411249

1242-
let output_rows = MetricBuilder::new(metrics).output_rows(partition);
1243-
12441250
Self {
12451251
build_time,
12461252
build_input_batches,
@@ -1250,7 +1256,7 @@ impl BuildProbeJoinMetrics {
12501256
input_batches,
12511257
input_rows,
12521258
output_batches,
1253-
output_rows,
1259+
baseline,
12541260
}
12551261
}
12561262
}

0 commit comments

Comments
 (0)