This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 47026a2a3d Remove unecessary passing around of `suffix: &str` in
`pruning.rs`'s `RequiredColumns` (#10863)
47026a2a3d is described below
commit 47026a2a3dd41a5c87e44ade58d91a89feba147b
Author: Adrian Garcia Badaracco <[email protected]>
AuthorDate: Mon Jun 10 20:26:28 2024 -0500
Remove unecessary passing around of `suffix: &str` in `pruning.rs`'s
`RequiredColumns` (#10863)
* Remove unecessary passing around of &str suffix in RequiredColumns
* fmt
---
datafusion/core/src/physical_optimizer/pruning.rs | 28 +++++++++--------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/datafusion/core/src/physical_optimizer/pruning.rs
b/datafusion/core/src/physical_optimizer/pruning.rs
index 605ef9f902..4dd62a8945 100644
--- a/datafusion/core/src/physical_optimizer/pruning.rs
+++ b/datafusion/core/src/physical_optimizer/pruning.rs
@@ -772,13 +772,19 @@ impl RequiredColumns {
column_expr: &Arc<dyn PhysicalExpr>,
field: &Field,
stat_type: StatisticsType,
- suffix: &str,
) -> Result<Arc<dyn PhysicalExpr>> {
let (idx, need_to_insert) = match self.find_stat_column(column,
stat_type) {
Some(idx) => (idx, false),
None => (self.columns.len(), true),
};
+ let suffix = match stat_type {
+ StatisticsType::Min => "min",
+ StatisticsType::Max => "max",
+ StatisticsType::NullCount => "null_count",
+ StatisticsType::RowCount => "row_count",
+ };
+
let stat_column =
phys_expr::Column::new(&format!("{}_{}", column.name(), suffix),
idx);
@@ -800,7 +806,7 @@ impl RequiredColumns {
column_expr: &Arc<dyn PhysicalExpr>,
field: &Field,
) -> Result<Arc<dyn PhysicalExpr>> {
- self.stat_column_expr(column, column_expr, field, StatisticsType::Min,
"min")
+ self.stat_column_expr(column, column_expr, field, StatisticsType::Min)
}
/// rewrite col --> col_max
@@ -810,7 +816,7 @@ impl RequiredColumns {
column_expr: &Arc<dyn PhysicalExpr>,
field: &Field,
) -> Result<Arc<dyn PhysicalExpr>> {
- self.stat_column_expr(column, column_expr, field, StatisticsType::Max,
"max")
+ self.stat_column_expr(column, column_expr, field, StatisticsType::Max)
}
/// rewrite col --> col_null_count
@@ -820,13 +826,7 @@ impl RequiredColumns {
column_expr: &Arc<dyn PhysicalExpr>,
field: &Field,
) -> Result<Arc<dyn PhysicalExpr>> {
- self.stat_column_expr(
- column,
- column_expr,
- field,
- StatisticsType::NullCount,
- "null_count",
- )
+ self.stat_column_expr(column, column_expr, field,
StatisticsType::NullCount)
}
/// rewrite col --> col_row_count
@@ -836,13 +836,7 @@ impl RequiredColumns {
column_expr: &Arc<dyn PhysicalExpr>,
field: &Field,
) -> Result<Arc<dyn PhysicalExpr>> {
- self.stat_column_expr(
- column,
- column_expr,
- field,
- StatisticsType::RowCount,
- "row_count",
- )
+ self.stat_column_expr(column, column_expr, field,
StatisticsType::RowCount)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
