Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ inefficient_to_string = "warn"
needless_pass_by_value = "warn"
# https://github.com/apache/datafusion/issues/18881
allow_attributes = "warn"
assigning_clones = "warn"

[workspace.lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = [
Expand Down
10 changes: 2 additions & 8 deletions datafusion/common/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2711,10 +2711,7 @@ impl From<&Arc<FileEncryptionProperties>> for ConfigFileEncryptionProperties {
},
);
}
let mut aad_prefix: Vec<u8> = Vec::new();
if let Some(prefix) = f.aad_prefix() {
aad_prefix = prefix.clone();
}
let aad_prefix = f.aad_prefix().cloned().unwrap_or_default();
ConfigFileEncryptionProperties {
encrypt_footer: f.encrypt_footer(),
footer_key_as_hex: hex::encode(f.footer_key()),
Expand Down Expand Up @@ -2852,10 +2849,7 @@ impl From<&Arc<FileDecryptionProperties>> for ConfigFileDecryptionProperties {
column_decryption_properties.insert(column_name.clone(), props);
}

let mut aad_prefix: Vec<u8> = Vec::new();
if let Some(prefix) = f.aad_prefix() {
aad_prefix = prefix.clone();
}
let aad_prefix = f.aad_prefix().cloned().unwrap_or_default();
ConfigFileDecryptionProperties {
footer_key_as_hex: hex::encode(
f.footer_key(None).unwrap_or_default().as_ref(),
Expand Down
2 changes: 1 addition & 1 deletion datafusion/physical-plan/src/aggregates/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,7 @@ impl ExecutionPlan for AggregateExec {
Arc::clone(&self.schema),
)?;
me.limit_options = self.limit_options;
me.dynamic_filter = self.dynamic_filter.clone();
me.dynamic_filter.clone_from(&self.dynamic_filter);

Ok(Arc::new(me))
}
Expand Down
13 changes: 7 additions & 6 deletions datafusion/physical-plan/src/display.rs
Original file line number Diff line number Diff line change
Expand Up @@ -734,13 +734,14 @@ impl TreeRenderVisitor<'_, '_> {
if let Some(node) = root.get_node(x, y) {
write!(self.f, "{}", Self::VERTICAL)?;

// Rigure out what to render.
let mut render_text = String::new();
if render_y == 0 {
render_text = node.name.clone();
// Figure out what to render.
let mut render_text = if render_y == 0 {
node.name.clone()
} else if render_y <= extra_info[x].len() {
render_text = extra_info[x][render_y - 1].clone();
}
extra_info[x][render_y - 1].clone()
} else {
String::new()
};

render_text = Self::adjust_text_for_rendering(
&render_text,
Expand Down
Loading