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

refactor(mgmt_api): Clearer variable name.

This commit is contained in:
JimMoen 2021-10-08 15:16:12 +08:00
parent 77516d3854
commit b65c9908a1
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqx_gateway/src/emqx_gateway_api_clients.erl
View File

@ -194,15 +194,15 @@ extra_sub_props(Props) ->
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% query funcs %% query funcs
query(Tab, {Qs, []}, Start, Limit) -> query(Tab, {Qs, []}, Continuation, Limit) ->
Ms = qs2ms(Qs), Ms = qs2ms(Qs),
emqx_mgmt_api:select_table(Tab, Ms, Start, Limit, emqx_mgmt_api:select_table(Tab, Ms, Continuation, Limit,
fun format_channel_info/1); fun format_channel_info/1);
query(Tab, {Qs, Fuzzy}, Start, Limit) -> query(Tab, {Qs, Fuzzy}, Continuation, Limit) ->
Ms = qs2ms(Qs), Ms = qs2ms(Qs),
MatchFun = match_fun(Ms, Fuzzy), MatchFun = match_fun(Ms, Fuzzy),
emqx_mgmt_api:traverse_table(Tab, MatchFun, Start, Limit, emqx_mgmt_api:traverse_table(Tab, MatchFun, Continuation, Limit,
fun format_channel_info/1). fun format_channel_info/1).
qs2ms(Qs) -> qs2ms(Qs) ->

4
apps/emqx_management/src/emqx_mgmt_api_alarms.erl
View File

@ -88,9 +88,9 @@ alarms(delete, _Params) ->
%%%============================================================================================== %%%==============================================================================================
%% internal %% internal
query(Table, _QsSpec, Start, Limit) -> query(Table, _QsSpec, Continuation, Limit) ->
Ms = [{'$1',[],['$1']}], Ms = [{'$1',[],['$1']}],
emqx_mgmt_api:select_table(Table, Ms, Start, Limit, fun format_alarm/1). emqx_mgmt_api:select_table(Table, Ms, Continuation, Limit, fun format_alarm/1).
format_alarm(Alarms) when is_list(Alarms) -> format_alarm(Alarms) when is_list(Alarms) ->
[emqx_alarm:format(Alarm) || Alarm <- Alarms]; [emqx_alarm:format(Alarm) || Alarm <- Alarms];

8
apps/emqx_management/src/emqx_mgmt_api_clients.erl
View File

@ -555,15 +555,15 @@ generate_qs(Qs) ->
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Query Functions %% Query Functions
query(Tab, {Qs, []}, Start, Limit) -> query(Tab, {Qs, []}, Continuation, Limit) ->
Ms = qs2ms(Qs), Ms = qs2ms(Qs),
emqx_mgmt_api:select_table(Tab, Ms, Start, Limit, emqx_mgmt_api:select_table(Tab, Ms, Continuation, Limit,
fun format_channel_info/1); fun format_channel_info/1);
query(Tab, {Qs, Fuzzy}, Start, Limit) -> query(Tab, {Qs, Fuzzy}, Continuation, Limit) ->
Ms = qs2ms(Qs), Ms = qs2ms(Qs),
MatchFun = match_fun(Ms, Fuzzy), MatchFun = match_fun(Ms, Fuzzy),
emqx_mgmt_api:traverse_table(Tab, MatchFun, Start, Limit, emqx_mgmt_api:traverse_table(Tab, MatchFun, Continuation, Limit,
fun format_channel_info/1). fun format_channel_info/1).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------

4
apps/emqx_management/src/emqx_mgmt_api_routes.erl
View File

@ -105,9 +105,9 @@ generate_topic(Params = #{topic := Topic}) ->
Params#{topic => uri_string:percent_decode(Topic)}; Params#{topic => uri_string:percent_decode(Topic)};
generate_topic(Params) -> Params. generate_topic(Params) -> Params.
query(Tab, {Qs, _}, Start, Limit) -> query(Tab, {Qs, _}, Continuation, Limit) ->
Ms = qs2ms(Qs, [{{route, '_', '_'}, [], ['$_']}]), Ms = qs2ms(Qs, [{{route, '_', '_'}, [], ['$_']}]),
emqx_mgmt_api:select_table(Tab, Ms, Start, Limit, fun format/1). emqx_mgmt_api:select_table(Tab, Ms, Continuation, Limit, fun format/1).
qs2ms([], Res) -> Res; qs2ms([], Res) -> Res;
qs2ms([{topic,'=:=', T} | Qs], [{{route, _, N}, [], ['$_']}]) -> qs2ms([{topic,'=:=', T} | Qs], [{{route, _, N}, [], ['$_']}]) ->

8
apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl
View File

@ -148,14 +148,14 @@ format({_Subscriber, Topic, Options}) ->
%% Query Function %% Query Function
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
query(Tab, {Qs, []}, Start, Limit) -> query(Tab, {Qs, []}, Continuation, Limit) ->
Ms = qs2ms(Qs), Ms = qs2ms(Qs),
emqx_mgmt_api:select_table(Tab, Ms, Start, Limit, fun format/1); emqx_mgmt_api:select_table(Tab, Ms, Continuation, Limit, fun format/1);
query(Tab, {Qs, Fuzzy}, Start, Limit) -> query(Tab, {Qs, Fuzzy}, Continuation, Limit) ->
Ms = qs2ms(Qs), Ms = qs2ms(Qs),
MatchFun = match_fun(Ms, Fuzzy), MatchFun = match_fun(Ms, Fuzzy),
emqx_mgmt_api:traverse_table(Tab, MatchFun, Start, Limit, fun format/1). emqx_mgmt_api:traverse_table(Tab, MatchFun, Continuation, Limit, fun format/1).
match_fun(Ms, Fuzzy) -> match_fun(Ms, Fuzzy) ->
MsC = ets:match_spec_compile(Ms), MsC = ets:match_spec_compile(Ms),