From ea6b3c7b51404cc8abf1ac56ceb345f3209e13f2 Mon Sep 17 00:00:00 2001 From: DDDHuang <44492639+DDDHuang@users.noreply.github.com> Date: Sat, 16 Apr 2022 11:41:41 +0800 Subject: [PATCH] fix: format code --- .../src/emqx_plugin_libs_metrics.erl | 10 ++++++---- .../src/emqx_rule_engine_api.erl | 16 ++++++++-------- apps/emqx_rule_engine/src/emqx_rule_runtime.erl | 14 +++++++------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs_metrics.erl b/apps/emqx_plugin_libs/src/emqx_plugin_libs_metrics.erl index 98c4490ee..da0d0ab4f 100644 --- a/apps/emqx_plugin_libs/src/emqx_plugin_libs_metrics.erl +++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs_metrics.erl @@ -307,17 +307,19 @@ calculate_rate(CurrVal, #rate{max = MaxRate0, last_v = LastVal, %% calculate the max rate since the emqx startup MaxRate = - if MaxRate0 >= CurrRate -> MaxRate0; - true -> CurrRate + case MaxRate0 >= CurrRate of + true -> MaxRate0; + false -> CurrRate end, %% calculate the average rate in last 5 mins {Last5MinSamples, Acc5Min, Last5Min} = - if Tick =< ?SAMPCOUNT_5M -> + case Tick =< ?SAMPCOUNT_5M of + true -> Acc = AccRate5Min0 + CurrRate, {lists:reverse([CurrRate | lists:reverse(Last5MinSamples0)]), Acc, Acc / Tick}; - true -> + false -> [FirstRate | Rates] = Last5MinSamples0, Acc = AccRate5Min0 + CurrRate - FirstRate, {lists:reverse([CurrRate | lists:reverse(Rates)]), diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl index 0c83c8ccd..ff2415d5c 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl @@ -99,7 +99,7 @@ rule_info_schema() -> schema("/rules") -> #{ - operationId => '/rules', + 'operationId' => '/rules', get => #{ tags => [<<"rules">>], description => <<"List all rules">>, @@ -111,7 +111,7 @@ schema("/rules") -> tags => [<<"rules">>], description => <<"Create a new rule using given Id">>, summary => <<"Create a Rule">>, - requestBody => rule_creation_schema(), + 'requestBody' => rule_creation_schema(), responses => #{ 400 => error_schema('BAD_REQUEST', "Invalid Parameters"), 201 => rule_info_schema() @@ -120,7 +120,7 @@ schema("/rules") -> schema("/rule_events") -> #{ - operationId => '/rule_events', + 'operationId' => '/rule_events', get => #{ tags => [<<"rules">>], description => <<"List all events can be used in rules">>, @@ -133,7 +133,7 @@ schema("/rule_events") -> schema("/rules/:id") -> #{ - operationId => '/rules/:id', + 'operationId' => '/rules/:id', get => #{ tags => [<<"rules">>], description => <<"Get a rule by given Id">>, @@ -149,7 +149,7 @@ schema("/rules/:id") -> description => <<"Update a rule by given Id to all nodes in the cluster">>, summary => <<"Update a Rule">>, parameters => param_path_id(), - requestBody => rule_creation_schema(), + 'requestBody' => rule_creation_schema(), responses => #{ 400 => error_schema('BAD_REQUEST', "Invalid Parameters"), 200 => rule_info_schema() @@ -168,7 +168,7 @@ schema("/rules/:id") -> schema("/rules/:id/reset_metrics") -> #{ - operationId => '/rules/:id/reset_metrics', + 'operationId' => '/rules/:id/reset_metrics', put => #{ tags => [<<"rules">>], description => <<"Reset a rule metrics">>, @@ -183,12 +183,12 @@ schema("/rules/:id/reset_metrics") -> schema("/rule_test") -> #{ - operationId => '/rule_test', + 'operationId' => '/rule_test', post => #{ tags => [<<"rules">>], description => <<"Test a rule">>, summary => <<"Test a Rule">>, - requestBody => rule_test_schema(), + 'requestBody' => rule_test_schema(), responses => #{ 400 => error_schema('BAD_REQUEST', "Invalid Parameters"), 412 => error_schema('NOT_MATCH', "SQL Not Match"), diff --git a/apps/emqx_rule_engine/src/emqx_rule_runtime.erl b/apps/emqx_rule_engine/src/emqx_rule_runtime.erl index 906a219b2..8211426ab 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_runtime.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_runtime.erl @@ -48,9 +48,9 @@ -spec(apply_rules(list(rule()), input()) -> ok). apply_rules([], _Input) -> ok; -apply_rules([#{enable := false}|More], Input) -> +apply_rules([#{enable := false} | More], Input) -> apply_rules(More, Input); -apply_rules([Rule|More], Input) -> +apply_rules([Rule | More], Input) -> apply_rule_discard_result(Rule, Input), apply_rules(More, Input). @@ -150,14 +150,14 @@ select_and_transform(Fields, Input) -> select_and_transform([], _Input, Output) -> Output; -select_and_transform(['*'|More], Input, Output) -> +select_and_transform(['*' | More], Input, Output) -> select_and_transform(More, Input, maps:merge(Output, Input)); -select_and_transform([{as, Field, Alias}|More], Input, Output) -> +select_and_transform([{as, Field, Alias} | More], Input, Output) -> Val = eval(Field, Input), select_and_transform(More, nested_put(Alias, Val, Input), nested_put(Alias, Val, Output)); -select_and_transform([Field|More], Input, Output) -> +select_and_transform([Field | More], Input, Output) -> Val = eval(Field, Input), Key = alias(Field), select_and_transform(More, @@ -172,7 +172,7 @@ select_and_collect(Fields, Input) -> select_and_collect([{as, Field, {_, A} = Alias}], Input, {Output, _}) -> Val = eval(Field, Input), {nested_put(Alias, Val, Output), {A, ensure_list(Val)}}; -select_and_collect([{as, Field, Alias}|More], Input, {Output, LastKV}) -> +select_and_collect([{as, Field, Alias} | More], Input, {Output, LastKV}) -> Val = eval(Field, Input), select_and_collect(More, nested_put(Alias, Val, Input), @@ -181,7 +181,7 @@ select_and_collect([Field], Input, {Output, _}) -> Val = eval(Field, Input), Key = alias(Field), {nested_put(Key, Val, Output), {'item', ensure_list(Val)}}; -select_and_collect([Field|More], Input, {Output, LastKV}) -> +select_and_collect([Field | More], Input, {Output, LastKV}) -> Val = eval(Field, Input), Key = alias(Field), select_and_collect(More,