Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(paging): respect matchspec even if qs is empty when counting #9749

Merged
merged 2 commits into from
Jan 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 19 additions & 8 deletions apps/emqx_authz/test/emqx_authz_api_mnesia_SUITE.erl
Expand Up @@ -109,14 +109,17 @@ t_api(_) ->
]),
[]
),
#{
<<"data">> := [],
<<"meta">> := #{
<<"limit">> := 20,
<<"page">> := 1,
<<"hasnext">> := false
}
} = jsx:decode(Request1_1),
?assertEqual(
#{
<<"data">> => [],
<<"meta">> => #{
<<"limit">> => 20,
<<"page">> => 1,
<<"hasnext">> => false
}
},
jsx:decode(Request1_1)
),

{ok, 200, Request2} =
request(
Expand Down Expand Up @@ -160,6 +163,14 @@ t_api(_) ->
[]
),

% ensure that db contain a mix of records
{ok, 204, _} =
request(
post,
uri(["authorization", "sources", "built_in_database", "username"]),
[?USERNAME_RULES_EXAMPLE]
),

{ok, 204, _} =
request(
post,
Expand Down
6 changes: 3 additions & 3 deletions apps/emqx_management/src/emqx_mgmt_api.erl
Expand Up @@ -384,8 +384,6 @@ apply_total_query(QueryState = #{table := Tab}) ->
Fun(Tab)
end.

counting_total_fun(_QueryState = #{qs := {[], []}}) ->
fun(Tab) -> ets:info(Tab, size) end;
counting_total_fun(_QueryState = #{match_spec := Ms, fuzzy_fun := undefined}) ->
%% XXX: Calculating the total number of data that match a certain
%% condition under a large table is very expensive because the
Expand All @@ -400,7 +398,9 @@ counting_total_fun(_QueryState = #{match_spec := Ms, fuzzy_fun := undefined}) ->
counting_total_fun(_QueryState = #{fuzzy_fun := FuzzyFun}) when FuzzyFun =/= undefined ->
%% XXX: Calculating the total number for a fuzzy searching is very very expensive
%% so it is not supported now
false.
false;
counting_total_fun(_QueryState = #{qs := {[], []}}) ->
fun(Tab) -> ets:info(Tab, size) end.

%% ResultAcc :: #{count := integer(),
%% cursor := integer(),
Expand Down
1 change: 1 addition & 0 deletions changes/v5.0.15/fix-9749-en.md
@@ -0,0 +1 @@
In some cases search APIs could respond with an incorrect `count` value in the metadata, that is usually much bigger than expected, this is now fixed.
1 change: 1 addition & 0 deletions changes/v5.0.15/fix-9749-zh.md
@@ -0,0 +1 @@
在某些情况下,搜索 API 可能会在元数据中响应不正确的 `count` 值,这通常比预期的要大得多,现在已经修复了。