summaryrefslogtreecommitdiff
path: root/src/ebtree/src/ebtree.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/ebtree/src/ebtree.erl')
-rw-r--r--src/ebtree/src/ebtree.erl18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/ebtree/src/ebtree.erl b/src/ebtree/src/ebtree.erl
index 3cfb82030..97a820304 100644
--- a/src/ebtree/src/ebtree.erl
+++ b/src/ebtree/src/ebtree.erl
@@ -1187,7 +1187,7 @@ umerge_members_int(_Collate, List1, [], Acc) ->
umerge_members_int(Collate, [H1 | T1], [H2 | T2], Acc) ->
case Collate(H1, H2) of
lt -> umerge_members_int(Collate, T1, [H2 | T2], [H1 | Acc]);
- eq -> umerge_members_int(Collate, T1, [H2 | T2], [H1 | Acc]);
+ eq -> umerge_members_int(Collate, T1, T2, [H1 | Acc]);
gt -> umerge_members_int(Collate, [H1 | T1], T2, [H2 | Acc])
end.
@@ -1800,4 +1800,20 @@ cache_test_() ->
?assertEqual(3, length(NodeCache))
end]}.
+
+umerge_members_test() ->
+ Tree = #tree{collate_fun = fun collate_raw/2},
+ NewList = fun() ->
+ Raw = [{rand:uniform(100), rand:uniform()} || _ <- lists:seq(1, 100)],
+ lists:ukeysort(1, Raw)
+ end,
+ lists:foreach(fun(_) ->
+ A = NewList(),
+ B = NewList(),
+ Stdlib = lists:ukeymerge(1, A, B),
+ Custom = umerge_members(Tree, 0, A, B),
+ ?assertEqual(Stdlib, Custom)
+ end, lists:seq(1, 100)).
+
+
-endif.