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

chore: replace / with _ in match_spec

This commit is contained in:
zhongwencool 2022-08-08 10:25:01 +08:00
parent f2a248d83f
commit 4869c94e97
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_auth_mnesia/src/emqx_auth_mnesia_api.erl
View File

@ -133,7 +133,7 @@
list_clientid(_Bindings, Params) -> list_clientid(_Bindings, Params) ->
SortFun = fun(#{created_at := C1}, #{created_at := C2}) -> C1 > C2 end, SortFun = fun(#{created_at := C1}, #{created_at := C2}) -> C1 > C2 end,
CountFun = fun() -> CountFun = fun() ->
MatchSpec = [{{?TABLE, {clientid, '_'}, '$1', '$2'}, [], [true]}], MatchSpec = [{{?TABLE, {clientid, '_'}, '_', '_'}, [], [true]}],
ets:select_count(?TABLE, MatchSpec) ets:select_count(?TABLE, MatchSpec)
end, end,
return({ok, emqx_mgmt_api:node_query(node(), Params, ?CLIENTID_SCHEMA, ?query_clientid, SortFun, CountFun)}). return({ok, emqx_mgmt_api:node_query(node(), Params, ?CLIENTID_SCHEMA, ?query_clientid, SortFun, CountFun)}).
@ -187,7 +187,7 @@ delete_clientid(#{clientid := Clientid}, _) ->
list_username(_Bindings, Params) -> list_username(_Bindings, Params) ->
SortFun = fun(#{created_at := C1}, #{created_at := C2}) -> C1 > C2 end, SortFun = fun(#{created_at := C1}, #{created_at := C2}) -> C1 > C2 end,
CountFun = fun() -> CountFun = fun() ->
MatchSpec = [{{?TABLE, {username, '_'}, '$1', '$2'}, [], [true]}], MatchSpec = [{{?TABLE, {username, '_'}, '_', '_'}, [], [true]}],
ets:select_count(?TABLE, MatchSpec) ets:select_count(?TABLE, MatchSpec)
end, end,
return({ok, emqx_mgmt_api:node_query(node(), Params, ?USERNAME_SCHEMA, ?query_username, SortFun, CountFun)}). return({ok, emqx_mgmt_api:node_query(node(), Params, ?USERNAME_SCHEMA, ?query_username, SortFun, CountFun)}).

11
apps/emqx_auth_mnesia/test/emqx_auth_mnesia_SUITE.erl
View File

@ -300,10 +300,10 @@ t_clientid_rest_api(_Config) ->
= emqx_json:decode(Result4, [return_maps]), = emqx_json:decode(Result4, [return_maps]),
?assertEqual(3, Count4), ?assertEqual(3, Count4),
?assertEqual(3, length(Data4)), ?assertEqual([<<"client2">>, <<"clientid1">>, ?CLIENTID],
lists:sort(lists:map(fun(#{<<"clientid">> := C}) -> C end, Data4))),
UserNameParams = [ #{<<"username">> => ?USERNAME, <<"password">> => ?PASSWORD} UserNameParams = [#{<<"username">> => <<"username1">>, <<"password">> => ?PASSWORD}
, #{<<"username">> => <<"username1">>, <<"password">> => ?PASSWORD}
, #{<<"username">> => <<"username2">>, <<"password">> => ?PASSWORD} , #{<<"username">> => <<"username2">>, <<"password">> => ?PASSWORD}
], ],
{ok, _} = request_http_rest_add(["auth_username"], UserNameParams), {ok, _} = request_http_rest_add(["auth_username"], UserNameParams),
@ -315,8 +315,9 @@ t_clientid_rest_api(_Config) ->
{ok, Result42} = request_http_rest_list(["auth_username"]), {ok, Result42} = request_http_rest_list(["auth_username"]),
#{<<"data">> := Data42, <<"meta">> := #{<<"count">> := Count42}} #{<<"data">> := Data42, <<"meta">> := #{<<"count">> := Count42}}
= emqx_json:decode(Result42, [return_maps]), = emqx_json:decode(Result42, [return_maps]),
?assertEqual(3, Count42), ?assertEqual(2, Count42),
?assertEqual(3, length(Data42)), ?assertEqual([<<"username1">>, <<"username2">>],
lists:sort(lists:map(fun(#{<<"username">> := U}) -> U end, Data42))),
{ok, Result5} = request_http_rest_list(["auth_clientid?_like_clientid=id"]), {ok, Result5} = request_http_rest_list(["auth_clientid?_like_clientid=id"]),
?assertEqual(2, length(get_http_data(Result5))), ?assertEqual(2, length(get_http_data(Result5))),