yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12632 from JimMoen/EMQX-11929/rule-func/data-to-ts-leap-year 

fix(calendar): leap year time to unix timestamp
This commit is contained in:
JianBo He 2024-03-04 17:41:49 +08:00 committed by GitHub
parent aa4b8f0b6d 0a33f9d027
commit 782d6f59d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl
View File

@ -1048,6 +1048,7 @@ t_parse_date_errors(_) ->
), ),
%% Compatibility test %% Compatibility test
%% UTC+0
UnixTs = 1653561612, UnixTs = 1653561612,
?assertEqual( ?assertEqual(
UnixTs, UnixTs,
@ -1062,6 +1063,27 @@ t_parse_date_errors(_) ->
?assertEqual( ?assertEqual(
UnixTs, UnixTs,
emqx_rule_funcs:date_to_unix_ts(second, <<"%Y-%m-%d %H:%M:%S">>, <<"2022-05-26 10-40-12">>) emqx_rule_funcs:date_to_unix_ts(second, <<"%Y-%m-%d %H:%M:%S">>, <<"2022-05-26 10-40-12">>)
),
%% UTC+0
UnixTsLeap0 = 1582986700,
?assertEqual(
UnixTsLeap0,
emqx_rule_funcs:date_to_unix_ts(second, <<"%Y-%m-%d %H:%M:%S">>, <<"2020-02-29 14:31:40">>)
),
%% UTC+0
UnixTsLeap1 = 1709297071,
?assertEqual(
UnixTsLeap1,
emqx_rule_funcs:date_to_unix_ts(second, <<"%Y-%m-%d %H:%M:%S">>, <<"2024-03-01 12:44:31">>)
),
%% UTC+0
UnixTsLeap2 = 1709535387,
?assertEqual(
UnixTsLeap2,
emqx_rule_funcs:date_to_unix_ts(second, <<"%Y-%m-%d %H:%M:%S">>, <<"2024-03-04 06:56:27">>)
). ).
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------

11
apps/emqx_utils/src/emqx_utils_calendar.erl
View File

@ -478,7 +478,8 @@ do_parse(DateStr, Unit, Formatter) ->
(year, V, Res) -> (year, V, Res) ->
Res + dy(V) * ?SECONDS_PER_DAY * Precise - (?SECONDS_FROM_0_TO_1970 * Precise); Res + dy(V) * ?SECONDS_PER_DAY * Precise - (?SECONDS_FROM_0_TO_1970 * Precise);
(month, V, Res) -> (month, V, Res) ->
Res + dm(V) * ?SECONDS_PER_DAY * Precise; Dm = dym(maps:get(year, DateInfo, 0), V),
Res + Dm * ?SECONDS_PER_DAY * Precise;
(day, V, Res) -> (day, V, Res) ->
Res + (V * ?SECONDS_PER_DAY * Precise); Res + (V * ?SECONDS_PER_DAY * Precise);
(hour, V, Res) -> (hour, V, Res) ->
@ -563,6 +564,14 @@ date_size(timezone) -> 5;
date_size(timezone1) -> 6; date_size(timezone1) -> 6;
date_size(timezone2) -> 9. date_size(timezone2) -> 9.
dym(Y, M) ->
case is_leap_year(Y) of
true when M > 2 ->
dm(M) + 1;
_ ->
dm(M)
end.
dm(1) -> 0; dm(1) -> 0;
dm(2) -> 31; dm(2) -> 31;
dm(3) -> 59; dm(3) -> 59;

1
changes/ce/fix-12632.en.md Normal file
View File

@ -0,0 +1 @@
Fix incorrect results from rule SQL built-in function `date_to_unix_ts` after March on leap years.