Skip to content

branch-3.1:[fix](function)fix month=0 of from_iso8601_date function. (#53050) #53308

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
morrySnow merged 3 commits into from
Jul 18, 2025
Merged

branch-3.1:[fix](function)fix month=0 of from_iso8601_date function. (#53050) #53308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
831cb4f
[fix](function)fix month=0 of from_iso8601_date function. (#53050)
hubgeter Jul 14, 2025
10dd210
fix
hubgeter Jul 16, 2025
d275d0e
fix
hubgeter Jul 17, 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
7 changes: 6 additions & 1 deletion be/src/vec/runtime/vdatetime_value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,13 +1211,18 @@ class DateV2Value {
}
date_v2_value_.year_ = val;
} else if constexpr (unit == TimeUnit::MONTH) {
if (val > MAX_MONTH) [[unlikely]] {
DCHECK(date_v2_value_.year_ <= MAX_YEAR);
if (val > MAX_MONTH || val == 0) [[unlikely]] {
return false;
}
date_v2_value_.month_ = val;
} else if constexpr (unit == TimeUnit::DAY) {
DCHECK(date_v2_value_.year_ <= MAX_YEAR);
DCHECK(date_v2_value_.month_ <= MAX_MONTH);
DCHECK(date_v2_value_.month_ != 0);
if (val == 0) [[unlikely]] {
return false;
}
if (val > S_DAYS_IN_MONTH[date_v2_value_.month_] &&
!(is_leap(date_v2_value_.year_) && date_v2_value_.month_ == 2 && val == 29)) {
return false;
Expand Down
73 changes: 73 additions & 0 deletions be/test/vec/function/function_time_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1892,4 +1892,77 @@ TEST(VTimestampFunctionsTest, next_day_test) {
data_set));
}
}

TEST(VTimestampFunctionsTest, from_iso8601_date) {
std::string func_name = "from_iso8601_date";
InputTypeSet input_types = {TypeIndex::String};

DataSet data_set = {
{{std::string("2020-01-01")}, str_to_date_v2("2020-01-01", "%Y-%m-%d")},
{{std::string("2020-01-01")}, str_to_date_v2("2020-01-01", "%Y-%m-%d")},
{{std::string("-1")}, Null()},
{{std::string("2025-07-11")}, str_to_date_v2("2025-07-11", "%Y-%m-%d")},
{{std::string("2024-02-29")}, str_to_date_v2("2024-02-29", "%Y-%m-%d")},
{{std::string("2025-02-29")}, Null()},
{{std::string("2025-13-01")}, Null()},
{{std::string("2020-W10")}, str_to_date_v2("2020-03-02", "%Y-%m-%d")},
{{std::string("2025-W28")}, str_to_date_v2("2025-07-07", "%Y-%m-%d")},
{{std::string("2025-W53")}, str_to_date_v2("2025-12-29", "%Y-%m-%d")},
{{std::string("2025-W00")}, Null()},
{{std::string("2020-123")}, str_to_date_v2("2020-05-02", "%Y-%m-%d")},
{{std::string("2025-192")}, str_to_date_v2("2025-07-11", "%Y-%m-%d")},
{{std::string("2024-366")}, str_to_date_v2("2024-12-31", "%Y-%m-%d")},
{{std::string("2025-366")}, Null()},
{{std::string("2025-000")}, str_to_date_v2("2024-12-31", "%Y-%m-%d")},
{{std::string("2025/07/11")}, Null()},
{{std::string("25-07-11")}, Null()},
{{std::string("2025-7-11")}, Null()},
{{std::string("invalid-date")}, Null()},
{{std::string("2025-07-11T12:34:56")}, Null()},
{{std::string("-1")}, Null()},
{{std::string("9999-12-31")}, str_to_date_v2("9999-12-31", "%Y-%m-%d")},
{{std::string("10000-01-01")}, Null()},
{{std::string("0001-01-01")}, str_to_date_v2("0001-01-01", "%Y-%m-%d")},
{{std::string("0000-12-31")}, str_to_date_v2("0000-12-31", "%Y-%m-%d")},
{{std::string("-0001-01-01")}, Null()},
{{std::string("2025-01-01")}, str_to_date_v2("2025-01-01", "%Y-%m-%d")},
{{std::string("2025-12-31")}, str_to_date_v2("2025-12-31", "%Y-%m-%d")},
{{std::string("2025-00-01")}, Null()},
{{std::string("2025-13-01")}, Null()},
{{std::string("2025--01-01")}, Null()},
{{std::string("2025-01-31")}, str_to_date_v2("2025-01-31", "%Y-%m-%d")},
{{std::string("2025-04-30")}, str_to_date_v2("2025-04-30", "%Y-%m-%d")},
{{std::string("2025-02-28")}, str_to_date_v2("2025-02-28", "%Y-%m-%d")},
{{std::string("2024-02-29")}, str_to_date_v2("2024-02-29", "%Y-%m-%d")},
{{std::string("2025-01-32")}, Null()},
{{std::string("2025-04-31")}, Null()},
{{std::string("2025-02-29")}, Null()},
{{std::string("2025-02-30")}, Null()},
{{std::string("2025-01-00")}, Null()},
{{std::string("2025-01--01")}, Null()},
{{std::string("2000-02-29")}, str_to_date_v2("2000-02-29", "%Y-%m-%d")},
{{std::string("2024-02-29")}, str_to_date_v2("2024-02-29", "%Y-%m-%d")},
{{std::string("1900-02-29")}, Null()},
{{std::string("2100-02-29")}, Null()},
{{std::string("2025-02-29")}, Null()},
{{std::string("-2025-01-01")}, Null()},
{{std::string("2025--07-01")}, Null()},
{{std::string("2025-07--01")}, Null()},
{{std::string("")}, Null()},
{{std::string("2025")}, str_to_date_v2("2025-01-01", "%Y-%m-%d")},
{{std::string("2025-07")}, str_to_date_v2("2025-07-01", "%Y-%m-%d")},
{{std::string("99999-01-01")}, Null()},
{{std::string("2025-123-01")}, Null()},
{{std::string("2025-01-123")}, Null()},
{{std::string("2025/01/01")}, Null()},
{{std::string("2025.01.01")}, Null()},
{{std::string("2025-01-01X")}, Null()},
{{std::string("2025--01--01")}, Null()},
{{std::string("abcd-01-01")}, Null()},
{{std::string("2025-ab-01")}, Null()},
{{std::string("2025-01-ab")}, Null()},
};

static_cast<void>(check_function<DataTypeDateV2, true>(func_name, input_types, data_set));
}
} // namespace doris::vectorized
52 changes: 52 additions & 0 deletions regression-test/data/query_p0/sql_functions/datetime_functions/test_from_iso8601_date.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,3 +242,55 @@
\N
\N

-- !test_99 --
1 2023-01-01
2 2023-12-31
3 2020-02-29
4 1970-01-01
5 9999-12-31
6 1000-01-01
7 \N
8 \N
9 \N
10 \N
11 \N
12 2023-02-28
13 2024-02-29
14 \N
15 \N
16 \N
17 \N
18 \N
19 \N
20 2023-01-01
21 \N
22 \N
23 \N
24 2023-01-02
25 2023-01-01
26 \N
27 \N
28 \N
29 \N
30 \N
31 \N
32 \N
33 \N
34 \N
35 \N
36 \N
37 \N
38 \N
39 \N
40 \N
41 \N
42 \N
43 \N
44 \N
45 \N
46 \N
47 \N
48 \N
49 \N
50 \N

63 changes: 63 additions & 0 deletions ...ssion-test/suites/query_p0/sql_functions/datetime_functions/test_from_iso8601_date.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,67 @@ suite("test_from_iso8601_date") {
qt_test_87 """ select from_iso8601_date(k1),from_iso8601_date(k2),from_iso8601_date(k3),from_iso8601_date(k11),from_iso8601_date(k22),from_iso8601_date(k33) from tb2 order by k0;"""
qt_test_88 """ select from_iso8601_date(nullable(k1)),from_iso8601_date(k2),from_iso8601_date(k3),from_iso8601_date(nullable(k11)),from_iso8601_date(k22),from_iso8601_date(k33) from tb2 order by k0; """
qt_test_89 """ select from_iso8601_date(NULL) from tb2 order by k0; """


sql """
CREATE TABLE tb3 (id INT, date_str VARCHAR(255)) DISTRIBUTED BY HASH(id) BUCKETS 4 PROPERTIES ("replication_num" = "1"); """
sql """
INSERT INTO tb3 (id, date_str) VALUES
(1, '2023-01-01'),
(2, '2023-12-31'),
(3, '2020-02-29'),
(4, '1970-01-01'),
(5, '9999-12-31'),
(6, '1000-01-01'),
(7, '2023-13-01'),
(8, '2023-00-01'),
(9, '2023-01-00'),
(10, '2023-01-32'),
(11, '2023-02-29'),
(12, '2023-02-28'),
(13, '2024-02-29'),
(14, '2024-02-30'),
(15, '2023-01-01T12:00:00'),
(16, '2023-01-01 12:00:00'),
(17, '2023/01/01'),
(18, '01-01-2023'),
(19, '01/01/2023'),
(20, '20230101'),
(21, '2023-01-01Z'),
(22, '2023-01-01+08:00'),
(23, '2023-01-01-08:00'),
(24, '2023-W01-1'),
(25, '2023-001'),
(26, '2023-01-01T12:00:00.000Z'),
(27, '2023-01-01T12:00:00.000+08:00'),
(28, '2023-01-01T12:00:00.000-08:00'),
(29, '2023-01-01T12:00:00.123456Z'),
(30, '2023-01-01T12:00:00.123456+08:00'),
(31, '2023-01-01T12:00:00.123456-08:00'),
(32, '2023-01-01T24:00:00'),
(33, '2023-01-01T00:00:00.000000'),
(34, '2023-01-01T00:00:00.000001'),
(35, '2023-01-01T00:00:00.999999'),
(36, '2023-01-01T23:59:59.999999'),
(37, '2023-01-01T23:59:60'),
(38, '2023-01-01T23:59:59.9999999'),
(39, '2023-01-01T23:59:59.999999999'),
(40, '2023-01-01T23:59:59.999999999Z'),
(41, '2023-01-01T23:59:59.999999999+08:00'),
(42, '2023-01-01T23:59:59.999999999-08:00'),
(43, '2023-01-01T23:59:59.999999999999'),
(44, '2023-01-01T23:59:59.999999999999Z'),
(45, '2023-01-01T23:59:59.999999999999+08:00'),
(46, '2023-01-01T23:59:59.999999999999-08:00'),
(47, '2023-01-01T23:59:59.999999999999999'),
(48, '2023-01-01T23:59:59.999999999999999Z'),
(49, '2023-01-01T23:59:59.999999999999999+08:00'),
(50, '2023-01-01T23:59:59.999999999999999-08:00');
"""
qt_test_99 """ SELECT id, from_iso8601_date(date_str) AS result FROM tb3 order by id; """



sql """ drop table tb2 """

}
Loading