Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/ra_mt.erl
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,15 @@ commit(#?MODULE{tid = Tid,
commit(Prev0)
end,
Staged = lists:reverse(Staged0),
true = ets:insert(Tid, Staged),
%% TODO: mt: could prev contain overwritten entries?
{PrevStaged ++ Staged, State#?MODULE{staged = undefined,
prev = Prev}}.
case catch ets:insert(Tid, Staged) of
true ->
%% TODO: mt: could prev contain overwritten entries?
{PrevStaged ++ Staged, State#?MODULE{staged = undefined,
prev = Prev}};
{'EXIT', {badarg, _}} ->
{[], State#?MODULE{staged = undefined,
prev = Prev}}
end.

-spec abort(state()) -> state().
abort(#?MODULE{staged = undefined} = State) ->
Expand Down
20 changes: 20 additions & 0 deletions test/ra_mt_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ all_tests() ->
stage_commit,
range_overlap,
stage_commit_abort,
commit_after_table_deleted,
perf
].

Expand Down Expand Up @@ -468,6 +469,25 @@ perf(_Config) ->

ok.

commit_after_table_deleted(_Config) ->
Tid = ets:new(t1, [set, public]),
Mt0 = ra_mt:init(Tid),

%% Stage some entries
{ok, Mt1} = ra_mt:stage({1, 1, <<"data1">>}, Mt0),
{ok, Mt2} = ra_mt:stage({2, 1, <<"data2">>}, Mt1),

%% Simulate table deletion
true = ets:delete(Tid),

%% Should return empty list since table is deleted
{Entries, _Mt3} = ra_mt:commit(Mt2),

%% Should return empty entries since table was deleted
?assertEqual([], Entries),

ok.


%%% Util

Expand Down