Add array::shuffle function ()

This commit is contained in:
David Bottiau 2024-05-15 10:56:46 +02:00 committed by GitHub
parent 51aea4ff8f
commit 97ce910832
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 53 additions and 0 deletions
core/src
fnc
array.rsmod.rs
script/modules/surrealdb/functions
syn/parser
lib

View file

@ -12,6 +12,8 @@ use crate::sql::array::Union;
use crate::sql::array::Uniq;
use crate::sql::value::Value;
use rand::prelude::SliceRandom;
pub fn add((mut array, value): (Array, Value)) -> Result<Value, Error> {
match value {
Value::Array(value) => {
@ -331,6 +333,12 @@ pub fn reverse((mut array,): (Array,)) -> Result<Value, Error> {
Ok(array.into())
}
pub fn shuffle((mut array,): (Array,)) -> Result<Value, Error> {
let mut rng = rand::thread_rng();
array.0.shuffle(&mut rng);
Ok(array.into())
}
pub fn slice((array, beg, lim): (Array, Option<isize>, Option<isize>)) -> Result<Value, Error> {
let skip = match beg {
Some(v) if v < 0 => array.len().saturating_sub(v.unsigned_abs()),

View file

@ -125,6 +125,7 @@ pub fn synchronous(ctx: &Context<'_>, name: &str, args: Vec<Value>) -> Result<Va
"array::push" => array::push,
"array::remove" => array::remove,
"array::reverse" => array::reverse,
"array::shuffle" => array::shuffle,
"array::slice" => array::slice,
"array::sort" => array::sort,
"array::transpose" => array::transpose,

View file

@ -45,6 +45,7 @@ impl_module_def!(
"prepend" => run,
"remove" => run,
"reverse" => run,
"shuffle" => run,
"slice" => run,
"sort" => (sort::Package),
"transpose" => run,

View file

@ -115,6 +115,7 @@ pub(crate) static PATHS: phf::Map<UniCase<&'static str>, PathKind> = phf_map! {
UniCase::ascii("array::push") => PathKind::Function,
UniCase::ascii("array::remove") => PathKind::Function,
UniCase::ascii("array::reverse") => PathKind::Function,
UniCase::ascii("array::shuffle") => PathKind::Function,
UniCase::ascii("array::slice") => PathKind::Function,
UniCase::ascii("array::sort") => PathKind::Function,
UniCase::ascii("array::transpose") => PathKind::Function,

View file

@ -184,6 +184,7 @@
"array::push("
"array::remove("
"array::reverse("
"array::shuffle("
"array::slice("
"array::sort("
"array::sort::asc("

View file

@ -184,6 +184,7 @@
"array::push("
"array::remove("
"array::reverse("
"array::shuffle("
"array::slice("
"array::sort("
"array::sort::asc("

View file

@ -1050,6 +1050,46 @@ async fn function_array_reverse() -> Result<(), Error> {
Ok(())
}
#[tokio::test]
async fn function_array_shuffle() -> Result<(), Error> {
let sql = r#"
RETURN array::shuffle([]);
RETURN array::shuffle(3);
RETURN array::shuffle([4]);
RETURN array::shuffle([1,1,1]);
RETURN array::shuffle([1,2,"text",3,3,4]); // find a way to check randomness
"#;
let dbs = new_ds().await?;
let ses = Session::owner().with_ns("test").with_db("test");
let res = &mut dbs.execute(sql, &ses, None).await?;
assert_eq!(res.len(), 5);
//
let tmp = res.remove(0).result?;
let val = Value::parse("[]");
assert_eq!(tmp, val);
//
let tmp = res.remove(0).result;
assert!(
matches!(
&tmp,
Err(e) if e.to_string() == "Incorrect arguments for function array::shuffle(). Argument 1 was the wrong type. Expected a array but found 3"
),
"{tmp:?}"
);
//
let tmp = res.remove(0).result?;
let val = Value::parse("[4]");
assert_eq!(tmp, val);
//
let tmp = res.remove(0).result?;
let val = Value::parse("[1,1,1]");
assert_eq!(tmp, val);
//
let _ = res.remove(0).result?;
//
Ok(())
}
#[tokio::test]
async fn function_array_slice() -> Result<(), Error> {
let sql = r#"