Skip to content

[AURON #2076] Fix typos and unnecessary memory allocation in native engine #2077

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
slfan1989 merged 1 commit into from
Apr 4, 2026
Merged

[AURON #2076] Fix typos and unnecessary memory allocation in native engine #2077

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
43 changes: 26 additions & 17 deletions native-engine/datafusion-ext-plans/src/flink/serde/pb_deserializer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ impl PbDeserializer {
nested_msg_mapping.clone(),
&skip_fields,
)
.expect("Failed to transfer output scheam to pb scheam");
.expect("Failed to transfer output schema to pb schema");

let tag_to_output_mapping =
create_tag_to_output_mapping(message_descriptor.clone(), &pb_schema);
Expand Down Expand Up @@ -284,12 +284,13 @@ fn transfer_output_schema_to_pb_schema(
let index_start = field_name.find(".");
if let Some(index) = index_start {
let msg_field_name = &field_name[..index];
let msg_field_desc =
message_descriptor
.get_field_by_name(msg_field_name)
.expect(&format!(
"nested field {msg_field_name} not exits in message_descriptor"
));
let msg_field_desc = message_descriptor
.get_field_by_name(msg_field_name)
.ok_or_else(|| {
DataFusionError::Execution(format!(
"nested field {msg_field_name} does not exist in message_descriptor"
))
})?;
if let Kind::Message(sub_message_desc) = msg_field_desc.kind() {
if !msg_set.contains(msg_field_name) {
let sub_fields = sub_pb_schema_mapping
Expand Down Expand Up @@ -318,18 +319,24 @@ fn transfer_output_schema_to_pb_schema(
return df_execution_err!("not message field");
}
} else {
let msg_field_desc =
message_descriptor
.get_field_by_name(field_name)
.expect(&format!(
"nested innermost field {field_name} not exits in message_descriptor"
));
let msg_field_desc = message_descriptor
.get_field_by_name(field_name)
.ok_or_else(|| {
DataFusionError::Execution(format!(
"nested innermost field {field_name} does not exist in message_descriptor"
))
})?;
pb_schema_fields.push(create_arrow_field(msg_field_desc.clone(), skip_fields));
}
} else {
let msg_field_desc = message_descriptor
.get_field_by_name(field.name())
.expect(&format!("{} not exits in message_descriptor", field.name()));
.ok_or_else(|| {
DataFusionError::Execution(format!(
"{} does not exist in message_descriptor",
field.name()
))
})?;
pb_schema_fields.push(create_arrow_field(msg_field_desc.clone(), skip_fields));
Comment on lines 333 to 340
Copy link

Copilot AI Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grammar: the panic message says "not exists". Consider changing to "does not exist" for clearer/grammatically correct diagnostics.

Copilot uses AI. Check for mistakes.
}
}
Expand Down Expand Up @@ -549,9 +556,11 @@ fn create_output_array_builders(
let field_name = field.name();
let field_desc = message_descriptor
.get_field_by_name(field_name)
.expect(&format!(
"Field {field_name} not exits in message_descriptor",
));
.ok_or_else(|| {
DataFusionError::Execution(format!(
"Field {field_name} does not exist in message_descriptor"
))
})?;
match field.data_type() {
DataType::Boolean => {
array_builders.push(SharedArrayBuilder::new(BooleanBuilder::new()));
Expand Down
2 changes: 1 addition & 1 deletion native-engine/datafusion-ext-plans/src/orc_exec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@ mod tests {
col_name,
schema
.index_of(col_name)
.expect(&format!("Column '{col_name}' not found")),
.expect("Column not found in schema"),
));
let null_lit = Arc::new(Literal::new(null_value));
let expr = Arc::new(BinaryExpr::new(col, Operator::Eq, null_lit));
Expand Down
Loading