From b3e62bd8f8c16c57754fa91bfffcc52f4ed32783 Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Fri, 13 Jan 2023 12:32:35 +0300
Subject: [PATCH] fix(paging): respect matchspec even if qs is empty when
 counting

---
 .../test/emqx_authz_api_mnesia_SUITE.erl      | 27 +++++++++++++------
 apps/emqx_management/src/emqx_mgmt_api.erl    |  6 ++---
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/apps/emqx_authz/test/emqx_authz_api_mnesia_SUITE.erl b/apps/emqx_authz/test/emqx_authz_api_mnesia_SUITE.erl
index 62bce770e..0d4d974f2 100644
--- a/apps/emqx_authz/test/emqx_authz_api_mnesia_SUITE.erl
+++ b/apps/emqx_authz/test/emqx_authz_api_mnesia_SUITE.erl
@@ -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(
@@ -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,
diff --git a/apps/emqx_management/src/emqx_mgmt_api.erl b/apps/emqx_management/src/emqx_mgmt_api.erl
index ba232daf3..e46047521 100644
--- a/apps/emqx_management/src/emqx_mgmt_api.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api.erl
@@ -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
@@ -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(),