chore(mria): Fix clear_table and ro_transaction calls
This commit is contained in:
parent
ae71bdc0fe
commit
75c9267473
|
@ -221,7 +221,7 @@ handle_call(delete_all_deactivated_alarms, _From, State) ->
|
||||||
|
|
||||||
handle_call({get_alarms, all}, _From, State) ->
|
handle_call({get_alarms, all}, _From, State) ->
|
||||||
{atomic, Alarms} =
|
{atomic, Alarms} =
|
||||||
ekka_mnesia:ro_transaction(
|
mria:ro_transaction(
|
||||||
?COMMON_SHARD,
|
?COMMON_SHARD,
|
||||||
fun() ->
|
fun() ->
|
||||||
[normalize(Alarm) ||
|
[normalize(Alarm) ||
|
||||||
|
@ -321,7 +321,7 @@ deactivate_all_alarms() ->
|
||||||
|
|
||||||
%% Delete all records from the given table, ignore result.
|
%% Delete all records from the given table, ignore result.
|
||||||
clear_table(TableName) ->
|
clear_table(TableName) ->
|
||||||
case ekka_mnesia:clear_table(TableName) of
|
case mria:clear_table(TableName) of
|
||||||
{aborted, Reason} ->
|
{aborted, Reason} ->
|
||||||
?SLOG(warning, #{
|
?SLOG(warning, #{
|
||||||
msg => "fail_to_clear_table",
|
msg => "fail_to_clear_table",
|
||||||
|
|
|
@ -329,6 +329,6 @@ do_compact_test() ->
|
||||||
do_compact(words(<<"a/+/+/+/+/b">>))),
|
do_compact(words(<<"a/+/+/+/+/b">>))),
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
clear_tables() -> ekka_mnesia:clear_table(?TRIE).
|
clear_tables() -> mria:clear_table(?TRIE).
|
||||||
|
|
||||||
-endif. % TEST
|
-endif. % TEST
|
||||||
|
|
|
@ -141,7 +141,7 @@ update_pwd(Username, Fun) ->
|
||||||
-spec(lookup_user(binary()) -> [mqtt_admin()]).
|
-spec(lookup_user(binary()) -> [mqtt_admin()]).
|
||||||
lookup_user(Username) when is_binary(Username) ->
|
lookup_user(Username) when is_binary(Username) ->
|
||||||
Fun = fun() -> mnesia:read(mqtt_admin, Username) end,
|
Fun = fun() -> mnesia:read(mqtt_admin, Username) end,
|
||||||
{atomic, User} = ekka_mnesia:ro_transaction(?DASHBOARD_SHARD, Fun),
|
{atomic, User} = mria:ro_transaction(?DASHBOARD_SHARD, Fun),
|
||||||
User.
|
User.
|
||||||
|
|
||||||
-spec(all_users() -> [#mqtt_admin{}]).
|
-spec(all_users() -> [#mqtt_admin{}]).
|
||||||
|
|
|
@ -135,7 +135,7 @@ do_destroy_by_username(Username) ->
|
||||||
-spec(lookup(Token :: binary()) -> {ok, #mqtt_admin_jwt{}} | {error, not_found}).
|
-spec(lookup(Token :: binary()) -> {ok, #mqtt_admin_jwt{}} | {error, not_found}).
|
||||||
lookup(Token) ->
|
lookup(Token) ->
|
||||||
Fun = fun() -> mnesia:read(?TAB, Token) end,
|
Fun = fun() -> mnesia:read(?TAB, Token) end,
|
||||||
case ekka_mnesia:ro_transaction(?DASHBOARD_SHARD, Fun) of
|
case mria:ro_transaction(?DASHBOARD_SHARD, Fun) of
|
||||||
{atomic, [JWT]} -> {ok, JWT};
|
{atomic, [JWT]} -> {ok, JWT};
|
||||||
{atomic, []} -> {error, not_found}
|
{atomic, []} -> {error, not_found}
|
||||||
end.
|
end.
|
||||||
|
@ -143,7 +143,7 @@ lookup(Token) ->
|
||||||
lookup_by_username(Username) ->
|
lookup_by_username(Username) ->
|
||||||
Spec = [{{mqtt_admin_jwt, '_', Username, '_'}, [], ['$_']}],
|
Spec = [{{mqtt_admin_jwt, '_', Username, '_'}, [], ['$_']}],
|
||||||
Fun = fun() -> mnesia:select(?TAB, Spec) end,
|
Fun = fun() -> mnesia:select(?TAB, Spec) end,
|
||||||
{atomic, List} = ekka_mnesia:ro_transaction(?DASHBOARD_SHARD, Fun),
|
{atomic, List} = mria:ro_transaction(?DASHBOARD_SHARD, Fun),
|
||||||
List.
|
List.
|
||||||
|
|
||||||
|
|
||||||
|
@ -193,7 +193,7 @@ handle_info(clean_jwt, State) ->
|
||||||
timer_clean(self()),
|
timer_clean(self()),
|
||||||
Now = erlang:system_time(millisecond),
|
Now = erlang:system_time(millisecond),
|
||||||
Spec = [{{mqtt_admin_jwt, '_', '_', '$1'}, [{'<', '$1', Now}], ['$_']}],
|
Spec = [{{mqtt_admin_jwt, '_', '_', '$1'}, [{'<', '$1', Now}], ['$_']}],
|
||||||
{atomic, JWTList} = ekka_mnesia:ro_transaction(?DASHBOARD_SHARD,
|
{atomic, JWTList} = mria:ro_transaction(?DASHBOARD_SHARD,
|
||||||
fun() -> mnesia:select(?TAB, Spec) end),
|
fun() -> mnesia:select(?TAB, Spec) end),
|
||||||
destroy(JWTList),
|
destroy(JWTList),
|
||||||
{noreply, State};
|
{noreply, State};
|
||||||
|
|
|
@ -49,7 +49,7 @@ init_per_testcase(_TestCase, Config) ->
|
||||||
|
|
||||||
end_per_testcase(_TestCase, Config) ->
|
end_per_testcase(_TestCase, Config) ->
|
||||||
{Tab, _Pid} = proplists:get_value(reg, Config),
|
{Tab, _Pid} = proplists:get_value(reg, Config),
|
||||||
ekka_mnesia:clear_table(Tab),
|
mria:clear_table(Tab),
|
||||||
Config.
|
Config.
|
||||||
|
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
|
|
|
@ -150,8 +150,8 @@ handle_continue(?CATCH_UP, State) ->
|
||||||
{noreply, State, catch_up(State)}.
|
{noreply, State, catch_up(State)}.
|
||||||
|
|
||||||
handle_call(reset, _From, State) ->
|
handle_call(reset, _From, State) ->
|
||||||
_ = ekka_mnesia:clear_table(?CLUSTER_COMMIT),
|
_ = mria:clear_table(?CLUSTER_COMMIT),
|
||||||
_ = ekka_mnesia:clear_table(?CLUSTER_MFA),
|
_ = mria:clear_table(?CLUSTER_MFA),
|
||||||
{reply, ok, State, {continue, ?CATCH_UP}};
|
{reply, ok, State, {continue, ?CATCH_UP}};
|
||||||
|
|
||||||
handle_call({initiate, MFA}, _From, State = #{node := Node}) ->
|
handle_call({initiate, MFA}, _From, State = #{node := Node}) ->
|
||||||
|
|
|
@ -157,7 +157,7 @@ match_messages(_, Topic, Cursor) ->
|
||||||
end.
|
end.
|
||||||
|
|
||||||
clean(_) ->
|
clean(_) ->
|
||||||
ekka_mnesia:clear_table(?TAB),
|
mria:clear_table(?TAB),
|
||||||
ok.
|
ok.
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
%% Internal functions
|
%% Internal functions
|
||||||
|
|
Loading…
Reference in New Issue