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

Merge pull request #6252 from JimMoen/fix-clients-cluster-query 

fix(mgmt): fix broken `ets:continuation` been sent between nodes
This commit is contained in:
Zaiming (Stone) Shi 2021-11-22 15:28:16 +01:00 committed by GitHub
parent c137c2eab5 08899552fe
commit b59ad6b186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,9 +213,9 @@ select_table_with_count(Tab, {Ms, FuzzyFilterFun}, ?FRESH_SELECT, Limit, FmtFun)
Rows = FuzzyFilterFun(RawResult), Rows = FuzzyFilterFun(RawResult),
{length(Rows), lists:map(FmtFun, Rows), NContinuation} {length(Rows), lists:map(FmtFun, Rows), NContinuation}
end; end;
select_table_with_count(_Tab, {_Ms, FuzzyFilterFun}, Continuation, _Limit, FmtFun) select_table_with_count(_Tab, {Ms, FuzzyFilterFun}, Continuation, _Limit, FmtFun)
when is_function(FuzzyFilterFun) -> when is_function(FuzzyFilterFun) ->
case ets:select(Continuation) of case ets:select(ets:repair_continuation(Continuation, Ms)) of
'$end_of_table' -> '$end_of_table' ->
{0, [], ?FRESH_SELECT}; {0, [], ?FRESH_SELECT};
{RawResult, NContinuation} -> {RawResult, NContinuation} ->
@ -230,8 +230,8 @@ select_table_with_count(Tab, Ms, ?FRESH_SELECT, Limit, FmtFun)
{RawResult, NContinuation} -> {RawResult, NContinuation} ->
{length(RawResult), lists:map(FmtFun, RawResult), NContinuation} {length(RawResult), lists:map(FmtFun, RawResult), NContinuation}
end; end;
select_table_with_count(_Tab, _Ms, Continuation, _Limit, FmtFun) -> select_table_with_count(_Tab, Ms, Continuation, _Limit, FmtFun) ->
case ets:select(Continuation) of case ets:select(ets:repair_continuation(Continuation, Ms)) of
'$end_of_table' -> '$end_of_table' ->
{0, [], ?FRESH_SELECT}; {0, [], ?FRESH_SELECT};
{RawResult, NContinuation} -> {RawResult, NContinuation} ->