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

Merge pull request #9721 from zhongwencool/fix-elvis-warning 

fix: elvis warning
This commit is contained in:
zhongwencool 2023-01-11 17:34:33 +08:00 committed by GitHub
parent 677265bec2 fdc0682c3f
commit fb54f56ad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/emqx/src/emqx_session_router.erl
View File

@ -71,24 +71,15 @@
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
create_router_tab(disc) -> create_router_tab(disc) ->
ok = mria:create_table(?ROUTE_DISC_TAB, [ create_table(?ROUTE_DISC_TAB, disc_copies);
{type, bag},
{rlog_shard, ?ROUTE_SHARD},
{storage, disc_copies},
{record_name, route},
{attributes, record_info(fields, route)},
{storage_properties, [
{ets, [
{read_concurrency, true},
{write_concurrency, true}
]}
]}
]);
create_router_tab(ram) -> create_router_tab(ram) ->
ok = mria:create_table(?ROUTE_RAM_TAB, [ create_table(?ROUTE_RAM_TAB, ram_copies).
create_table(Tab, Storage) ->
ok = mria:create_table(Tab, [
{type, bag}, {type, bag},
{rlog_shard, ?ROUTE_SHARD}, {rlog_shard, ?ROUTE_SHARD},
{storage, ram_copies}, {storage, Storage},
{record_name, route}, {record_name, route},
{attributes, record_info(fields, route)}, {attributes, record_info(fields, route)},
{storage_properties, [ {storage_properties, [

28
apps/emqx_rule_engine/src/emqx_rule_date.erl
View File

@ -88,20 +88,20 @@ parse_date(TimeUnit, Offset, FormatString, InputString) ->
calendar:rfc3339_to_system_time(Str, [{unit, TimeUnit}]). calendar:rfc3339_to_system_time(Str, [{unit, TimeUnit}]).
mlist(R) -> mlist(R) ->
%% %H Shows hour in 24-hour format [15] %% %H Shows hour in 24-hour format [15]
[ [
{$H, R#result.hour}, {$H, R#result.hour},
%% %M Displays minutes [00-59] %% %M Displays minutes [00-59]
{$M, R#result.minute}, {$M, R#result.minute},
%% %S Displays seconds [00-59] %% %S Displays seconds [00-59]
{$S, R#result.second}, {$S, R#result.second},
%% %y Displays year YYYY [2021] %% %y Displays year YYYY [2021]
{$y, R#result.year}, {$y, R#result.year},
%% %m Displays the number of the month [01-12] %% %m Displays the number of the month [01-12]
{$m, R#result.month}, {$m, R#result.month},
%% %d Displays the number of the month [01-12] %% %d Displays the number of the month [01-12]
{$d, R#result.day}, {$d, R#result.day},
%% %Z Displays Time zone %% %Z Displays Time zone
{$Z, R#result.zone} {$Z, R#result.zone}
]. ].
@ -223,20 +223,20 @@ parse_zone(Input) ->
mlist1() -> mlist1() ->
maps:from_list( maps:from_list(
%% %H Shows hour in 24-hour format [15] %% %H Shows hour in 24-hour format [15]
[ [
{$H, fun(Input) -> parse_int_times(2, Input) end}, {$H, fun(Input) -> parse_int_times(2, Input) end},
%% %M Displays minutes [00-59] %% %M Displays minutes [00-59]
{$M, fun(Input) -> parse_int_times(2, Input) end}, {$M, fun(Input) -> parse_int_times(2, Input) end},
%% %S Displays seconds [00-59] %% %S Displays seconds [00-59]
{$S, fun(Input) -> parse_second(Input) end}, {$S, fun(Input) -> parse_second(Input) end},
%% %y Displays year YYYY [2021] %% %y Displays year YYYY [2021]
{$y, fun(Input) -> parse_int_times(4, Input) end}, {$y, fun(Input) -> parse_int_times(4, Input) end},
%% %m Displays the number of the month [01-12] %% %m Displays the number of the month [01-12]
{$m, fun(Input) -> parse_int_times(2, Input) end}, {$m, fun(Input) -> parse_int_times(2, Input) end},
%% %d Displays the number of the month [01-12] %% %d Displays the number of the month [01-12]
{$d, fun(Input) -> parse_int_times(2, Input) end}, {$d, fun(Input) -> parse_int_times(2, Input) end},
%% %Z Displays Time zone %% %Z Displays Time zone
{$Z, fun(Input) -> parse_zone(Input) end} {$Z, fun(Input) -> parse_zone(Input) end}
] ]
). ).

4
deploy/charts/emqx/Chart.yaml
View File

@ -14,8 +14,8 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
version: 5.0.13 version: 5.0.14
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: 5.0.13 appVersion: 5.0.14