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

fix(query): unsupport datetime format item should not return panic error #17323

Merged
merged 1 commit into from
Jan 19, 2025
Merged

fix(query): unsupport datetime format item should not return panic error #17323

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
27 changes: 16 additions & 11 deletions src/query/functions/src/scalars/timestamp/src/datetime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use std::io::Write;

use chrono::format::parse_and_remainder;
use chrono::format::Item;
use chrono::format::Parsed;
use chrono::format::StrftimeItems;
use chrono::prelude::*;
Expand Down Expand Up @@ -700,18 +701,22 @@ fn register_to_string(registry: &mut FunctionRegistry) {
if format.is_empty() {
output.push_null();
} else {
// Can't use `tz.timestamp_nanos(self.as_() * 1000)` directly, is may cause multiply with overflow.
let (mut secs, mut nanos) =
(micros / MICROS_PER_SEC, (micros % MICROS_PER_SEC) * 1_000);
if nanos < 0 {
secs -= 1;
nanos += 1_000_000_000;
let items = StrftimeItems::new(format);
if items.clone().any(|item| matches!(item, Item::Error)) {
ctx.set_error(output.len(), "Invalid format string".to_string());
output.push_null();
} else {
// Can't use `tz.timestamp_nanos(self.as_() * 1000)` directly, is may cause multiply with overflow.
let (mut secs, mut nanos) =
(micros / MICROS_PER_SEC, (micros % MICROS_PER_SEC) * 1_000);
if nanos < 0 {
secs -= 1;
nanos += 1_000_000_000;
}
let ts = ctx.func_ctx.tz.timestamp_opt(secs, nanos as u32).unwrap();
let res = ts.format(format).to_string();
output.push(&res);
}
let ts = ctx.func_ctx.tz.timestamp_opt(secs, nanos as u32).unwrap();
// https://github.com/BurntSushi/jiff/issues/155
// ASCII is currently required in jiff crate
let res = ts.format(format).to_string();
output.push(&res);
}
},
),
Expand Down
6 changes: 6 additions & 0 deletions tests/sqllogictests/suites/query/functions/02_0012_function_datetimes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,6 +1367,10 @@ select to_date('精彩的2022年，美丽的02month,激动の02d', '精彩的%Y
----
2022-02-02


statement error 1006
select date_format('2022-2-04T03:58:59', '%i');

statement error 1006
select date_format('', '');

Expand Down Expand Up @@ -1486,3 +1490,5 @@ query T
SELECT add_hours(to_timestamp(710455), 2147483647);
----
1000-01-01 00:00:00.000000


Loading