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.

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

refactor: avoid duplicate codes #1371

Merged
merged 1 commit into from
Dec 18, 2023
Merged
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
21 changes: 10 additions & 11 deletions analytic_engine/src/sst/parquet/async_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ pub struct Reader<'a> {
metrics: Metrics,
df_plan_metrics: ExecutionPlanMetricsSet,

table_level_sst_metrics: Arc<MaybeTableLevelMetrics>,
table_level_sst_metrics: Option<Arc<MaybeTableLevelMetrics>>,
}

#[derive(Default, Debug, Clone, TraceMetricWhenDrop)]
Expand Down Expand Up @@ -129,6 +129,9 @@ impl<'a> Reader<'a> {
..Default::default()
};

let table_level_sst_metrics = matches!(options.frequency, ReadFrequency::Frequent)
.then(|| options.maybe_table_level_metrics.clone());

Self {
path,
store,
Expand All @@ -142,7 +145,7 @@ impl<'a> Reader<'a> {
row_projector: None,
metrics,
df_plan_metrics,
table_level_sst_metrics: options.maybe_table_level_metrics.clone(),
table_level_sst_metrics,
}
}

Expand Down Expand Up @@ -263,11 +266,11 @@ impl<'a> Reader<'a> {
let num_row_group_after_prune = target_row_groups.len();
// Maybe it is a sub table of partitioned table, try to extract its parent
// table.
if let ReadFrequency::Frequent = self.frequency {
self.table_level_sst_metrics
if let Some(metrics) = &self.table_level_sst_metrics {
metrics
.row_group_before_prune_counter
.inc_by(num_row_group_before_prune as u64);
self.table_level_sst_metrics
metrics
.row_group_after_prune_counter
.inc_by(num_row_group_after_prune as u64);
}
Expand Down Expand Up @@ -309,12 +312,8 @@ impl<'a> Reader<'a> {
);

let mut streams = Vec::with_capacity(target_row_group_chunks.len());
let metrics_collector = {
let metrics_for_object_store = matches!(self.frequency, ReadFrequency::Frequent)
.then(|| self.table_level_sst_metrics.clone());
ObjectStoreMetricsObserver {
table_level_sst_metrics: metrics_for_object_store,
}
let metrics_collector = ObjectStoreMetricsObserver {
table_level_sst_metrics: self.table_level_sst_metrics.clone(),
};
for chunk in target_row_group_chunks {
let object_store_reader = ObjectStoreReader::with_metrics(
Expand Down