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

fix(rules): parse outputs failed

This commit is contained in:
Shawn 2021-09-26 15:29:27 +08:00
parent 420ccf0f51
commit 0d26e50e87
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ do_create_rule(Params = #{id := RuleId, sql := Sql, outputs := Outputs}) ->
ok = emqx_rule_registry:add_rule(Rule), ok = emqx_rule_registry:add_rule(Rule),
_ = emqx_plugin_libs_rule:cluster_call(emqx_rule_metrics, create_rule_metrics, [RuleId]), _ = emqx_plugin_libs_rule:cluster_call(emqx_rule_metrics, create_rule_metrics, [RuleId]),
{ok, Rule}; {ok, Rule};
Reason -> {error, Reason} {error, Reason} -> {error, Reason}
end. end.
parse_outputs(Outputs) -> parse_outputs(Outputs) ->
@ -97,8 +97,9 @@ do_parse_outputs(#{type := bridge, target := ChId}) ->
do_parse_outputs(#{type := builtin, target := Repub, args := Args}) do_parse_outputs(#{type := builtin, target := Repub, args := Args})
when Repub == republish; Repub == <<"republish">> -> when Repub == republish; Repub == <<"republish">> ->
#{type => builtin, target => republish, args => pre_process_repub_args(Args)}; #{type => builtin, target => republish, args => pre_process_repub_args(Args)};
do_parse_outputs(#{type := builtin, target := Name} = Output) -> do_parse_outputs(#{type := Type, target := Name} = Output)
#{type => builtin, target => Name, args => maps:get(args, Output, #{})}. when Type == func; Type == builtin ->
#{type => Type, target => Name, args => maps:get(args, Output, #{})}.
pre_process_repub_args(#{<<"topic">> := Topic} = Args) -> pre_process_repub_args(#{<<"topic">> := Topic} = Args) ->
QoS = maps:get(<<"qos">>, Args, <<"${qos}">>), QoS = maps:get(<<"qos">>, Args, <<"${qos}">>),

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

@ -323,7 +323,7 @@ format_output(Outputs) ->
[do_format_output(Out) || Out <- Outputs]. [do_format_output(Out) || Out <- Outputs].
do_format_output(#{type := func}) -> do_format_output(#{type := func}) ->
#{type => builtin, target => <<"internal_function">>}; #{type => func, target => <<"internal_function">>};
do_format_output(#{type := builtin, target := Name, args := Args}) -> do_format_output(#{type := builtin, target := Name, args := Args}) ->
#{type => builtin, target => Name, args => maps:remove(preprocessed_tmpl, Args)}; #{type => builtin, target => Name, args => maps:remove(preprocessed_tmpl, Args)};
do_format_output(#{type := bridge, target := Name}) -> do_format_output(#{type := bridge, target := Name}) ->

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

@ -53,8 +53,7 @@
-dialyzer({nowarn_function, [parse/1]}). -dialyzer({nowarn_function, [parse/1]}).
%% Parse one select statement. %% Parse one select statement.
-spec(parse(string() | binary()) -spec(parse(string() | binary()) -> {ok, select()} | {error, term()}).
-> {ok, select()} | {parse_error, term()} | {lex_error, term()}).
parse(Sql) -> parse(Sql) ->
try case rulesql:parsetree(Sql) of try case rulesql:parsetree(Sql) of
{ok, {select, Clauses}} -> {ok, {select, Clauses}} ->
@ -75,11 +74,11 @@ parse(Sql) ->
from = get_value(from, Clauses), from = get_value(from, Clauses),
where = get_value(where, Clauses) where = get_value(where, Clauses)
}}; }};
Error -> Error {error, Error} -> {error, Error}
end end
catch catch
_Error:Reason:StackTrace -> _Error:Reason:StackTrace ->
{parse_error, {Reason, StackTrace}} {error, {Reason, StackTrace}}
end. end.
-spec(select_fields(select()) -> list(field())). -spec(select_fields(select()) -> list(field())).

2
apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl
View File

@ -203,7 +203,7 @@ t_crud_rule_api(_Config) ->
{201, Rule} = emqx_rule_engine_api:crud_rules(post, #{body => Params0}), {201, Rule} = emqx_rule_engine_api:crud_rules(post, #{body => Params0}),
?assertEqual(RuleID, maps:get(id, Rule)), ?assertEqual(RuleID, maps:get(id, Rule)),
{ok, Rules} = emqx_rule_engine_api:crud_rules(get, #{}), {200, Rules} = emqx_rule_engine_api:crud_rules(get, #{}),
ct:pal("RList : ~p", [Rules]), ct:pal("RList : ~p", [Rules]),
?assert(length(Rules) > 0), ?assert(length(Rules) > 0),