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

refactor(authz): call emqx_resource:simple_sync_query 

there is no need to route the request through the buffer workers
This commit is contained in:
Zaiming (Stone) Shi 2023-01-17 20:01:45 +01:00
parent 7a471faf67
commit fff6bf921f
8 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_authz/src/emqx_authz_http.erl
View File

@ -82,7 +82,7 @@ authorize(
} = Config } = Config
) -> ) ->
Request = generate_request(PubSub, Topic, Client, Config), Request = generate_request(PubSub, Topic, Client, Config),
case emqx_resource:query(ResourceID, {Method, Request, RequestTimeout}) of case emqx_resource:simple_sync_query(ResourceID, {Method, Request, RequestTimeout}) of
{ok, 204, _Headers} -> {ok, 204, _Headers} ->
{matched, allow}; {matched, allow};
{ok, 200, Headers, Body} -> {ok, 200, Headers, Body} ->

2
apps/emqx_authz/src/emqx_authz_mongodb.erl
View File

@ -79,7 +79,7 @@ authorize(
RenderedFilter = emqx_authz_utils:render_deep(FilterTemplate, Client), RenderedFilter = emqx_authz_utils:render_deep(FilterTemplate, Client),
Result = Result =
try try
emqx_resource:query(ResourceID, {find, Collection, RenderedFilter, #{}}) emqx_resource:simple_sync_query(ResourceID, {find, Collection, RenderedFilter, #{}})
catch catch
error:Error -> {error, Error} error:Error -> {error, Error}
end, end,

4
apps/emqx_authz/src/emqx_authz_mysql.erl
View File

@ -82,7 +82,9 @@ authorize(
} }
) -> ) ->
RenderParams = emqx_authz_utils:render_sql_params(TmplToken, Client), RenderParams = emqx_authz_utils:render_sql_params(TmplToken, Client),
case emqx_resource:query(ResourceID, {prepared_query, ?PREPARE_KEY, RenderParams}) of case
emqx_resource:simple_sync_query(ResourceID, {prepared_query, ?PREPARE_KEY, RenderParams})
of
{ok, _Columns, []} -> {ok, _Columns, []} ->
nomatch; nomatch;
{ok, Columns, Rows} -> {ok, Columns, Rows} ->

4
apps/emqx_authz/src/emqx_authz_postgresql.erl
View File

@ -87,7 +87,9 @@ authorize(
} }
) -> ) ->
RenderedParams = emqx_authz_utils:render_sql_params(Placeholders, Client), RenderedParams = emqx_authz_utils:render_sql_params(Placeholders, Client),
case emqx_resource:query(ResourceID, {prepared_query, ResourceID, RenderedParams}) of case
emqx_resource:simple_sync_query(ResourceID, {prepared_query, ResourceID, RenderedParams})
of
{ok, _Columns, []} -> {ok, _Columns, []} ->
nomatch; nomatch;
{ok, Columns, Rows} -> {ok, Columns, Rows} ->

2
apps/emqx_authz/src/emqx_authz_redis.erl
View File

@ -78,7 +78,7 @@ authorize(
} }
) -> ) ->
Cmd = emqx_authz_utils:render_deep(CmdTemplate, Client), Cmd = emqx_authz_utils:render_deep(CmdTemplate, Client),
case emqx_resource:query(ResourceID, {cmd, Cmd}) of case emqx_resource:simple_sync_query(ResourceID, {cmd, Cmd}) of
{ok, []} -> {ok, []} ->
nomatch; nomatch;
{ok, Rows} -> {ok, Rows} ->

4
apps/emqx_authz/test/emqx_authz_mysql_SUITE.erl
View File

@ -321,13 +321,13 @@ raw_mysql_authz_config() ->
}. }.
q(Sql) -> q(Sql) ->
emqx_resource:query( emqx_resource:simple_sync_query(
?MYSQL_RESOURCE, ?MYSQL_RESOURCE,
{sql, Sql} {sql, Sql}
). ).
q(Sql, Params) -> q(Sql, Params) ->
emqx_resource:query( emqx_resource:simple_sync_query(
?MYSQL_RESOURCE, ?MYSQL_RESOURCE,
{sql, Sql, Params} {sql, Sql, Params}
). ).

4
apps/emqx_authz/test/emqx_authz_postgresql_SUITE.erl
View File

@ -326,13 +326,13 @@ raw_pgsql_authz_config() ->
}. }.
q(Sql) -> q(Sql) ->
emqx_resource:query( emqx_resource:simple_sync_query(
?PGSQL_RESOURCE, ?PGSQL_RESOURCE,
{query, Sql} {query, Sql}
). ).
insert(Sql, Params) -> insert(Sql, Params) ->
{ok, _} = emqx_resource:query( {ok, _} = emqx_resource:simple_sync_query(
?PGSQL_RESOURCE, ?PGSQL_RESOURCE,
{query, Sql, Params} {query, Sql, Params}
), ),

2
apps/emqx_authz/test/emqx_authz_redis_SUITE.erl
View File

@ -263,7 +263,7 @@ raw_redis_authz_config() ->
}. }.
q(Command) -> q(Command) ->
emqx_resource:query( emqx_resource:simple_sync_query(
?REDIS_RESOURCE, ?REDIS_RESOURCE,
{cmd, Command} {cmd, Command}
). ).