diff options
| author | Sverker Eriksson <[email protected]> | 2017-03-24 18:21:26 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-03-24 18:21:26 +0100 |
| commit | 44b5223489576a6ec719cbdb3bbdb31624326a32 (patch) | |
| tree | 7bc9b30d8f3a2e0e1637b9ab369e7259a07b6b19 | |
| parent | 4dd2ccbdf374b4ce631d4d796bb690a55149e160 (diff) | |
| download | otp-44b5223489576a6ec719cbdb3bbdb31624326a32.tar.gz otp-44b5223489576a6ec719cbdb3bbdb31624326a32.tar.bz2 otp-44b5223489576a6ec719cbdb3bbdb31624326a32.zip | |
Fix double hit bug of select/3 with bound key
| -rw-r--r-- | erts/emulator/beam/erl_db_hash.c | 2 | ||||
| -rw-r--r-- | lib/stdlib/test/ets_SUITE.erl | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c index 0d908fc2c8..b58fe7a185 100644 --- a/erts/emulator/beam/erl_db_hash.c +++ b/erts/emulator/beam/erl_db_hash.c @@ -1311,7 +1311,7 @@ static int match_traverse(Process* p, DbTableHash* tb, else if (mpi.key_given) { /* Key is bound */ unlock_hash_function(lck); if (current_list_pos == mpi.num_lists) { - ret_value = on_loop_ended(context_ptr, slot_ix, got, iterations_left, &mpi.mp, ret); + ret_value = on_loop_ended(context_ptr, -1, got, iterations_left, &mpi.mp, ret); goto done; } else { slot_ix = mpi.lists[current_list_pos].ix; diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl index 84d90b3260..ac68fdcc34 100644 --- a/lib/stdlib/test/ets_SUITE.erl +++ b/lib/stdlib/test/ets_SUITE.erl @@ -39,6 +39,7 @@ -export([lookup_element_mult/1]). -export([foldl_ordered/1, foldr_ordered/1, foldl/1, foldr/1, fold_empty/1]). -export([t_delete_object/1, t_init_table/1, t_whitebox/1, + select_bound_chunk/1, t_delete_all_objects/1, t_insert_list/1, t_test_ms/1, t_select_delete/1,t_select_replace/1,t_ets_dets/1]). @@ -118,6 +119,7 @@ all() -> update_counter_with_default, partly_bound, update_counter_table_growth, match_heavy, {group, fold}, member, t_delete_object, + select_bound_chunk, t_init_table, t_whitebox, t_delete_all_objects, t_insert_list, t_test_ms, t_select_delete, t_select_replace, t_ets_dets, memory, t_select_reverse, t_bucket_disappears, @@ -696,6 +698,15 @@ whitebox_2(Opts) -> ets:delete(T2), ok. +select_bound_chunk(Config) -> + repeat_for_opts(fun select_bound_chunk_do/1, [all_types]). + +select_bound_chunk_do(Opts) -> + T = ets:new(x, Opts), + ets:insert(T, [{key, 1}]), + {[{key, 1}], '$end_of_table'} = ets:select(T, [{{key,1},[],['$_']}], 100000), + ok. + %% Test ets:to/from_dets. t_ets_dets(Config) when is_list(Config) -> |