From 228bf1a0cea5b11ecf5ffb81aabbe99c6ce3ef54 Mon Sep 17 00:00:00 2001 From: Ilya Averyanov Date: Thu, 16 Feb 2023 20:32:12 +0200 Subject: [PATCH] chore(ft): fix typing issues --- apps/emqx_ft/src/emqx_ft.erl | 16 ++++++++-------- apps/emqx_ft/src/emqx_ft_responder.erl | 2 +- apps/emqx_ft/src/emqx_ft_storage_fs.erl | 3 +-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/apps/emqx_ft/src/emqx_ft.erl b/apps/emqx_ft/src/emqx_ft.erl index 348916920..d55d5cad9 100644 --- a/apps/emqx_ft/src/emqx_ft.erl +++ b/apps/emqx_ft/src/emqx_ft.erl @@ -184,9 +184,9 @@ on_init(PacketId, Msg, Transfer) -> ok -> emqx_ft_responder:ack(PacketKey, ok); % Storage operation started, packet will be acked by the responder - {async, Pid} -> - ok = emqx_ft_responder:kickoff(PacketKey, Pid), - ok; + % {async, Pid} -> + % ok = emqx_ft_responder:kickoff(PacketKey, Pid), + % ok; %% Storage operation failed, ack through the responder {error, _} = Error -> emqx_ft_responder:ack(PacketKey, Error) @@ -227,9 +227,9 @@ on_segment(PacketId, Msg, Transfer, Offset, Checksum) -> case store_segment(Transfer, Segment) of ok -> emqx_ft_responder:ack(PacketKey, ok); - {async, Pid} -> - ok = emqx_ft_responder:kickoff(PacketKey, Pid), - ok; + % {async, Pid} -> + % ok = emqx_ft_responder:kickoff(PacketKey, Pid), + % ok; {error, _} = Error -> emqx_ft_responder:ack(PacketKey, Error) end @@ -251,8 +251,8 @@ on_fin(PacketId, Msg, Transfer, Checksum) -> with_responder(FinPacketKey, Callback, ?ASSEMBLE_TIMEOUT, fun() -> case assemble(Transfer) of %% Assembling completed, ack through the responder right away - ok -> - emqx_ft_responder:ack(FinPacketKey, ok); + % ok -> + % emqx_ft_responder:ack(FinPacketKey, ok); %% Assembling started, packet will be acked by the responder {async, Pid} -> ok = emqx_ft_responder:kickoff(FinPacketKey, Pid), diff --git a/apps/emqx_ft/src/emqx_ft_responder.erl b/apps/emqx_ft/src/emqx_ft_responder.erl index 923e5ece0..cbbfbe687 100644 --- a/apps/emqx_ft/src/emqx_ft_responder.erl +++ b/apps/emqx_ft/src/emqx_ft_responder.erl @@ -42,7 +42,7 @@ %% API %% ------------------------------------------------------------------- --spec start(key(), timeout(), respfun()) -> startlink_ret(). +-spec start(key(), respfun(), timeout()) -> startlink_ret(). start(Key, RespFun, Timeout) -> emqx_ft_responder_sup:start_child(Key, RespFun, Timeout). diff --git a/apps/emqx_ft/src/emqx_ft_storage_fs.erl b/apps/emqx_ft/src/emqx_ft_storage_fs.erl index ef032a639..81fed0f21 100644 --- a/apps/emqx_ft/src/emqx_ft_storage_fs.erl +++ b/apps/emqx_ft/src/emqx_ft_storage_fs.erl @@ -78,8 +78,7 @@ -define(MANIFEST, "MANIFEST.json"). -define(SEGMENT, "SEG"). -%% TODO --type storage() :: emqx_config:config(). +-type storage() :: emqx_ft_storage:storage(). %% Store manifest in the backing filesystem. %% Atomic operation.