umgeher/leveled
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Reuse codec key comparison

Browse source 
There was duplication of key comparison logic between leveled_codec and
leveled_sft.  Now both use the leveled_codec key_dominates function
This commit is contained in:
martinsumner 2016-10-21 15:30:53 +01:00
parent b2089baa1e
commit 3710d09fbf
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/leveled_sft.erl
View file

@ -1069,25 +1069,21 @@ key_dominates_expanded([], [H2|T2], Level) ->
{{next_key, H2}, [], maybe_expand_pointer(T2)} {{next_key, H2}, [], maybe_expand_pointer(T2)}
end; end;
key_dominates_expanded([H1|T1], [H2|T2], Level) -> key_dominates_expanded([H1|T1], [H2|T2], Level) ->
{{K1, V1}, {K2, V2}} = {H1, H2}, case leveled_codec:key_dominates(H1, H2) of
{Sq1, St1, _MD1} = leveled_codec:striphead_to_details(V1), left_hand_first ->
{Sq2, St2, _MD2} = leveled_codec:striphead_to_details(V2), St1 = leveled_codec:strip_to_statusonly(H1),
case K1 of
K2 ->
case Sq1 > Sq2 of
true ->
{skipped_key, [H1|T1], maybe_expand_pointer(T2)};
false ->
{skipped_key, maybe_expand_pointer(T1), [H2|T2]}
end;
K1 when K1 < K2 ->
case maybe_reap_expiredkey(St1, Level) of case maybe_reap_expiredkey(St1, Level) of
true -> true ->
{skipped_key, maybe_expand_pointer(T1), [H2|T2]}; {skipped_key, maybe_expand_pointer(T1), [H2|T2]};
false -> false ->
{{next_key, H1}, maybe_expand_pointer(T1), [H2|T2]} {{next_key, H1}, maybe_expand_pointer(T1), [H2|T2]}
end; end;
_ -> left_hand_dominant ->
{skipped_key, [H1|T1], maybe_expand_pointer(T2)};
right_hand_dominant ->
{skipped_key, maybe_expand_pointer(T1), [H2|T2]};
right_hand_first ->
St2 = leveled_codec:strip_to_statusonly(H2),
case maybe_reap_expiredkey(St2, Level) of case maybe_reap_expiredkey(St2, Level) of
true -> true ->
{skipped_key, [H1|T1], maybe_expand_pointer(T2)}; {skipped_key, [H1|T1], maybe_expand_pointer(T2)};