feat: refactor delay PUBACK handling to use a defined table macro

Author: VivekPipaliya23

apps/vmq_server/src/vmq_delay_puback_cli.erl

@@ -2,6 +2,8 @@
 -export([register_cli/0]).
 -behaviour(clique_handler).
 
+-define(DELAY_PUBACK_TBL, vmq_delay_puback_table).
+
 register_cli() ->
     clique:register_usage(["vmq-admin", "delay_puback"], delay_puback_usage()),
     clique:register_usage(["vmq-admin", "delay_puback", "show"], show_usage()),
@@ -25,7 +27,7 @@ enable_cmd() ->
     Cmd = ["vmq-admin", "delay_puback", "enable"],
     KeySpecs = [acl_name_keyspec()],
     Callback = fun(_, [{acl_name, Name}], _) ->
-        ets:insert(vmq_delay_puback_cache, {Name}),
+        ets:insert(?DELAY_PUBACK_TBL, {Name}),
         Config = vmq_config:get_env(delay_puback_config, []),
         NewConfig = lists:usort([Name | Config]),
         vmq_config:set_global_env(vmq_server, delay_puback_config, NewConfig, true),
@@ -37,7 +39,7 @@ disable_cmd() ->
     Cmd = ["vmq-admin", "delay_puback", "disable"],
     KeySpecs = [acl_name_keyspec()],
     Callback = fun(_, [{acl_name, Name}], _) ->
-        ets:delete(vmq_delay_puback_cache, Name),
+        ets:delete(?DELAY_PUBACK_TBL, Name),
         Config = vmq_config:get_env(delay_puback_config, []),
         NewConfig = lists:delete(Name, Config),
         vmq_config:set_global_env(vmq_server, delay_puback_config, NewConfig, true),

apps/vmq_server/src/vmq_mqtt_fsm.erl

@@ -31,6 +31,8 @@
 -define(IS_PROTO_3(X), X =:= 3; X =:= 131).
 -define(IS_BRIDGE(X), X =:= 131; X =:= 132).
 
+-define(DELAY_PUBACK_TBL, vmq_delay_puback_table).
+
 -type timestamp() :: {non_neg_integer(), non_neg_integer(), non_neg_integer()}.
 
 -record(state, {
@@ -1789,4 +1791,4 @@ extract_qos({QoS, _SubInfo}) -> QoS.
 should_delay_puback(undefined, _State) ->
     false;
 should_delay_puback(AclName, _State) ->
-    ets:member(vmq_delay_puback_cache, AclName).
+    ets:member(?DELAY_PUBACK_TBL, AclName).

apps/vmq_server/src/vmq_server_app.erl

@@ -19,6 +19,8 @@
 %% Application callbacks
 -export([start/2, stop/1]).
 
+-define(DELAY_PUBACK_TBL, vmq_delay_puback_table).
+
 %% ===================================================================
 %% Application callbacks
 %% ===================================================================
@@ -29,7 +31,7 @@ start(_StartType, _StartArgs) ->
         {error, _} = E ->
             E;
         R ->
-            ets:new(vmq_delay_puback_cache, [named_table, public, set, {read_concurrency, true}]),
+            ets:new(?DELAY_PUBACK_TBL, [named_table, public, set, {read_concurrency, true}]),
             {ok, _pid} = vmq_message_store:start(),
             %% we'll wait for some millis, this
             %% enables the vmq_plugin mechanism to be prepared...
@@ -40,7 +42,7 @@ start(_StartType, _StartArgs) ->
             start_user_plugins(),
             vmq_config:configure_node(),
             Config = vmq_config:get_env(delay_puback_config, []),
-            [ets:insert(vmq_delay_puback_cache, {Name}) || Name <- Config],
+            [ets:insert(?DELAY_PUBACK_TBL, {Name}) || Name <- Config],
             R
     end.