From b65c9908a1718990f7f2cf900442de24ff7a98eb Mon Sep 17 00:00:00 2001 From: JimMoen Date: Fri, 8 Oct 2021 15:16:12 +0800 Subject: [PATCH] refactor(mgmt_api): Clearer variable name. --- apps/emqx_gateway/src/emqx_gateway_api_clients.erl | 8 ++++---- apps/emqx_management/src/emqx_mgmt_api_alarms.erl | 4 ++-- apps/emqx_management/src/emqx_mgmt_api_clients.erl | 8 ++++---- apps/emqx_management/src/emqx_mgmt_api_routes.erl | 4 ++-- apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/emqx_gateway/src/emqx_gateway_api_clients.erl b/apps/emqx_gateway/src/emqx_gateway_api_clients.erl index 386d6e1ea..8020b19fa 100644 --- a/apps/emqx_gateway/src/emqx_gateway_api_clients.erl +++ b/apps/emqx_gateway/src/emqx_gateway_api_clients.erl @@ -194,15 +194,15 @@ extra_sub_props(Props) -> %%-------------------------------------------------------------------- %% query funcs -query(Tab, {Qs, []}, Start, Limit) -> +query(Tab, {Qs, []}, Continuation, Limit) -> 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); -query(Tab, {Qs, Fuzzy}, Start, Limit) -> +query(Tab, {Qs, Fuzzy}, Continuation, Limit) -> Ms = qs2ms(Qs), 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). qs2ms(Qs) -> diff --git a/apps/emqx_management/src/emqx_mgmt_api_alarms.erl b/apps/emqx_management/src/emqx_mgmt_api_alarms.erl index db6484060..2e2dedce4 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_alarms.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_alarms.erl @@ -88,9 +88,9 @@ alarms(delete, _Params) -> %%%============================================================================================== %% internal -query(Table, _QsSpec, Start, Limit) -> +query(Table, _QsSpec, Continuation, Limit) -> 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) -> [emqx_alarm:format(Alarm) || Alarm <- Alarms]; diff --git a/apps/emqx_management/src/emqx_mgmt_api_clients.erl b/apps/emqx_management/src/emqx_mgmt_api_clients.erl index 16d2d99af..6fa90ad83 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_clients.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_clients.erl @@ -555,15 +555,15 @@ generate_qs(Qs) -> %%-------------------------------------------------------------------- %% Query Functions -query(Tab, {Qs, []}, Start, Limit) -> +query(Tab, {Qs, []}, Continuation, Limit) -> 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); -query(Tab, {Qs, Fuzzy}, Start, Limit) -> +query(Tab, {Qs, Fuzzy}, Continuation, Limit) -> Ms = qs2ms(Qs), 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). %%-------------------------------------------------------------------- diff --git a/apps/emqx_management/src/emqx_mgmt_api_routes.erl b/apps/emqx_management/src/emqx_mgmt_api_routes.erl index 870f66892..ebbe590ae 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_routes.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_routes.erl @@ -105,9 +105,9 @@ generate_topic(Params = #{topic := Topic}) -> Params#{topic => uri_string:percent_decode(Topic)}; generate_topic(Params) -> Params. -query(Tab, {Qs, _}, Start, Limit) -> +query(Tab, {Qs, _}, Continuation, Limit) -> 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([{topic,'=:=', T} | Qs], [{{route, _, N}, [], ['$_']}]) -> diff --git a/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl b/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl index 3afd52050..969ff9202 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl @@ -148,14 +148,14 @@ format({_Subscriber, Topic, Options}) -> %% Query Function %%-------------------------------------------------------------------- -query(Tab, {Qs, []}, Start, Limit) -> +query(Tab, {Qs, []}, Continuation, Limit) -> 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), 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) -> MsC = ets:match_spec_compile(Ms),