Skip to content

Commit

Permalink
Handle forgotten ets errors
Browse files Browse the repository at this point in the history 
While at it, update the test suite to test for forgotten functions.
  • Loading branch information
@bjorng
bjorng committed Mar 11, 2021
1 parent 7428460 commit 8910886
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 4 deletions.
18 changes: 18 additions & 0 deletions lib/stdlib/src/erl_stdlib_errors.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,22 @@ format_ets_error(match_object, [_], _Cause) ->
[bad_continuation];
format_ets_error(match_object, [_,_,_]=Args, Cause) ->
format_limit(Args, Cause);
format_ets_error(match_spec_compile, [_], _Cause) ->
[bad_matchspec];
format_ets_error(next, Args, Cause) ->
format_default(bad_key, Args, Cause);
format_ets_error(new, [Name,Options], _Cause) ->
NameError = if
is_atom(Name) -> [];
true -> not_atom
end,
OptsError = must_be_list(Options),
case {NameError,OptsError} of
{[],[]} ->
[[],bad_options];
{_,_} ->
[NameError,OptsError]
end;
format_ets_error(prev, Args, Cause) ->
format_default(bad_key, Args, Cause);
format_ets_error(rename, [_,NewName]=Args, Cause) ->
Expand Down Expand Up @@ -455,6 +469,8 @@ format_ets_error(internal_select_delete, Args, Cause) ->
format_default(bad_matchspec, Args, Cause);
format_ets_error(select_replace, Args, Cause) ->
format_default(bad_matchspec, Args, Cause);
format_ets_error(select_reverse, [_], _Cause) ->
[bad_continuation];
format_ets_error(select_reverse, [_,_]=Args, Cause) ->
format_default(bad_matchspec, Args, Cause);
format_ets_error(select_reverse, [_,_,_]=Args, Cause) ->
Expand Down Expand Up @@ -794,6 +810,8 @@ expand_error(empty_tuple) ->
<<"is an empty tuple">>;
expand_error(name_already_exists) ->
<<"table name already exists">>;
expand_error(not_atom) ->
<<"not an atom">>;
expand_error(not_binary) ->
<<"not a binary">>;
expand_error(not_compiled_regexp) ->
Expand Down
77 changes: 73 additions & 4 deletions lib/stdlib/test/ets_SUITE.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8618,18 +8618,35 @@ error_info(_Config) ->
{delete_all_objects, ['$Tab'], [renamed]},
{delete_object, ['$Tab', bad_object]},
{delete_object, ['$Tab', {tag,non_existing}], [no_fail]},

{file2tab, 1}, %Not BIF.
{file2tab, 2}, %Not BIF.

{first, ['$Tab']},

{foldl, 3}, %Not BIF.
{foldr, 3}, %Not BIF.

{from_dets, 2}, %Not BIF.

{fun2ms, 1}, %Not BIF.

{give_away, ['$Tab', not_a_pid, bad_pid]},
{give_away, ['$Tab', '$Self', already_owner], [{error_term,owner}]},
{give_away, ['$Tab', '$Living', living_process], [only_bad_table]},
{give_away, ['$Tab', '$Dead', dead_process]},

{give_away, [UnownedTable, '$Living', gift_data], [{error_term,not_owner}]},

{i, 1}, %Not BIF.
{i, 2}, %Not BIF.
{i, 3}, %Not BIF.

{info, ['$Tab']},
{info, ['$Tab', invalid_item]},

{init_table, 2}, %Not BIF.

{insert, ['$Tab', bad_object]},
{insert, ['$Tab', {}]},
{insert, ['$Tab', [a,{a,b,c}]]},
Expand All @@ -8642,6 +8659,11 @@ error_info(_Config) ->
{insert_new, ['$Tab', [a,{a,b,c}]]},
{insert_new, ['$Tab', [a|b]]},

{internal_delete_all, 2}, %Internal function.
{internal_select_delete, 2}, %Internal function.

{is_compiled_ms, [bad_ms], [no_fail, no_table]},

{last, ['$Tab']},

{lookup, ['$Tab', no_key], [no_fail]},
Expand All @@ -8664,8 +8686,17 @@ error_info(_Config) ->
{match_object, ['$Tab', <<1,2,3>>], [no_fail]},
{match_object, ['$Tab', <<1,2,3>>, bad_limit]},

{match_spec_compile, [bad_match_spec], [no_table]},
{match_spec_run, 2}, %Not BIF.
{match_spec_run_r, 3}, %Internal BIF.

{member, ['$Tab', no_key], [no_fail]},

{new, [name, not_list], [no_table]},
{new, [name, [a|b]], [no_table]},
{new, [name, [a,b]], [no_table]},
{new, [{bad,name}, [a,b]], [no_table]},

%% For a set, ets:next/2 and ets:prev/2 fails if the key does
%% not exist.
{next, [Set, no_key]},
Expand All @@ -8680,6 +8711,8 @@ error_info(_Config) ->
{rename, [NamedTable, '$named_table']},
{rename, [NamedTable, {bad,name}]},

{repair_continuation, 2}, %Not BIF.

{safe_fixtable, ['$Tab', true], [no_fail]},
{safe_fixtable, ['$Tab', not_boolean]},

Expand All @@ -8704,6 +8737,8 @@ error_info(_Config) ->

{select_replace, [BagTab, [{{'$1','$2','$3'},[],[{{'$1','$3','$2'}}]}]], [{error_term,table_type}]},

{select_reverse, [bad_continuation], [no_table]},

{select_reverse, ['$Tab', Ms], [no_fail]},
{select_reverse, ['$Tab', bad_match_spec]},

Expand All @@ -8716,8 +8751,18 @@ error_info(_Config) ->
{slot, ['$Tab', -1]},
{slot, ['$Tab', not_an_integer]},

{tab2file, 2}, %Not BIF.
{tab2file, 3}, %Not BIF.
{tab2list, 1}, %Not BIF.
{tabfile_info, 1}, %Not BIF.
{table, 1}, %Not BIF.
{table, 2}, %Not BIF.

{take, ['$Tab', no_key], [no_fail]},

{test_ms, 2}, %Not BIF.
{to_dets, 2}, %Not BIF.

{update_counter, ['$Tab', no_key, 1], [{error_term,badkey}]},
{update_counter, ['$Tab', no_key, bad_increment], [{error_term,badkey}]},
{update_counter, ['$Tab', no_key, {1, 42}], [{error_term,badkey}]},
Expand Down Expand Up @@ -8770,7 +8815,20 @@ error_info(_Config) ->
ct:fail({length(Errors),errors})
end.

eval_ets_bif_errors(List) ->
eval_ets_bif_errors(L0) ->
L1 = lists:foldl(fun({_,A}, Acc) when is_integer(A) -> Acc;
({F,A}, Acc) -> [{F,A,[]}|Acc];
({F,A,Opts}, Acc) -> [{F,A,Opts}|Acc]
end, [], L0),
Tests = ordsets:from_list([{F,length(A)} || {F,A,_} <- L1] ++
[{F,A} || {F,A} <- L0, is_integer(A)]),
Bifs0 = [{F,A} || {F,A} <- ets:module_info(exports),
A =/= 0,
F =/= module_info],
Bifs = ordsets:from_list(Bifs0),
NYI = [{F,lists:duplicate(A, '*'),nyi} || {F,A} <- Bifs -- Tests],
L = lists:sort(NYI ++ L1),

spawn(fun() ->
true = register(living, self()),
Ref = make_ref(),
Expand All @@ -8779,12 +8837,20 @@ eval_ets_bif_errors(List) ->
ok
end
end),
do_eval_ets_bif_errors(List).

do_eval_ets_bif_errors(L).

do_eval_ets_bif_errors([H|T]) ->
case H of
{F, Args} ->
eval_ets_bif_errors(F, Args, []);
{_, Args, nyi} ->
case lists:all(fun(A) -> A =:= '*' end, Args) of
true ->
store_error(nyi, H, error);
false ->
store_error(bad_nyi, H, error)
end;
{F, Args, Opts} when is_list(Opts) ->
case lists:member(no_table, Opts) of
true ->
Expand All @@ -8801,12 +8867,15 @@ ets_eval_bif_errors_once(F, Args, Opts) ->
MFA = {ets,F,Args},
io:format("\n\n*** ets:~p/~p", [F,length(Args)]),

NoFail = lists:member(no_fail, Opts),
case ets_apply(F, Args, Opts) of
{error,none} ->
ok;
{error,Info} ->
store_error(wrong_failure_reason, MFA, Info);
ok ->
ok when NoFail ->
ok;
ok when not NoFail ->
%% This ETS function was supposed to fail.
store_error(expected_failure, MFA, ok)
end.
Expand Down Expand Up @@ -8893,7 +8962,7 @@ should_apply([_], _Opts) ->
%% the argument is valid.
false;
should_apply([_,_|_], Opts) ->
%% Applying the function on valid table would have side effects
%% Applying the function on a valid table would have side effects
%% that would cause problems down the line (e.g. successfully
%% giving away a table).
not lists:member(only_bad_table, Opts).
Expand Down

0 comments on commit 8910886

Please sign in to comment.