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

refactor: remove unused code

This commit is contained in:
Stefan Strigler 2023-02-13 11:23:43 +01:00
parent 3bf8a7ede7
commit 28560e4603
1 changed files with 19 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
apps/emqx_management/src/emqx_mgmt_api.erl
View File

@ -23,8 +23,7 @@
-define(LONG_QUERY_TIMEOUT, 50000). -define(LONG_QUERY_TIMEOUT, 50000).
-export([ -export([
paginate/3, paginate/3
paginate/4
]). ]).
%% first_next query APIs %% first_next query APIs
@ -58,14 +57,14 @@
-export([do_query/2, apply_total_query/1]). -export([do_query/2, apply_total_query/1]).
paginate(Tables, Params, {Module, FormatFun}) -> -spec paginate(atom(), map(), {atom(), fun()}) ->
Qh = query_handle(Tables), #{
Count = count(Tables), meta => #{page => pos_integer(), limit => pos_integer(), count => pos_integer()},
do_paginate(Qh, Count, Params, {Module, FormatFun}). data => list(term())
}.
paginate(Tables, MatchSpec, Params, {Module, FormatFun}) -> paginate(Table, Params, {Module, FormatFun}) ->
Qh = query_handle(Tables, MatchSpec), Qh = query_handle(Table),
Count = count(Tables, MatchSpec), Count = count(Table),
do_paginate(Qh, Count, Params, {Module, FormatFun}). do_paginate(Qh, Count, Params, {Module, FormatFun}).
do_paginate(Qh, Count, Params, {Module, FormatFun}) -> do_paginate(Qh, Count, Params, {Module, FormatFun}) ->
@ -86,57 +85,17 @@ do_paginate(Qh, Count, Params, {Module, FormatFun}) ->
data => [erlang:apply(Module, FormatFun, [Row]) || Row <- Rows] data => [erlang:apply(Module, FormatFun, [Row]) || Row <- Rows]
}. }.
query_handle(Table) when is_atom(Table) -> query_handle(Table) ->
qlc:q([R || R <- ets:table(Table)]); qlc:q([R || R <- ets:table(Table)]).
query_handle({Table, Opts}) when is_atom(Table) ->
qlc:q([R || R <- ets:table(Table, Opts)]);
query_handle([Table]) when is_atom(Table) ->
qlc:q([R || R <- ets:table(Table)]);
query_handle([{Table, Opts}]) when is_atom(Table) ->
qlc:q([R || R <- ets:table(Table, Opts)]);
query_handle(Tables) ->
%
qlc:append([query_handle(T) || T <- Tables]).
query_handle(Table, MatchSpec) when is_atom(Table) -> count(Table) ->
Options = {traverse, {select, MatchSpec}}, ets:info(Table, size).
qlc:q([R || R <- ets:table(Table, Options)]);
query_handle([Table], MatchSpec) when is_atom(Table) ->
Options = {traverse, {select, MatchSpec}},
qlc:q([R || R <- ets:table(Table, Options)]);
query_handle(Tables, MatchSpec) ->
Options = {traverse, {select, MatchSpec}},
qlc:append([qlc:q([E || E <- ets:table(T, Options)]) || T <- Tables]).
count(Table) when is_atom(Table) ->
ets:info(Table, size);
count({Table, _}) when is_atom(Table) ->
ets:info(Table, size);
count([Table]) when is_atom(Table) ->
ets:info(Table, size);
count([{Table, _}]) when is_atom(Table) ->
ets:info(Table, size);
count(Tables) ->
lists:sum([count(T) || T <- Tables]).
count(Table, MatchSpec) when is_atom(Table) ->
[{MatchPattern, Where, _Re}] = MatchSpec,
NMatchSpec = [{MatchPattern, Where, [true]}],
ets:select_count(Table, NMatchSpec);
count([Table], MatchSpec) when is_atom(Table) ->
count(Table, MatchSpec);
count(Tables, MatchSpec) ->
lists:sum([count(T, MatchSpec) || T <- Tables]).
page(Params) when is_map(Params) ->
maps:get(<<"page">>, Params, 1);
page(Params) -> page(Params) ->
proplists:get_value(<<"page">>, Params, <<"1">>). maps:get(<<"page">>, Params, 1).
limit(Params) when is_map(Params) ->
maps:get(<<"limit">>, Params, emqx_mgmt:max_row_limit());
limit(Params) -> limit(Params) ->
proplists:get_value(<<"limit">>, Params, emqx_mgmt:max_row_limit()). maps:get(<<"limit">>, Params, emqx_mgmt:max_row_limit()).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Node Query %% Node Query
@ -605,7 +564,7 @@ to_type(V, TargetType) ->
to_type_(V, atom) -> to_atom(V); to_type_(V, atom) -> to_atom(V);
to_type_(V, integer) -> to_integer(V); to_type_(V, integer) -> to_integer(V);
to_type_(V, timestamp) -> to_timestamp(V); to_type_(V, timestamp) -> to_timestamp(V);
to_type_(V, ip) -> aton(V); to_type_(V, ip) -> to_ip(V);
to_type_(V, ip_port) -> to_ip_port(V); to_type_(V, ip_port) -> to_ip_port(V);
to_type_(V, _) -> V. to_type_(V, _) -> V.
@ -624,8 +583,9 @@ to_timestamp(I) when is_integer(I) ->
to_timestamp(B) when is_binary(B) -> to_timestamp(B) when is_binary(B) ->
binary_to_integer(B). binary_to_integer(B).
aton(B) when is_binary(B) -> to_ip(IP0) when is_binary(IP0) ->
list_to_tuple([binary_to_integer(T) || T <- re:split(B, "[.]")]). {ok, IP} = inet:parse_address(binary_to_list(IP0)),
IP.
to_ip_port(IPAddress) -> to_ip_port(IPAddress) ->
[IP0, Port0] = string:tokens(binary_to_list(IPAddress), ":"), [IP0, Port0] = string:tokens(binary_to_list(IPAddress), ":"),