From 23d63f5e0108c3bb87b4e543678030931f6e8110 Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Mon, 4 Sep 2023 14:41:00 -0300
Subject: [PATCH] refactor: fork clientid type for `emqx_ds:session_id/0`

---
 apps/emqx/src/emqx_persistent_session_ds.erl | 6 +-----
 apps/emqx_durable_storage/src/emqx_ds.erl    | 4 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/emqx/src/emqx_persistent_session_ds.erl b/apps/emqx/src/emqx_persistent_session_ds.erl
index 43ca8bc02..83c2375f2 100644
--- a/apps/emqx/src/emqx_persistent_session_ds.erl
+++ b/apps/emqx/src/emqx_persistent_session_ds.erl
@@ -185,8 +185,7 @@ ensure_all_iterators_closed(DSSessionID) ->
 
 %% RPC target.
 -spec do_ensure_all_iterators_closed(emqx_ds:session_id()) -> ok.
-do_ensure_all_iterators_closed(DSSessionID0) ->
-    DSSessionID = bin(DSSessionID0),
+do_ensure_all_iterators_closed(DSSessionID) ->
     ok = emqx_ds_storage_layer:discard_iterator_prefix(?DS_SHARD, DSSessionID),
     ok.
 
@@ -202,6 +201,3 @@ deserialize_message(Bin) ->
 
 is_store_enabled() ->
     emqx_config:get([persistent_session_store, ds]).
-
-bin(B) when is_binary(B) -> B;
-bin(A) when is_atom(A) -> atom_to_binary(A, utf8).
diff --git a/apps/emqx_durable_storage/src/emqx_ds.erl b/apps/emqx_durable_storage/src/emqx_ds.erl
index 095a93745..0a61cad43 100644
--- a/apps/emqx_durable_storage/src/emqx_ds.erl
+++ b/apps/emqx_durable_storage/src/emqx_ds.erl
@@ -58,7 +58,9 @@
 %% Type declarations
 %%================================================================================
 
--type session_id() :: emqx_types:clientid().
+%% Currently, this is the clientid.  We avoid `emqx_types:clientid()' because that can be
+%% an atom, in theory (?).
+-type session_id() :: binary().
 
 -type iterator() :: term().