Pass FuncCtx to Insn::Function to keep track of arg count #323
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
jussisaurio
force-pushed
the
func-context
branch
2 times, most recently
from
2408f8c to
1c9a4d9
Compare
jussisaurio
force-pushed
the
func-context
branch
from
1c9a4d9 to
bb0ad04
Compare
jussisaurio
commented
Sep 14, 2024
| @@ -1114,7 +1125,6 @@ pub fn translate_expr( | |||
| crate::bail_parse_error!("nullif function with no arguments"); | |||
| }; | |||
|
|
|||
| let func_reg = program.alloc_register(); | |||
There was a problem hiding this comment.
I think this was a bug in nullif()
pereman2
approved these changes
Sep 14, 2024
| impl Func { | ||
| pub fn to_string(&self) -> String { | ||
| match self { | ||
| Func::Agg(agg_func) => agg_func.to_string().to_string(), |
There was a problem hiding this comment.
yeah AggFunc has a separate non-trait method to_string() that returns a &str, should change that at some point 😂
penberg
pushed a commit
that referenced
this pull request
Sep 22, 2024
…m Jussi Saurio #321 recently fixed an error with register allocation order concerning binary expressions in `translate_condition_expr`. I noticed we had the same bug in `translate_expr` as well, and this led into noticing that our implementation of `Insn::Function` diverges from SQLite in that it doesn't provide a context object that keeps track of how many arguments the function call has. Not having the arg count available at runtime means that e.g.: ``` do_execsql_test length-date-binary-expr { select length(date('now')) = 10; } {1} ``` Returned 0 instead of 1, because at runtime another register was already allocated, and `date()` was implemented like this: ``` Func::Scalar(ScalarFunc::Date) => { let result = exec_date(&state.registers[*start_reg..]); // all registers starting from start_reg state.registers[*dest] = result; state.pc += 1; } ``` SQlite bytecode engine docs for Function say: > Invoke a user function (P4 is a pointer to an sqlite3_context object that contains a pointer to the function to be run) with arguments taken from register P2 and successors. The number of arguments is in the sqlite3_context object that P4 points to. Accordingly, this PR implements a `FuncCtx` struct that contains a `Func` and `arg_count` (usize). Reviewed-by: Pere Diaz Bou <pere-altea@hotmail.com> Closes #323
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.
#321 recently fixed an error with register allocation order concerning binary expressions in
translate_condition_expr. I noticed we had the same bug intranslate_expras well, and this led into noticing that our implementation ofInsn::Functiondiverges from SQLite in that it doesn't provide a context object that keeps track of how many arguments the function call has.Not having the arg count available at runtime means that e.g.:
Returned 0 instead of 1, because at runtime another register was already allocated, and
date()was implemented like this:SQlite bytecode engine docs for Function say:
Accordingly, this PR implements a
FuncCtxstruct that contains aFuncandarg_count(usize).