Skip to content

Fix CI compile failure due to merge conflict #13219

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
alamb merged 1 commit into from
Nov 1, 2024
Merged

Fix CI compile failure due to merge conflict #13219

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
11 changes: 3 additions & 8 deletions datafusion/substrait/src/logical_plan/consumer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,13 +1126,8 @@ fn retrieve_emit_kind(rel_common: Option<&RelCommon>) -> EmitKind {
.map_or(default, |ek| ek.clone())
}

fn contains_volatile_expr(proj: &Projection) -> Result<bool> {
for expr in proj.expr.iter() {
if expr.is_volatile()? {
return Ok(true);
}
}
Ok(false)
fn contains_volatile_expr(proj: &Projection) -> bool {
proj.expr.iter().any(|e| e.is_volatile())
}

fn apply_emit_kind(
Expand All @@ -1151,7 +1146,7 @@ fn apply_emit_kind(
// expressions in the projection are volatile. This is to avoid issues like
// converting a single call of the random() function into multiple calls due to
// duplicate fields in the output_mapping.
LogicalPlan::Projection(proj) if !contains_volatile_expr(&proj)? => {
LogicalPlan::Projection(proj) if !contains_volatile_expr(&proj) => {
let mut exprs: Vec<Expr> = vec![];
for field in output_mapping {
let expr = proj.expr
Expand Down