berkaysynnada commented on code in PR #13146:
URL: https://github.com/apache/datafusion/pull/13146#discussion_r1824232347
##########
datafusion/core/src/datasource/physical_plan/mod.rs:
##########
@@ -66,6 +66,7 @@ use arrow::datatypes::{DataType, SchemaRef};
use datafusion_physical_expr::expressions::Column;
use datafusion_physical_expr::PhysicalSortExpr;
+use datafusion_physical_expr_common::sort_expr::LexOrdering;
Review Comment:
```suggestion
use datafusion_physical_expr_common::sort_expr::LexOrdering;
```
##########
datafusion/core/benches/sort.rs:
##########
@@ -257,15 +258,15 @@ impl BenchCase {
}
/// Make sort exprs for each column in `schema`
-fn make_sort_exprs(schema: &Schema) -> Vec<PhysicalSortExpr> {
+fn make_sort_exprs(schema: &Schema) -> LexOrdering {
schema
.fields()
.iter()
.map(|f| PhysicalSortExpr {
expr: col(f.name(), schema).unwrap(),
options: SortOptions::default(),
})
- .collect()
+ .collect::<LexOrdering>()
Review Comment:
```suggestion
.collect()
```
##########
datafusion/physical-expr/src/equivalence/properties.rs:
##########
@@ -1358,8 +1363,13 @@ fn generate_dependency_orderings(
prefix_orderings
.iter()
.permutations(prefix_orderings.len())
- .map(|prefixes|
prefixes.into_iter().flatten().cloned().collect())
- .collect::<Vec<_>>()
+ .map(|prefixes| {
+ prefixes
+ .into_iter()
+ .flat_map(|ordering| ordering.inner.clone())
+ .collect()
+ })
+ .collect::<Vec<LexOrdering>>()
Review Comment:
```suggestion
.collect::<Vec<_>>()
```
##########
datafusion/physical-plan/src/joins/symmetric_hash_join.rs:
##########
@@ -1627,6 +1630,7 @@ mod tests {
use datafusion_expr::Operator;
use datafusion_physical_expr::expressions::{binary, col, lit, Column};
+ use datafusion_physical_expr_common::sort_expr::{LexOrdering,
PhysicalSortExpr};
Review Comment:
```suggestion
use datafusion_physical_expr_common::sort_expr::{LexOrdering,
PhysicalSortExpr};
```
##########
datafusion/physical-expr/src/equivalence/properties.rs:
##########
@@ -3564,9 +3574,9 @@ mod tests {
ordering
.iter()
.map(|name| parse_sort_expr(name, schema))
- .collect::<Vec<_>>()
+ .collect::<LexOrdering>()
})
- .collect::<Vec<_>>();
+ .collect::<Vec<LexOrdering>>();
Review Comment:
```suggestion
.collect::<Vec<_>>();
```
##########
datafusion/physical-expr/src/equivalence/properties.rs:
##########
@@ -639,8 +640,10 @@ impl EquivalenceProperties {
// Generate all valid orderings, given substituted expressions.
let res = new_orderings
.into_iter()
+ .map(|ordering| ordering.inner)
.multi_cartesian_product()
- .collect::<Vec<_>>();
+ .map(LexOrdering::new)
+ .collect::<Vec<LexOrdering>>();
Review Comment:
```suggestion
.collect::<Vec<_>>();
```
##########
datafusion/core/src/datasource/physical_plan/statistics.rs:
##########
@@ -26,6 +26,7 @@
use std::sync::Arc;
+use crate::datasource::listing::PartitionedFile;
Review Comment:
```suggestion
use crate::datasource::listing::PartitionedFile;
```
##########
datafusion/core/src/physical_optimizer/enforce_distribution.rs:
##########
@@ -55,6 +55,7 @@ use datafusion_physical_expr::{
use datafusion_physical_plan::windows::{get_best_fitting_window,
BoundedWindowAggExec};
use datafusion_physical_plan::ExecutionPlanProperties;
+use datafusion_physical_expr_common::sort_expr::LexOrdering;
use datafusion_physical_optimizer::output_requirements::OutputRequirementExec;
use datafusion_physical_optimizer::PhysicalOptimizerRule;
use itertools::izip;
Review Comment:
```suggestion
use datafusion_physical_expr_common::sort_expr::LexOrdering;
use
datafusion_physical_optimizer::output_requirements::OutputRequirementExec;
use datafusion_physical_optimizer::PhysicalOptimizerRule;
use itertools::izip;
```
##########
datafusion/core/src/datasource/physical_plan/file_scan_config.rs:
##########
@@ -34,8 +34,9 @@ use arrow_array::{ArrayRef, DictionaryArray, RecordBatch,
RecordBatchOptions};
use arrow_schema::{DataType, Field, Schema, SchemaRef};
use datafusion_common::stats::Precision;
use datafusion_common::{exec_err, ColumnStatistics, DataFusionError,
Statistics};
-use datafusion_physical_expr::{LexOrdering, PhysicalSortExpr};
+use datafusion_physical_expr::LexOrdering;
+use datafusion_physical_expr_common::sort_expr::LexOrderingRef;
use log::warn;
Review Comment:
```suggestion
use datafusion_physical_expr::LexOrdering;
use datafusion_physical_expr_common::sort_expr::LexOrderingRef;
use log::warn;
```
##########
datafusion/core/src/physical_optimizer/enforce_sorting.rs:
##########
@@ -61,12 +61,13 @@ use crate::physical_plan::{Distribution, ExecutionPlan,
InputOrderMode};
use datafusion_common::plan_err;
use datafusion_common::tree_node::{Transformed, TransformedResult, TreeNode};
-use datafusion_physical_expr::{Partitioning, PhysicalSortExpr,
PhysicalSortRequirement};
+use datafusion_physical_expr::{Partitioning, PhysicalSortRequirement};
use datafusion_physical_plan::limit::{GlobalLimitExec, LocalLimitExec};
use datafusion_physical_plan::repartition::RepartitionExec;
use datafusion_physical_plan::sorts::partial_sort::PartialSortExec;
use datafusion_physical_plan::ExecutionPlanProperties;
+use datafusion_physical_expr_common::sort_expr::{LexOrdering, LexOrderingRef};
use datafusion_physical_optimizer::PhysicalOptimizerRule;
use itertools::izip;
Review Comment:
```suggestion
use datafusion_physical_expr_common::sort_expr::{LexOrdering,
LexOrderingRef};
use datafusion_physical_optimizer::PhysicalOptimizerRule;
use itertools::izip;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
