Skip to content

Commit 544e2c9

Browse files
osipovartemkosiew
authored andcommitted
Avoid resolving aliased expression fields twice
1 parent 635e7b5 commit 544e2c9

1 file changed

Lines changed: 51 additions & 5 deletions

File tree

‎datafusion/expr/src/expr_schema.rs‎

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -537,15 +537,13 @@ impl ExprSchemable for Expr {
537537
metadata,
538538
..
539539
}) => {
540-
let mut combined_metadata = expr.metadata(schema)?;
540+
let field = expr.to_field(schema)?.1;
541+
let mut combined_metadata = FieldMetadata::from(field.metadata());
541542
if let Some(metadata) = metadata {
542543
combined_metadata.extend(metadata.clone());
543544
}
544545

545-
Ok(expr
546-
.to_field(schema)
547-
.map(|(_, f)| f)?
548-
.with_field_metadata(&combined_metadata))
546+
Ok(field.with_field_metadata(&combined_metadata))
549547
}
550548
Expr::Negative(expr) => expr.to_field(schema).map(|(_, f)| f),
551549
Expr::Column(c) => schema.field_from_column(c).map(Arc::clone),
@@ -1286,6 +1284,54 @@ mod tests {
12861284
assert_eq!(expr.metadata(&schema).unwrap(), alias_metadata);
12871285
}
12881286

1287+
#[test]
1288+
fn test_nested_alias_resolves_child_field_once() -> Result<()> {
1289+
#[derive(Debug)]
1290+
struct CountingSchema {
1291+
field: FieldRef,
1292+
lookups: std::cell::Cell<usize>,
1293+
}
1294+
1295+
impl ExprSchema for CountingSchema {
1296+
fn nullable(&self, _col: &Column) -> Result<bool> {
1297+
Ok(self.field.is_nullable())
1298+
}
1299+
1300+
fn field_from_column(&self, _col: &Column) -> Result<&FieldRef> {
1301+
self.lookups.set(self.lookups.get() + 1);
1302+
Ok(&self.field)
1303+
}
1304+
}
1305+
1306+
let schema = CountingSchema {
1307+
field: Arc::new(Field::new("value", DataType::Int32, false).with_metadata(
1308+
HashMap::from([
1309+
("override".to_string(), "base".to_string()),
1310+
("keep".to_string(), "base".to_string()),
1311+
]),
1312+
)),
1313+
lookups: std::cell::Cell::new(0),
1314+
};
1315+
let mut expr = col("value");
1316+
for index in 0..12 {
1317+
let Expr::Alias(alias) = expr.alias(format!("alias_{index}")) else {
1318+
unreachable!();
1319+
};
1320+
expr = Expr::Alias(alias.with_metadata(Some(FieldMetadata::from(
1321+
HashMap::from([("override".to_string(), index.to_string())]),
1322+
))));
1323+
}
1324+
1325+
let field = expr.to_field(&schema)?.1;
1326+
assert_eq!(schema.lookups.get(), 1);
1327+
assert_eq!(field.name(), "alias_11");
1328+
assert_eq!(field.data_type(), &DataType::Int32);
1329+
assert!(!field.is_nullable());
1330+
assert_eq!(field.metadata().get("override"), Some(&"11".to_string()));
1331+
assert_eq!(field.metadata().get("keep"), Some(&"base".to_string()));
1332+
Ok(())
1333+
}
1334+
12891335
#[test]
12901336
fn test_expr_placeholder() {
12911337
let schema = MockExprSchema::new();

0 commit comments

Comments
 (0)