From a9bc8a4464f42c092446a8c7d7a20cf5db0c5ab5 Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Tue, 14 Mar 2023 14:01:16 +0300
Subject: [PATCH] =?UTF-8?q?refactor(resman):=20rename=20`ets=5Flookup`=20?=
 =?UTF-8?q?=E2=86=92=20`lookup=5Fcached`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

That way we hide the impementation details + the interface becomes
cleaner and more obvious.
---
 apps/emqx_resource/src/emqx_resource.erl         |  4 ++--
 .../src/emqx_resource_buffer_worker.erl          |  2 +-
 apps/emqx_resource/src/emqx_resource_manager.erl | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/emqx_resource/src/emqx_resource.erl b/apps/emqx_resource/src/emqx_resource.erl
index 57d56b339..1ccb5ca71 100644
--- a/apps/emqx_resource/src/emqx_resource.erl
+++ b/apps/emqx_resource/src/emqx_resource.erl
@@ -260,7 +260,7 @@ query(ResId, Request) ->
 -spec query(resource_id(), Request :: term(), query_opts()) ->
     Result :: term().
 query(ResId, Request, Opts) ->
-    case emqx_resource_manager:ets_lookup(ResId) of
+    case emqx_resource_manager:lookup_cached(ResId) of
         {ok, _Group, #{query_mode := QM, mod := Module}} ->
             IsBufferSupported = is_buffer_supported(Module),
             case {IsBufferSupported, QM} of
@@ -311,7 +311,7 @@ set_resource_status_connecting(ResId) ->
 -spec get_instance(resource_id()) ->
     {ok, resource_group(), resource_data()} | {error, Reason :: term()}.
 get_instance(ResId) ->
-    emqx_resource_manager:ets_lookup(ResId, [metrics]).
+    emqx_resource_manager:lookup_cached(ResId, [metrics]).
 
 -spec fetch_creation_opts(map()) -> creation_opts().
 fetch_creation_opts(Opts) ->
diff --git a/apps/emqx_resource/src/emqx_resource_buffer_worker.erl b/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
index 711833963..8bfd77e61 100644
--- a/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
+++ b/apps/emqx_resource/src/emqx_resource_buffer_worker.erl
@@ -885,7 +885,7 @@ handle_async_worker_down(Data0, Pid) ->
 
 call_query(QM0, Id, Index, Ref, Query, QueryOpts) ->
     ?tp(call_query_enter, #{id => Id, query => Query, query_mode => QM0}),
-    case emqx_resource_manager:ets_lookup(Id) of
+    case emqx_resource_manager:lookup_cached(Id) of
         {ok, _Group, #{status := stopped}} ->
             ?RESOURCE_ERROR(stopped, "resource stopped or disabled");
         {ok, _Group, Resource} ->
diff --git a/apps/emqx_resource/src/emqx_resource_manager.erl b/apps/emqx_resource/src/emqx_resource_manager.erl
index 0983dff8d..40f9fe1ab 100644
--- a/apps/emqx_resource/src/emqx_resource_manager.erl
+++ b/apps/emqx_resource/src/emqx_resource_manager.erl
@@ -36,8 +36,8 @@
     lookup/1,
     list_all/0,
     list_group/1,
-    ets_lookup/1,
-    ets_lookup/2,
+    lookup_cached/1,
+    lookup_cached/2,
     get_metrics/1,
     reset_metrics/1
 ]).
@@ -231,21 +231,21 @@ set_resource_status_connecting(ResId) ->
 -spec lookup(resource_id()) -> {ok, resource_group(), resource_data()} | {error, not_found}.
 lookup(ResId) ->
     case safe_call(ResId, lookup, ?T_LOOKUP) of
-        {error, timeout} -> ets_lookup(ResId, [metrics]);
+        {error, timeout} -> lookup_cached(ResId, [metrics]);
         Result -> Result
     end.
 
 %% @doc Lookup the group and data of a resource from the cache
--spec ets_lookup(resource_id()) -> {ok, resource_group(), resource_data()} | {error, not_found}.
-ets_lookup(ResId) ->
-    ets_lookup(ResId, []).
+-spec lookup_cached(resource_id()) -> {ok, resource_group(), resource_data()} | {error, not_found}.
+lookup_cached(ResId) ->
+    lookup_cached(ResId, []).
 
 %% @doc Lookup the group and data of a resource from the cache
--spec ets_lookup(resource_id(), [Option]) ->
+-spec lookup_cached(resource_id(), [Option]) ->
     {ok, resource_group(), resource_data()} | {error, not_found}
 when
     Option :: metrics.
-ets_lookup(ResId, Options) ->
+lookup_cached(ResId, Options) ->
     NeedMetrics = lists:member(metrics, Options),
     case read_cache(ResId) of
         {Group, Data} when NeedMetrics ->