fix(udf): allow aggregate: prefixed sql udf
#18203
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Aug 22, 2024
9 tasks
stdrc
changed the title
aggregate: prefixed scalar functionaggregate: prefixed sql udf
stdrc
force-pushed
the
rc/fix-udaf-as-window-function
branch
from
0ee1e49 to
41a1a96
Compare
stdrc
force-pushed
the
rc/fix-udf-aggregate-prefix
branch
from
bbf3bdf to
20a7dc5
Compare
Signed-off-by: Richard Chien <[email protected]>
Signed-off-by: Richard Chien <[email protected]>
stdrc
force-pushed
the
rc/fix-udf-aggregate-prefix
branch
from
20a7dc5 to
2c3c0e1
Compare
9 tasks
chenzl25
approved these changes
Aug 23, 2024
Comment on lines
491
to
499
| let mut udf_context = HashMap::new(); | ||
| for (c, e) in context { | ||
| // Note that we need to bind the args before actual delve in the function body | ||
| // This will update the context in the subsequent inner calling function | ||
| // e.g., | ||
| // - create function print(INT) returns int language sql as 'select $1'; | ||
| // - create function print_add_one(INT) returns int language sql as 'select print($1 + 1)'; | ||
| // - select print_add_one(1); # The result should be 2 instead of 1. | ||
| // Without the pre-binding here, the ($1 + 1) will not be correctly populated, | ||
| // causing the result to always be 1. | ||
| let Ok(e) = self.bind_expr(e) else { | ||
| return Err(ErrorCode::BindError( | ||
| "failed to bind the argument, please recheck the syntax".to_string(), | ||
| ) | ||
| .into()); | ||
| }; | ||
| udf_context.insert(c, e); | ||
| for (i, arg) in args.into_iter().enumerate() { | ||
| if func.arg_names[i].is_empty() { | ||
| udf_context.insert(format!("${}", i + 1), arg); | ||
| } else { | ||
| // The index mapping here is accurate | ||
| // So that we could directly use the index | ||
| udf_context.insert(func.arg_names[i].clone(), arg); | ||
| } |
There was a problem hiding this comment.
Actually, I don't quite get how this context works. Could you please elaborate it more?
There was a problem hiding this comment.
The context contains a mapping of argument name -> argument expression. If an argument has no name, $n will be used as its name. I just updated the comment to make it more clear.
Signed-off-by: Richard Chien <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.
What's changed and what's your intention?
Fixes #18202.
Checklist
./risedev check(or alias,./risedev c)Documentation
Release note
If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.