Skip to content

Fix logical conflicts #8187

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.

Sign up for GitHub

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

Merged
tustvold merged 1 commit into from
Nov 15, 2023
Merged

Fix logical conflicts #8187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions datafusion/core/src/physical_optimizer/projection_pushdown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,7 @@ mod tests {
Arc::new(Column::new("b", 1)),
)),
],
&DataType::Int32,
DataType::Int32,
None,
)),
Arc::new(CaseExpr::try_new(
Expand Down Expand Up @@ -1212,7 +1212,7 @@ mod tests {
Arc::new(Column::new("b", 1)),
)),
],
&DataType::Int32,
DataType::Int32,
None,
)),
Arc::new(CaseExpr::try_new(
Expand Down Expand Up @@ -1281,7 +1281,7 @@ mod tests {
Arc::new(Column::new("b", 1)),
)),
],
&DataType::Int32,
DataType::Int32,
None,
)),
Arc::new(CaseExpr::try_new(
Expand Down Expand Up @@ -1347,7 +1347,7 @@ mod tests {
Arc::new(Column::new("b_new", 1)),
)),
],
&DataType::Int32,
DataType::Int32,
None,
)),
Arc::new(CaseExpr::try_new(
Expand Down
5 changes: 3 additions & 2 deletions datafusion/core/tests/fuzz_cases/sort_preserving_repartition_fuzz.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down Expand Up @@ -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> {
Expand Down Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion datafusion/substrait/src/logical_plan/producer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down