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

fix(sessds): fix use of undefined types

This commit is contained in:
Andrew Mayorov 2023-09-19 20:44:53 +04:00
parent c1583f7f9d
commit 69889d14a3
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/src/emqx_channel.erl
View File

@ -84,7 +84,7 @@
%% MQTT ClientInfo %% MQTT ClientInfo
clientinfo :: emqx_types:clientinfo(), clientinfo :: emqx_types:clientinfo(),
%% MQTT Session %% MQTT Session
session :: maybe(emqx_session:session()), session :: maybe(emqx_session:t()),
%% Keepalive %% Keepalive
keepalive :: maybe(emqx_keepalive:keepalive()), keepalive :: maybe(emqx_keepalive:keepalive()),
%% MQTT Will Msg %% MQTT Will Msg

4
apps/emqx/src/emqx_cm.erl
View File

@ -260,7 +260,7 @@ set_chan_stats(ClientId, ChanPid, Stats) ->
%% @doc Open a session. %% @doc Open a session.
-spec open_session(boolean(), emqx_types:clientinfo(), emqx_types:conninfo()) -> -spec open_session(boolean(), emqx_types:clientinfo(), emqx_types:conninfo()) ->
{ok, #{ {ok, #{
session := emqx_session:session(), session := emqx_session:t(),
present := boolean(), present := boolean(),
replay => _ReplayContext replay => _ReplayContext
}} }}
@ -390,7 +390,7 @@ discard_session(ClientId) when is_binary(ClientId) ->
%% benefits nobody. %% benefits nobody.
-spec request_stepdown(Action, module(), pid()) -> -spec request_stepdown(Action, module(), pid()) ->
ok ok
| {ok, emqx_session:session() | list(emqx_types:deliver())} | {ok, emqx_session:t() | _ReplayContext}
| {error, term()} | {error, term()}
when when
Action :: kick | discard | {takeover, 'begin'} | {takeover, 'end'}. Action :: kick | discard | {takeover, 'begin'} | {takeover, 'end'}.

4
apps/emqx/src/emqx_persistent_session_ds.erl
View File

@ -364,7 +364,7 @@ update_subscription(TopicFilterBin, Iterator, SubOpts, DSSessionID) ->
ok = ?tp(persistent_session_ds_iterator_updated, #{iterator => Iterator}), ok = ?tp(persistent_session_ds_iterator_updated, #{iterator => Iterator}),
NIterator. NIterator.
-spec open_iterator_on_all_shards(emqx_topic:words(), emqx_ds:iterator()) -> ok. -spec open_iterator_on_all_shards(emqx_types:words(), emqx_ds:iterator()) -> ok.
open_iterator_on_all_shards(TopicFilter, Iterator) -> open_iterator_on_all_shards(TopicFilter, Iterator) ->
?tp(persistent_session_ds_will_open_iterators, #{iterator => Iterator}), ?tp(persistent_session_ds_will_open_iterators, #{iterator => Iterator}),
%% Note: currently, shards map 1:1 to nodes, but this will change in the future. %% Note: currently, shards map 1:1 to nodes, but this will change in the future.
@ -384,7 +384,7 @@ open_iterator_on_all_shards(TopicFilter, Iterator) ->
ok. ok.
%% RPC target. %% RPC target.
-spec do_open_iterator(emqx_topic:words(), emqx_ds:time(), emqx_ds:iterator_id()) -> -spec do_open_iterator(emqx_types:words(), emqx_ds:time(), emqx_ds:iterator_id()) ->
{ok, emqx_ds_storage_layer:iterator()} | {error, _Reason}. {ok, emqx_ds_storage_layer:iterator()} | {error, _Reason}.
do_open_iterator(TopicFilter, StartMS, IteratorID) -> do_open_iterator(TopicFilter, StartMS, IteratorID) ->
Replay = {TopicFilter, StartMS}, Replay = {TopicFilter, StartMS},

2
apps/emqx/src/proto/emqx_persistent_session_ds_proto_v1.erl
View File

@ -36,7 +36,7 @@ introduced_in() ->
-spec open_iterator( -spec open_iterator(
[node()], [node()],
emqx_topic:words(), emqx_types:words(),
emqx_ds:time(), emqx_ds:time(),
emqx_ds:iterator_id() emqx_ds:iterator_id()
) -> ) ->