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

fix(emqx_durable_storage): fix type specs

This commit is contained in:
Zaiming (Stone) Shi 2023-12-14 17:35:32 +01:00
parent c1f2287b86
commit c22a3686ae
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_durable_storage/src/emqx_ds_replication_layer.erl
View File

@ -264,11 +264,11 @@ do_make_iterator_v1(DB, Shard, Stream, TopicFilter, StartTime) ->
-spec do_update_iterator_v2( -spec do_update_iterator_v2(
emqx_ds:db(), emqx_ds:db(),
emqx_ds_storage_layer:shard_id(), emqx_ds_replication_layer:shard_id(),
emqx_ds_storage_layer:iterator(), emqx_ds_storage_layer:iterator(),
emqx_ds:message_key() emqx_ds:message_key()
) -> ) ->
{ok, emqx_ds_storage_layer:iterator()} | {error, _}. emqx_ds:make_iterator_result(emqx_ds_storage_layer:iterator()).
do_update_iterator_v2(DB, Shard, OldIter, DSKey) -> do_update_iterator_v2(DB, Shard, OldIter, DSKey) ->
emqx_ds_storage_layer:update_iterator( emqx_ds_storage_layer:update_iterator(
{DB, Shard}, OldIter, DSKey {DB, Shard}, OldIter, DSKey

2
apps/emqx_durable_storage/src/proto/emqx_ds_proto_v1.erl
View File

@ -70,7 +70,7 @@ make_iterator(Node, DB, Shard, Stream, TopicFilter, StartTime) ->
emqx_ds_storage_layer:iterator(), emqx_ds_storage_layer:iterator(),
pos_integer() pos_integer()
) -> ) ->
{ok, emqx_ds_storage_layer:iterator(), [{emqx_ds:message_key(), emqx_types:messages()}]} {ok, emqx_ds_storage_layer:iterator(), [{emqx_ds:message_key(), [emqx_types:message()]}]}
| {ok, end_of_stream} | {ok, end_of_stream}
| {error, _}. | {error, _}.
next(Node, DB, Shard, Iter, BatchSize) -> next(Node, DB, Shard, Iter, BatchSize) ->

4
apps/emqx_durable_storage/src/proto/emqx_ds_proto_v2.erl
View File

@ -38,7 +38,7 @@
%%================================================================================ %%================================================================================
-spec drop_db([node()], emqx_ds:db()) -> -spec drop_db([node()], emqx_ds:db()) ->
[{ok, ok} | erpc:caught_call_exception()]. [{ok, ok} | {error, _}].
drop_db(Node, DB) -> drop_db(Node, DB) ->
erpc:multicall(Node, emqx_ds_replication_layer, do_drop_db_v1, [DB]). erpc:multicall(Node, emqx_ds_replication_layer, do_drop_db_v1, [DB]).
@ -74,7 +74,7 @@ make_iterator(Node, DB, Shard, Stream, TopicFilter, StartTime) ->
emqx_ds_storage_layer:iterator(), emqx_ds_storage_layer:iterator(),
pos_integer() pos_integer()
) -> ) ->
{ok, emqx_ds_storage_layer:iterator(), [{emqx_ds:message_key(), emqx_types:messages()}]} {ok, emqx_ds_storage_layer:iterator(), [{emqx_ds:message_key(), [emqx_types:message()]}]}
| {ok, end_of_stream} | {ok, end_of_stream}
| {error, _}. | {error, _}.
next(Node, DB, Shard, Iter, BatchSize) -> next(Node, DB, Shard, Iter, BatchSize) ->