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

draft: Convert ExtFunc usage to ExternalFunc #595

Closed
wants to merge 2 commits into from
Closed

draft: Convert ExtFunc usage to ExternalFunc #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdebb00
ext/uuid: change external function signature
diegoreis42 Jan 2, 2025
8dfa2e1
ext/uuid: convert uuid7() to external function
diegoreis42 Jan 2, 2025
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
67 changes: 31 additions & 36 deletions core/ext/uuid.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::ExtFunc;
use crate::{
types::{LimboText, OwnedValue},
Database, LimboError,
Database, LimboError, Value,
};
use std::rc::Rc;
use uuid::{ContextV7, Timestamp, Uuid};
Expand All @@ -19,7 +19,6 @@ impl UuidFunc {
pub fn resolve_function(name: &str, num_args: usize) -> Option<ExtFunc> {
match name {
"uuid4_str" => Some(ExtFunc::Uuid(Self::Uuid4Str)),
"uuid7" if num_args < 2 => Some(ExtFunc::Uuid(Self::Uuid7)),
"uuid_str" if num_args == 1 => Some(ExtFunc::Uuid(Self::UuidStr)),
"uuid_blob" if num_args == 1 => Some(ExtFunc::Uuid(Self::UuidBlob)),
"uuid7_timestamp_ms" if num_args == 1 => Some(ExtFunc::Uuid(Self::Uuid7TS)),
Expand All @@ -42,29 +41,30 @@ impl std::fmt::Display for UuidFunc {
}
}

pub fn exec_uuid(var: &UuidFunc, sec: Option<&OwnedValue>) -> crate::Result<OwnedValue> {
pub fn exec_uuid(var: &UuidFunc, _sec: Option<&OwnedValue>) -> crate::Result<OwnedValue> {
match var {
UuidFunc::Uuid4Str => Ok(OwnedValue::Text(LimboText::new(Rc::new(
Uuid::new_v4().to_string(),
)))),
UuidFunc::Uuid7 => {
let uuid = match sec {
Some(OwnedValue::Integer(ref seconds)) => {
let ctx = ContextV7::new();
if *seconds < 0 {
// not valid unix timestamp, error or null?
return Ok(OwnedValue::Null);
}
Uuid::new_v7(Timestamp::from_unix(ctx, *seconds as u64, 0))
}
_ => Uuid::now_v7(),
};
Ok(OwnedValue::Blob(Rc::new(uuid.into_bytes().to_vec())))
}
_ => unreachable!(),
}
}

pub fn exec_uuid7(sec: Option<&[Value]>) -> crate::Result<OwnedValue> {
let uuid = match sec {
Some([Value::Integer(ref seconds)]) => {
let ctx = ContextV7::new();
if *seconds < 0 {
// not valid unix timestamp, error or null?
return Ok(OwnedValue::Null);
}
Uuid::new_v7(Timestamp::from_unix(ctx, *seconds as u64, 0))
}
_ => Uuid::now_v7(),
};
Ok(OwnedValue::Blob(Rc::new(uuid.into_bytes().to_vec())))
}

pub fn exec_uuid4() -> crate::Result<OwnedValue> {
Ok(OwnedValue::Blob(Rc::new(
Uuid::new_v4().into_bytes().to_vec(),
Expand Down Expand Up @@ -138,13 +138,13 @@ fn uuid_to_unix(uuid: &[u8; 16]) -> u64 {

pub fn init(db: &mut Database) {
db.define_scalar_function("uuid4", |_args| exec_uuid4());
db.define_scalar_function("uuid7", |sec| exec_uuid7(sec));
}

#[cfg(test)]
#[cfg(feature = "uuid")]
pub mod test {
use super::UuidFunc;
use crate::types::OwnedValue;
use crate::{types::OwnedValue, Value};
#[test]
fn test_exec_uuid_v4blob() {
use super::exec_uuid4;
Expand Down Expand Up @@ -180,10 +180,9 @@ pub mod test {

#[test]
fn test_exec_uuid_v7_now() {
use super::{exec_uuid, UuidFunc};
use super::exec_uuid7;
use uuid::Uuid;
let func = UuidFunc::Uuid7;
let owned_val = exec_uuid(&func, None);
let owned_val = exec_uuid7(None);
match owned_val {
Ok(OwnedValue::Blob(blob)) => {
assert_eq!(blob.len(), 16);
Expand All @@ -197,10 +196,9 @@ pub mod test {

#[test]
fn test_exec_uuid_v7_with_input() {
use super::{exec_uuid, UuidFunc};
use super::exec_uuid7;
use uuid::Uuid;
let func = UuidFunc::Uuid7;
let owned_val = exec_uuid(&func, Some(&OwnedValue::Integer(946702800)));
let owned_val = exec_uuid7(Some(&[Value::Integer(946702800)]));
match owned_val {
Ok(OwnedValue::Blob(blob)) => {
assert_eq!(blob.len(), 16);
Expand All @@ -214,10 +212,9 @@ pub mod test {

#[test]
fn test_exec_uuid_v7_now_to_timestamp() {
use super::{exec_ts_from_uuid7, exec_uuid, UuidFunc};
use super::{exec_ts_from_uuid7, exec_uuid7};
use uuid::Uuid;
let func = UuidFunc::Uuid7;
let owned_val = exec_uuid(&func, None);
let owned_val = exec_uuid7(None);
match owned_val {
Ok(OwnedValue::Blob(ref blob)) => {
assert_eq!(blob.len(), 16);
Expand All @@ -240,10 +237,9 @@ pub mod test {

#[test]
fn test_exec_uuid_v7_to_timestamp() {
use super::{exec_ts_from_uuid7, exec_uuid, UuidFunc};
use super::{exec_ts_from_uuid7, exec_uuid7};
use uuid::Uuid;
let func = UuidFunc::Uuid7;
let owned_val = exec_uuid(&func, Some(&OwnedValue::Integer(946702800)));
let owned_val = exec_uuid7(Some(&[Value::Integer(946702800)]));
match owned_val {
Ok(OwnedValue::Blob(ref blob)) => {
assert_eq!(blob.len(), 16);
Expand Down Expand Up @@ -286,11 +282,11 @@ pub mod test {

#[test]
fn test_exec_uuid_v7_str_to_blob() {
use super::{exec_uuid, exec_uuidblob, exec_uuidstr, UuidFunc};
use super::{exec_uuid7, exec_uuidblob, exec_uuidstr};
use uuid::Uuid;
// convert a v7 blob to a string then back to a blob
let owned_val = exec_uuidblob(
&exec_uuidstr(&exec_uuid(&UuidFunc::Uuid7, None).expect("uuid v7 blob to generate"))
&exec_uuidstr(&exec_uuid7(None).expect("uuid v7 blob to generate"))
.expect("uuid v7 string to generate"),
);
match owned_val {
Expand Down Expand Up @@ -323,12 +319,11 @@ pub mod test {

#[test]
fn test_exec_uuid_v7_blob_to_str() {
use super::{exec_uuid, exec_uuidstr};
use super::{exec_uuid7, exec_uuidstr};
use uuid::Uuid;
// convert a v7 blob to a string
let owned_val = exec_uuidstr(
&exec_uuid(&UuidFunc::Uuid7, Some(&OwnedValue::Integer(123456789)))
.expect("uuid v7 blob to generate"),
&exec_uuid7(Some(&[Value::Integer(123456789)])).expect("uuid v7 blob to generate"),
);
match owned_val {
Ok(OwnedValue::Text(v7str)) => {
Expand Down
3 changes: 2 additions & 1 deletion core/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ use std::rc::Rc;

pub struct ExternalFunc {
pub name: String,
pub func: Box<dyn Fn(&[crate::types::Value]) -> crate::Result<crate::types::OwnedValue>>,
pub func:
Box<dyn Fn(Option<&[crate::types::Value]>) -> crate::Result<crate::types::OwnedValue>>,
}

impl Debug for ExternalFunc {
Expand Down
2 changes: 1 addition & 1 deletion core/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ impl Database {
pub fn define_scalar_function<S: AsRef<str>>(
&self,
name: S,
func: impl Fn(&[Value]) -> Result<OwnedValue> + 'static,
func: impl Fn(Option<&[Value]>) -> Result<OwnedValue> + 'static,
) {
let func = function::ExternalFunc {
name: name.as_ref().to_string(),
Expand Down
2 changes: 1 addition & 1 deletion core/vdbe/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,7 +1601,7 @@ impl Program {
_ => unreachable!(), // when more extension types are added
},
crate::function::Func::External(f) => {
let result = (f.func)(&[])?;
let result = (f.func)(None)?;
state.registers[*dest] = result;
}
crate::function::Func::Math(math_func) => match math_func.arity() {
Expand Down
Loading