cetra3 commented on code in PR #20432:
URL: https://github.com/apache/datafusion/pull/20432#discussion_r2834000856
##########
datafusion/optimizer/src/extract_leaf_expressions.rs:
##########
@@ -127,10 +123,45 @@ impl OptimizerRule for ExtractLeafExpressions {
return Ok(Transformed::no(plan));
}
let alias_generator = config.alias_generator();
- extract_from_plan(plan, alias_generator)
+
+ // Advance the alias generator past any user-provided
__datafusion_extracted_N
+ // aliases to prevent collisions when generating new extraction
aliases.
+ advance_generator_past_existing(&plan, alias_generator)?;
+
+ plan.transform_down_with_subqueries(|plan| {
+ extract_from_plan(plan, alias_generator)
+ })
}
}
+/// Scans the current plan node's expressions for pre-existing
+/// `__datafusion_extracted_N` aliases and advances the generator
+/// counter past them to avoid collisions with user-provided aliases.
+fn advance_generator_past_existing(
+ plan: &LogicalPlan,
+ alias_generator: &AliasGenerator,
+) -> Result<()> {
+ plan.apply(|plan| {
+ plan.expressions().iter().try_for_each(|expr| {
+ expr.apply(|e| {
+ if let Expr::Alias(alias) = e
+ && let Some(id_str) = alias
+ .name
+ .strip_prefix(EXTRACTED_EXPR_PREFIX)
+ .and_then(|s| s.strip_prefix('_'))
Review Comment:
Couldn't this be `.and_then(|id| id_str.parse().ok())`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
