Skip to content

feat: dates min/max #353

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

Merged
stefan-gorules merged 1 commit into from
May 23, 2025
Merged

feat: dates min/max #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
77 changes: 66 additions & 11 deletions core/expression/src/functions/internal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,14 +212,20 @@ impl From<&InternalFunction> for Rc<dyn FunctionDefinition> {
signature: FunctionSignature::single(VT::Number.array(), VT::Number),
}),

IF::Min => Rc::new(StaticFunction {
IF::Min => Rc::new(CompositeFunction {
implementation: Rc::new(imp::min),
signature: FunctionSignature::single(VT::Number.array(), VT::Number),
signatures: vec![
FunctionSignature::single(VT::Number.array(), VT::Number),
FunctionSignature::single(VT::Date.array(), VT::Date),
],
}),

IF::Max => Rc::new(StaticFunction {
IF::Max => Rc::new(CompositeFunction {
implementation: Rc::new(imp::max),
signature: FunctionSignature::single(VT::Number.array(), VT::Number),
signatures: vec![
FunctionSignature::single(VT::Number.array(), VT::Number),
FunctionSignature::single(VT::Date.array(), VT::Date),
],
}),

IF::Median => Rc::new(StaticFunction {
Expand Down Expand Up @@ -299,7 +305,7 @@ impl From<&InternalFunction> for Rc<dyn FunctionDefinition> {
pub(crate) mod imp {
use crate::functions::arguments::Arguments;
use crate::vm::VmDate;
use crate::Variable as V;
use crate::{Variable as V, Variable};
use anyhow::{anyhow, Context};
use chrono_tz::Tz;
#[cfg(not(feature = "regex-lite"))]
Expand All @@ -323,6 +329,39 @@ pub(crate) mod imp {
.context("Expected a number array")
}

enum Either<A, B> {
Left(A),
Right(B),
}

fn __internal_number_or_date_array(
args: &Arguments,
pos: usize,
) -> anyhow::Result<Either<Vec<Decimal>, Vec<VmDate>>> {
let a = args.array(pos)?;
let arr = a.borrow();

let is_number = arr.first().map(|v| v.as_number()).flatten().is_some();
if is_number {
Ok(Either::Left(
arr.iter()
.map(|v| v.as_number())
.collect::<Option<Vec<_>>>()
.context("Expected a number array")?,
))
} else {
Ok(Either::Right(
arr.iter()
.map(|v| match v {
Variable::Dynamic(d) => d.as_date().cloned(),
_ => None,
})
.collect::<Option<Vec<_>>>()
.context("Expected a number array")?,
))
}
}

pub fn starts_with(args: Arguments) -> anyhow::Result<V> {
let a = args.str(0)?;
let b = args.str(1)?;
Expand Down Expand Up @@ -457,17 +496,33 @@ pub(crate) mod imp {
}

pub fn min(args: Arguments) -> anyhow::Result<V> {
let a = __internal_number_array(&args, 0)?;
let min = a.iter().min().context("Empty array")?;
let a = __internal_number_or_date_array(&args, 0)?;

Ok(V::Number(Decimal::from(*min)))
match a {
Either::Left(arr) => {
let max = arr.into_iter().min().context("Empty array")?;
Ok(V::Number(Decimal::from(max)))
}
Either::Right(arr) => {
let max = arr.into_iter().min().context("Empty array")?;
Ok(V::Dynamic(Rc::new(max)))
}
}
}

pub fn max(args: Arguments) -> anyhow::Result<V> {
let a = __internal_number_array(&args, 0)?;
let max = a.iter().max().context("Empty array")?;
let a = __internal_number_or_date_array(&args, 0)?;

Ok(V::Number(Decimal::from(*max)))
match a {
Either::Left(arr) => {
let max = arr.into_iter().max().context("Empty array")?;
Ok(V::Number(Decimal::from(max)))
}
Either::Right(arr) => {
let max = arr.into_iter().max().context("Empty array")?;
Ok(V::Dynamic(Rc::new(max)))
}
}
}

pub fn avg(args: Arguments) -> anyhow::Result<V> {
Expand Down
28 changes: 27 additions & 1 deletion core/expression/tests/data/date.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,30 @@ d('2023-10-31') not in (d('2023-10-01')..d('2023-10-31'));;true
d('2023-10-15') not in (d('2023-10-01')..d('2023-10-31'));;false

d('2023-10-31') not in [d('2023-10-01')..d('2023-10-31'));;true
d('2023-10-01') not in (d('2023-10-01')..d('2023-10-31')];;true
d('2023-10-01') not in (d('2023-10-01')..d('2023-10-31')];;true


min([d('2023-01-15'), d('2023-03-20'), d('2023-02-10')]);;'2023-01-15T00:00:00Z'
max([d('2023-01-15'), d('2023-03-20'), d('2023-02-10')]);;'2023-03-20T00:00:00Z'
min([d('2023-10-15'), d('2023-10-01'), d('2023-10-31')]);;'2023-10-01T00:00:00Z'
max([d('2023-10-15'), d('2023-10-01'), d('2023-10-31')]);;'2023-10-31T00:00:00Z'
min([d('2023-10-15T10:30:00Z'), d('2023-10-15T08:15:00Z'), d('2023-10-15T14:45:00Z')]);;'2023-10-15T08:15:00Z'
max([d('2023-10-15T10:30:00Z'), d('2023-10-15T08:15:00Z'), d('2023-10-15T14:45:00Z')]);;'2023-10-15T14:45:00Z'
min([d('2022-12-31'), d('2023-01-01'), d('2024-01-01')]);;'2022-12-31T00:00:00Z'
max([d('2022-12-31'), d('2023-01-01'), d('2024-01-01')]);;'2024-01-01T00:00:00Z'
min([d('2023-10-15'), d('2023-10-15'), d('2023-10-15')]);;'2023-10-15T00:00:00Z'
max([d('2023-10-15'), d('2023-10-15'), d('2023-10-15')]);;'2023-10-15T00:00:00Z'
min([d('2023-10-15')]);;'2023-10-15T00:00:00Z'
max([d('2023-10-15')]);;'2023-10-15T00:00:00Z'
min([d('2023-10-15T10:00:00Z'), d('2023-10-15T12:00:00Z')]);;'2023-10-15T10:00:00Z'
max([d('2023-10-15T10:00:00Z'), d('2023-10-15T12:00:00Z')]);;'2023-10-15T12:00:00Z'
min([d('1900-01-01'), d('2000-01-01'), d('1950-06-15')]);;'1900-01-01T00:00:00Z'
max([d('1900-01-01'), d('2000-01-01'), d('1950-06-15')]);;'2000-01-01T00:00:00Z'
min([d('2024-02-29'), d('2023-02-28'), d('2024-03-01')]);;'2023-02-28T00:00:00Z'
max([d('2024-02-29'), d('2023-02-28'), d('2024-03-01')]);;'2024-03-01T00:00:00Z'
min([d('2023-01-31'), d('2023-02-28'), d('2023-03-31')]);;'2023-01-31T00:00:00Z'
max([d('2023-01-31'), d('2023-02-28'), d('2023-03-31')]);;'2023-03-31T00:00:00Z'
min([d('2023-10-15').add(1, 'd'), d('2023-10-15').sub(1, 'd'), d('2023-10-15')]);;'2023-10-14T00:00:00Z'
max([d('2023-10-15').add(1, 'd'), d('2023-10-15').sub(1, 'd'), d('2023-10-15')]);;'2023-10-16T00:00:00Z'
min([d('2023-01-01'), d('2023-12-31')]).isBefore(d('2023-06-01'));;true
max([d('2023-01-01'), d('2023-12-31')]).isAfter(d('2023-06-01'));;true
Loading