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

fix(emqx_rule_registry): Dialyzer warning

This commit is contained in:
Zaiming Shi 2020-11-10 16:38:01 +01:00
parent e58abd916c
commit a504539097
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_rule_engine/src/emqx_rule_metrics.erl
View File

@ -99,7 +99,7 @@
-record(state, { -record(state, {
metric_ids = sets:new(), metric_ids = sets:new(),
rule_speeds :: #{rule_id() => #rule_speed{}}, rule_speeds :: undefined | #{rule_id() => #rule_speed{}},
overall_rule_speed :: #rule_speed{} overall_rule_speed :: #rule_speed{}
}). }).

7
apps/emqx_rule_engine/src/emqx_rule_registry.erl
View File

@ -166,6 +166,10 @@ start_link() ->
get_rules() -> get_rules() ->
get_all_records(?RULE_TAB). get_all_records(?RULE_TAB).
%% TODO: emqx_rule_utils:can_topic_match_oneof(Topic::any(), For::atom())
%% will never return since it differs in the 2nd argument from the success
%% typing arguments: (any(), [binary() | ['' | '#' | '+' | binary()]])
-dialyzer([{nowarn_function, get_rules_for/1}]).
-spec(get_rules_for(Topic :: binary()) -> list(emqx_rule_engine:rule())). -spec(get_rules_for(Topic :: binary()) -> list(emqx_rule_engine:rule())).
get_rules_for(Topic) -> get_rules_for(Topic) ->
[Rule || Rule = #rule{for = For} <- get_rules(), [Rule || Rule = #rule{for = For} <- get_rules(),
@ -329,7 +333,8 @@ remove_resource_params(ResId) ->
%% @private %% @private
delete_resource(ResId) -> delete_resource(ResId) ->
[[ResId =:= ResId1 andalso throw({dependency_exists, {rule, Id}}) %% TODO, change to foreache:s
_ = [[ResId =:= ResId1 andalso throw({dependency_exists, {rule, Id}})
|| #action_instance{args = #{<<"$resource">> := ResId1}} <- Actions] || #action_instance{args = #{<<"$resource">> := ResId1}} <- Actions]
|| #rule{id = Id, actions = Actions} <- get_rules()], || #rule{id = Id, actions = Actions} <- get_rules()],
mnesia:delete(?RES_TAB, ResId, write). mnesia:delete(?RES_TAB, ResId, write).