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

Jump to bottom

coprocessor/dag/expr: AddDurationAndDuration #3984

Merged
merged 7 commits into from
Jan 2, 2019
Merged

coprocessor/dag/expr: AddDurationAndDuration #3984

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0412c06
partial
GinYM Dec 27, 2018
c9ca738
push down AddDurationAndDuration
GinYM Dec 27, 2018
d6bb302
AddDurationAndDuration resolve conflicts
GinYM Dec 27, 2018
383639c
Add #[inline]
GinYM Dec 27, 2018
5db1eea
resolve conflicts
GinYM Dec 29, 2018
450b5ac
resolve conflict
GinYM Dec 29, 2018
99d2b76
Merge branch 'master' into AddDurationAndDuration
Hoverbear Dec 31, 2018
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
87 changes: 87 additions & 0 deletions src/coprocessor/dag/expr/builtin_time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,25 @@ impl ScalarFunc {
.num_days();
Ok(Some(days_diff))
}

#[inline]
pub fn add_duration_and_duration<'a, 'b: 'a>(
&'b self,
ctx: &mut EvalContext,
row: &'a [Datum],
) -> Result<Option<Cow<'a, MyDuration>>> {
let d0: Cow<'a, MyDuration> = try_opt!(self.children[0].eval_duration(ctx, row));
let d1: Cow<'a, MyDuration> = try_opt!(self.children[1].eval_duration(ctx, row));
let add = match d0.to_nanos().checked_add(d1.to_nanos()) {
Some(result) => result,
None => return Err(box_err!("add duration {} and duration {} overflow", d0, d1)),
};
let res = match MyDuration::from_nanos(add, d0.get_fsp().max(d1.get_fsp()) as i8) {
Ok(result) => result,
Err(e) => return Err(e),
};
Ok(Some(Cow::Owned(res)))
}
}

#[cfg(test)]
Expand Down Expand Up @@ -1231,4 +1250,72 @@ mod tests {

test_err_case_two_arg(&mut ctx, ScalarFuncSig::DateDiff, Datum::Null, Datum::Null);
}

#[test]
fn test_add_duration_and_duration() {
let cases = vec![
("01:00:00.999999", "02:00:00.999998", "03:00:01.999997"),
("23:59:59", "00:00:01", "24:00:00"),
("235959", "00:00:01", "24:00:00"),
("110:00:00", "1 02:00:00", "136:00:00"),
("-110:00:00", "1 02:00:00", "-84:00:00"),
("00:00:01", "-00:00:01", "00:00:00"),
("00:00:03", "-00:00:01", "00:00:02"),
];
let mut ctx = EvalContext::default();
for (arg1, arg2, exp) in cases {
test_ok_case_two_arg(
&mut ctx,
ScalarFuncSig::AddDurationAndDuration,
Datum::Dur(Duration::parse(arg1.as_ref(), 6).unwrap()),
Datum::Dur(Duration::parse(arg2.as_ref(), 6).unwrap()),
Datum::Dur(Duration::parse(exp.as_ref(), 6).unwrap()),
);
}

let zero_duration = Datum::Dur(Duration::zero());
let cases = vec![
(
Datum::Dur(Duration::parse(b"1 01:00:00", 6).unwrap()),
Datum::Null,
Datum::Null,
),
(
Datum::Null,
Datum::Dur(Duration::parse(b"11:30:45.123456", 6).unwrap()),
Datum::Null,
),
(Datum::Null, Datum::Null, Datum::Null),
(
zero_duration.clone(),
zero_duration.clone(),
zero_duration.clone(),
),
(
zero_duration.clone(),
Datum::Dur(Duration::parse(b"01:00:00", 6).unwrap()),
Datum::Dur(Duration::parse(b"01:00:00", 6).unwrap()),
),
(
Datum::Dur(Duration::parse(b"01:00:00", 6).unwrap()),
zero_duration.clone(),
Datum::Dur(Duration::parse(b"01:00:00", 6).unwrap()),
),
(
Datum::Dur(Duration::parse(b"01:00:00", 6).unwrap()),
Datum::Dur(Duration::parse(b"-01:00:00", 6).unwrap()),
zero_duration.clone(),
),
];
for (arg1, arg2, exp) in cases {
test_ok_case_two_arg(
&mut ctx,
ScalarFuncSig::AddDurationAndDuration,
arg1,
arg2,
exp,
);
}
}

}
5 changes: 3 additions & 2 deletions src/coprocessor/dag/expr/scalar_function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ impl ScalarFunc {
| ScalarFuncSig::Substring2Args
| ScalarFuncSig::SubstringBinary2Args
| ScalarFuncSig::DateDiff
| ScalarFuncSig::AddDurationAndDuration
| ScalarFuncSig::Strcmp => (2, 2),

ScalarFuncSig::CastIntAsInt
Expand Down Expand Up @@ -364,7 +365,6 @@ impl ScalarFunc {
| ScalarFuncSig::AddDateStringDecimal
| ScalarFuncSig::AddDateStringInt
| ScalarFuncSig::AddDateStringString
| ScalarFuncSig::AddDurationAndDuration
| ScalarFuncSig::AddDurationAndString
| ScalarFuncSig::AddStringAndDuration
| ScalarFuncSig::AddStringAndString
Expand Down Expand Up @@ -1017,6 +1017,8 @@ dispatch_call! {

CoalesceDuration => coalesce_duration,
CaseWhenDuration => case_when_duration,

AddDurationAndDuration => add_duration_and_duration,
}
JSON_CALLS {
CastIntAsJson => cast_int_as_json,
Expand Down Expand Up @@ -1430,7 +1432,6 @@ mod tests {
ScalarFuncSig::AddDateStringDecimal,
ScalarFuncSig::AddDateStringInt,
ScalarFuncSig::AddDateStringString,
ScalarFuncSig::AddDurationAndDuration,
ScalarFuncSig::AddDurationAndString,
ScalarFuncSig::AddStringAndDuration,
ScalarFuncSig::AddStringAndString,
Expand Down