This is an automated email from the ASF dual-hosted git repository.
tustvold pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 849d85f566 Fix logical conflicts (#8187)
849d85f566 is described below
commit 849d85f5661938fe625f593306716e99611d7705
Author: Raphael Taylor-Davies <[email protected]>
AuthorDate: Wed Nov 15 10:47:12 2023 +0000
Fix logical conflicts (#8187)
---
datafusion/core/src/physical_optimizer/projection_pushdown.rs | 8 ++++----
.../core/tests/fuzz_cases/sort_preserving_repartition_fuzz.rs | 5 +++--
datafusion/substrait/src/logical_plan/producer.rs | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/datafusion/core/src/physical_optimizer/projection_pushdown.rs
b/datafusion/core/src/physical_optimizer/projection_pushdown.rs
index 8e50492ae5..74d0de507e 100644
--- a/datafusion/core/src/physical_optimizer/projection_pushdown.rs
+++ b/datafusion/core/src/physical_optimizer/projection_pushdown.rs
@@ -1146,7 +1146,7 @@ mod tests {
Arc::new(Column::new("b", 1)),
)),
],
- &DataType::Int32,
+ DataType::Int32,
None,
)),
Arc::new(CaseExpr::try_new(
@@ -1212,7 +1212,7 @@ mod tests {
Arc::new(Column::new("b", 1)),
)),
],
- &DataType::Int32,
+ DataType::Int32,
None,
)),
Arc::new(CaseExpr::try_new(
@@ -1281,7 +1281,7 @@ mod tests {
Arc::new(Column::new("b", 1)),
)),
],
- &DataType::Int32,
+ DataType::Int32,
None,
)),
Arc::new(CaseExpr::try_new(
@@ -1347,7 +1347,7 @@ mod tests {
Arc::new(Column::new("b_new", 1)),
)),
],
- &DataType::Int32,
+ DataType::Int32,
None,
)),
Arc::new(CaseExpr::try_new(
diff --git
a/datafusion/core/tests/fuzz_cases/sort_preserving_repartition_fuzz.rs
b/datafusion/core/tests/fuzz_cases/sort_preserving_repartition_fuzz.rs
index 5bc29ba1c2..df6499e9b1 100644
--- a/datafusion/core/tests/fuzz_cases/sort_preserving_repartition_fuzz.rs
+++ b/datafusion/core/tests/fuzz_cases/sort_preserving_repartition_fuzz.rs
@@ -44,6 +44,7 @@ mod sp_repartition_fuzz_tests {
};
use test_utils::add_empty_batches;
+ use datafusion_physical_expr::equivalence::EquivalenceClass;
use itertools::izip;
use rand::{rngs::StdRng, seq::SliceRandom, Rng, SeedableRng};
@@ -112,7 +113,7 @@ mod sp_repartition_fuzz_tests {
// expressions in the equivalence classes. For other expressions in the
same
// equivalence class use same result. This util gets already calculated
result, when available.
fn get_representative_arr(
- eq_group: &[Arc<dyn PhysicalExpr>],
+ eq_group: &EquivalenceClass,
existing_vec: &[Option<ArrayRef>],
schema: SchemaRef,
) -> Option<ArrayRef> {
@@ -185,7 +186,7 @@ mod sp_repartition_fuzz_tests {
get_representative_arr(eq_group, &schema_vec, schema.clone())
.unwrap_or_else(|| generate_random_array(n_elem,
n_distinct));
- for expr in eq_group {
+ for expr in eq_group.iter() {
let col = expr.as_any().downcast_ref::<Column>().unwrap();
let (idx, _field) =
schema.column_with_name(col.name()).unwrap();
schema_vec[idx] = Some(representative_array.clone());
diff --git a/datafusion/substrait/src/logical_plan/producer.rs
b/datafusion/substrait/src/logical_plan/producer.rs
index 9356a77534..4b6aded78b 100644
--- a/datafusion/substrait/src/logical_plan/producer.rs
+++ b/datafusion/substrait/src/logical_plan/producer.rs
@@ -619,7 +619,7 @@ pub fn to_substrait_agg_measure(
for arg in args {
arguments.push(FunctionArgument { arg_type:
Some(ArgType::Value(to_substrait_rex(arg, schema, 0, extension_info)?)) });
}
- let function_anchor = _register_function(fun.name.clone(),
extension_info);
+ let function_anchor = _register_function(fun.name().to_string(),
extension_info);
Ok(Measure {
measure: Some(AggregateFunction {
function_reference: function_anchor,
