Skip to content
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

[Julia] Improves Julia support for scalar UDFs #15430

Merged
merged 9 commits into from
Jan 3, 2025
Merged

[Julia] Improves Julia support for scalar UDFs #15430

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ae80f4d
Add better support for user defined Scalar Functions
tqml Jul 28, 2024
9e716c3
Remove space
tqml Dec 20, 2024
436441f
Fix errors and remove unregister (not supported)
tqml Dec 20, 2024
d606b5d
Update tests
tqml Dec 20, 2024
d992024
Fix format
tqml Dec 20, 2024
95601ba
Fix test error on Julia 1.7
tqml Dec 20, 2024
1da5c03
Update exception testing
tqml Dec 20, 2024
0cfc1e9
Add notes to wrapper generation
tqml Dec 20, 2024
677cf82
Update docs
tqml Dec 20, 2024
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
Prev Previous commit
Update docs
  • Loading branch information
@tqml
tqml committed Dec 20, 2024
commit 677cf8216009002fa63faf7effa481af551aa4fd
28 changes: 8 additions & 20 deletions tools/juliapkg/src/scalar_function.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,18 @@
wrapper = nothing
)

Creates a new scalar function object.
The function object is must be registered in the database before use.
Creates a new scalar function object. It is recommended to use the `@create_scalar_function`
macro to create a new scalar function instead of calling this constructor directly.

# Arguments
- `name::AbstractString`: The name of the function.
- `parameters::Vector{DataType}`: The data types of the parameters.
- `return_type::DataType`: The return type of the function.
- `func`: The function to be called.
- `wrapper`: The wrapper function that is used to call the function from DuckDB.
- `wrapper_id`: A unique id for the wrapper function.

# Example

```jldoctest
using DuckDB

my_add = (a, b) -> a+b
add_func = ScalarFunction("my_add", [Int64, Int64], Int64, my_add)

db = DB()
register_scalar_function(db, add_func)

DuckDB.query(db, "SELECT my_add(1, 2);")
```

See also [`register_scalar_function`](@ref), [`unregister_scalar_function`](@ref)
See also [`register_scalar_function`](@ref), [`@create_scalar_function`](@ref)
"""
mutable struct ScalarFunction
handle::duckdb_scalar_function
Expand Down Expand Up @@ -279,7 +267,7 @@ HACK: This is a workaround to dynamically generate a function pointer on ALL arc
const _UDF_WRAPPER_CACHE = Dict{UInt64, Function}()

function _udf_register_wrapper(id, wrapper)


if id in keys(_UDF_WRAPPER_CACHE)
throw(
Expand All @@ -290,7 +278,7 @@ function _udf_register_wrapper(id, wrapper)
end

_UDF_WRAPPER_CACHE[id] = wrapper

# HACK: This is a workaround to dynamically generate a function pointer on ALL architectures
# We need to delay the cfunction call until the moment wrapper function is generated
fptr = QuoteNode(:(_UDF_WRAPPER_CACHE[$id]))
Expand All @@ -313,7 +301,7 @@ Creates a new Scalar Function object that can be registered in a DuckDB database

# Arguments
- `func_expr`: An expression that defines the function signature.
- `func_def`: An optional definition of the function or a closure. If ommited, it is assumed that a function with same name given in `func_expr` is defined in the global scope.
- `func_def`: An optional definition of the function or a closure. If omitted, it is assumed that a function with same name given in `func_expr` is defined in the global scope.


# Example
Expand Down
Loading