From 83206daa202d7a6cb19f04dd141ecf36438ba7da Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Sat, 2 Dec 2023 19:28:40 +0100 Subject: [PATCH] refactor(emqx_cm_locker): delete dead code --- apps/emqx/src/emqx_cm_locker.erl | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/apps/emqx/src/emqx_cm_locker.erl b/apps/emqx/src/emqx_cm_locker.erl index a7dfa2761..dfe8907d5 100644 --- a/apps/emqx/src/emqx_cm_locker.erl +++ b/apps/emqx/src/emqx_cm_locker.erl @@ -23,9 +23,7 @@ -export([ trans/2, - trans/3, lock/1, - lock/2, unlock/1 ]). @@ -33,19 +31,14 @@ start_link() -> ekka_locker:start_link(?MODULE). --spec trans(emqx_types:clientid(), fun(([node()]) -> any())) -> any(). -trans(ClientId, Fun) -> - trans(ClientId, Fun, undefined). - -spec trans( maybe(emqx_types:clientid()), - fun(([node()]) -> any()), - ekka_locker:piggyback() + fun(([node()]) -> any()) ) -> any(). -trans(undefined, Fun, _Piggyback) -> +trans(undefined, Fun) -> Fun([]); -trans(ClientId, Fun, Piggyback) -> - case lock(ClientId, Piggyback) of +trans(ClientId, Fun) -> + case lock(ClientId) of {true, Nodes} -> try Fun(Nodes) @@ -56,14 +49,10 @@ trans(ClientId, Fun, Piggyback) -> {error, client_id_unavailable} end. --spec lock(emqx_types:clientid()) -> ekka_locker:lock_result(). +-spec lock(emqx_types:clientid()) -> {boolean, [node() | {node(), any()}]}. lock(ClientId) -> ekka_locker:acquire(?MODULE, ClientId, strategy()). --spec lock(emqx_types:clientid(), ekka_locker:piggyback()) -> ekka_locker:lock_result(). -lock(ClientId, Piggyback) -> - ekka_locker:acquire(?MODULE, ClientId, strategy(), Piggyback). - -spec unlock(emqx_types:clientid()) -> {boolean(), [node()]}. unlock(ClientId) -> ekka_locker:release(?MODULE, ClientId, strategy()).