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

chore(sessds): rename `iterate` -> `iter_next` for consistency

This commit is contained in:
Andrew Mayorov 2024-07-03 15:12:02 +02:00
parent 1d5669d008
commit 947af1faaf
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/emqx/src/emqx_persistent_session_ds/emqx_persistent_session_ds_state.erl
View File

@ -66,7 +66,7 @@
n_awaiting_rel/1 n_awaiting_rel/1
]). ]).
-export([iterate/1]). -export([iter_next/1]).
-export([make_session_iterator/0, session_iterator_next/2]). -export([make_session_iterator/0, session_iterator_next/2]).
@ -484,6 +484,9 @@ fold_streams(Fun, Acc, Rec) ->
-spec iter_streams(_StartAfter :: stream_key() | beginning, t()) -> -spec iter_streams(_StartAfter :: stream_key() | beginning, t()) ->
iter(stream_key(), emqx_persistent_session_ds:stream_state()). iter(stream_key(), emqx_persistent_session_ds:stream_state()).
iter_streams(After, Rec) -> iter_streams(After, Rec) ->
%% NOTE
%% No special handling for `beginning', as it always compares less
%% than any `stream_key()'.
gen_iter_after(?streams, After, Rec). gen_iter_after(?streams, After, Rec).
-spec n_streams(t()) -> non_neg_integer(). -spec n_streams(t()) -> non_neg_integer().
@ -544,8 +547,8 @@ n_awaiting_rel(Rec) ->
%% %%
-spec iterate(iter(K, V)) -> {K, V, iter(K, V)} | none. -spec iter_next(iter(K, V)) -> {K, V, iter(K, V)} | none.
iterate(It0) -> iter_next(It0) ->
gen_iter_next(It0). gen_iter_next(It0).
%% %%

2
apps/emqx/src/emqx_persistent_session_ds/emqx_persistent_session_ds_stream_scheduler.erl
View File

@ -127,7 +127,7 @@ iter_next_streams(LastVisited, S) ->
next_stream(#iter{limit = 0}) -> next_stream(#iter{limit = 0}) ->
none; none;
next_stream(ItStream0 = #iter{limit = N, filter = Filter, it = It0, it_cont = ItCont}) -> next_stream(ItStream0 = #iter{limit = N, filter = Filter, it = It0, it_cont = ItCont}) ->
case emqx_persistent_session_ds_state:iterate(It0) of case emqx_persistent_session_ds_state:iter_next(It0) of
{Key, Stream, It} -> {Key, Stream, It} ->
ItStream = ItStream0#iter{it = It, limit = N - 1}, ItStream = ItStream0#iter{it = It, limit = N - 1},
case Filter(Key, Stream) of case Filter(Key, Stream) of