From c22a3686ae2e304d81bb21fffd15a7952880e2b4 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 14 Dec 2023 17:35:32 +0100 Subject: [PATCH] fix(emqx_durable_storage): fix type specs --- apps/emqx_durable_storage/src/emqx_ds_replication_layer.erl | 4 ++-- apps/emqx_durable_storage/src/proto/emqx_ds_proto_v1.erl | 2 +- apps/emqx_durable_storage/src/proto/emqx_ds_proto_v2.erl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/emqx_durable_storage/src/emqx_ds_replication_layer.erl b/apps/emqx_durable_storage/src/emqx_ds_replication_layer.erl index 14b096a17..5eac27471 100644 --- a/apps/emqx_durable_storage/src/emqx_ds_replication_layer.erl +++ b/apps/emqx_durable_storage/src/emqx_ds_replication_layer.erl @@ -264,11 +264,11 @@ do_make_iterator_v1(DB, Shard, Stream, TopicFilter, StartTime) -> -spec do_update_iterator_v2( emqx_ds:db(), - emqx_ds_storage_layer:shard_id(), + emqx_ds_replication_layer:shard_id(), emqx_ds_storage_layer:iterator(), 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) -> emqx_ds_storage_layer:update_iterator( {DB, Shard}, OldIter, DSKey diff --git a/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v1.erl b/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v1.erl index e4b2e0a24..67ed1a3ca 100644 --- a/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v1.erl +++ b/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v1.erl @@ -70,7 +70,7 @@ make_iterator(Node, DB, Shard, Stream, TopicFilter, StartTime) -> emqx_ds_storage_layer:iterator(), 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} | {error, _}. next(Node, DB, Shard, Iter, BatchSize) -> diff --git a/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v2.erl b/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v2.erl index 73596fffc..e3d575c38 100644 --- a/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v2.erl +++ b/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v2.erl @@ -38,7 +38,7 @@ %%================================================================================ -spec drop_db([node()], emqx_ds:db()) -> - [{ok, ok} | erpc:caught_call_exception()]. + [{ok, ok} | {error, _}]. drop_db(Node, 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(), 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} | {error, _}. next(Node, DB, Shard, Iter, BatchSize) ->