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

Revert "Check fpr with 4 keys"

Browse source 
This reverts commit d5bcccf0ec.
This commit is contained in:
Martin Sumner 2017-10-24 15:21:07 +01:00
parent d5bcccf0ec
commit 74c28b52c9
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/leveled_tinybloom.erl
View file

@ -50,8 +50,8 @@ check_hash(_Hash, <<>>) ->
false; false;
check_hash({_SegHash, Hash}, BloomBin) -> check_hash({_SegHash, Hash}, BloomBin) ->
SlotSplit = (byte_size(BloomBin) div ?BITS_PER_KEY) - 1, SlotSplit = (byte_size(BloomBin) div ?BITS_PER_KEY) - 1,
{Slot, H0, H1, H2, H3} = split_hash(Hash, SlotSplit), {Slot, H0, H1} = split_hash(Hash, SlotSplit),
Mask = get_mask(H0, H1, H2, H3), Mask = get_mask(H0, H1),
Pos = Slot * ?BITS_PER_KEY, Pos = Slot * ?BITS_PER_KEY,
IntSize = ?INTEGER_SIZE, IntSize = ?INTEGER_SIZE,
<<_H:Pos/binary, CheckInt:IntSize/integer, _T/binary>> = BloomBin, <<_H:Pos/binary, CheckInt:IntSize/integer, _T/binary>> = BloomBin,
@ -70,12 +70,15 @@ split_hash(Hash, SlotSplit) ->
Slot = Hash band SlotSplit, Slot = Hash band SlotSplit,
H0 = (Hash bsr 4) band (?BAND_MASK), H0 = (Hash bsr 4) band (?BAND_MASK),
H1 = (Hash bsr 10) band (?BAND_MASK), H1 = (Hash bsr 10) band (?BAND_MASK),
H2 = (Hash bsr 16) band (?BAND_MASK), {Slot, H0, H1}.
H3 = (Hash bsr 24) band (?BAND_MASK),
{Slot, H0, H1, H2, H3}.
get_mask(H0, H1, H2, H3) -> get_mask(H0, H1) ->
(1 bsl H0) bor (1 bsl H1) bor (1 bsl H2) bor (1 bsl H3). case H0 == H1 of
true ->
1 bsl H0;
false ->
(1 bsl H0) + (1 bsl H1)
end.
%% This looks ugly and clunky, but in tests it was quicker than modifying an %% This looks ugly and clunky, but in tests it was quicker than modifying an
@ -85,8 +88,8 @@ add_hashlist([], _S, S0, S1) ->
IntSize = ?INTEGER_SIZE, IntSize = ?INTEGER_SIZE,
<<S0:IntSize/integer, S1:IntSize/integer>>; <<S0:IntSize/integer, S1:IntSize/integer>>;
add_hashlist([{_SegHash, TopHash}|T], SlotSplit, S0, S1) -> add_hashlist([{_SegHash, TopHash}|T], SlotSplit, S0, S1) ->
{Slot, H0, H1, H2, H3} = split_hash(TopHash, SlotSplit), {Slot, H0, H1} = split_hash(TopHash, SlotSplit),
Mask = get_mask(H0, H1, H2, H3), Mask = get_mask(H0, H1),
case Slot of case Slot of
0 -> 0 ->
add_hashlist(T, SlotSplit, S0 bor Mask, S1); add_hashlist(T, SlotSplit, S0 bor Mask, S1);
@ -99,8 +102,8 @@ add_hashlist([], _S, S0, S1, S2, S3) ->
<<S0:IntSize/integer, S1:IntSize/integer, <<S0:IntSize/integer, S1:IntSize/integer,
S2:IntSize/integer, S3:IntSize/integer>>; S2:IntSize/integer, S3:IntSize/integer>>;
add_hashlist([{_SegHash, TopHash}|T], SlotSplit, S0, S1, S2, S3) -> add_hashlist([{_SegHash, TopHash}|T], SlotSplit, S0, S1, S2, S3) ->
{Slot, H0, H1, H2, H3} = split_hash(TopHash, SlotSplit), {Slot, H0, H1} = split_hash(TopHash, SlotSplit),
Mask = get_mask(H0, H1, H2, H3), Mask = get_mask(H0, H1),
case Slot of case Slot of
0 -> 0 ->
add_hashlist(T, SlotSplit, S0 bor Mask, S1, S2, S3); add_hashlist(T, SlotSplit, S0 bor Mask, S1, S2, S3);
@ -127,8 +130,8 @@ add_hashlist([{_SegHash, TopHash}|T],
SlotSplit, SlotSplit,
S0, S1, S2, S3, S4, S5, S6, S7, S8, S9, S0, S1, S2, S3, S4, S5, S6, S7, S8, S9,
SA, SB, SC, SD, SE, SF) -> SA, SB, SC, SD, SE, SF) ->
{Slot, H0, H1, H2, H3} = split_hash(TopHash, SlotSplit), {Slot, H0, H1} = split_hash(TopHash, SlotSplit),
Mask = get_mask(H0, H1, H2, H3), Mask = get_mask(H0, H1),
case Slot of case Slot of
0 -> 0 ->
add_hashlist(T, add_hashlist(T,