greg/hanoidb
1
0
Fork 0
Code Issues 10 Pull requests 3 Projects Releases Packages Wiki Activity

Whitespace

Browse source
This commit is contained in:
Gregory Burd 2012-06-19 23:00:18 +01:00
parent 538518045c
commit 39d06fb29d
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/hanoidb_writer.erl
View file

@ -95,7 +95,7 @@ init([Name,Options]) ->
case do_open(Name, Options, [exclusive]) of case do_open(Name, Options, [exclusive]) of
{ok, IdxFile} -> {ok, IdxFile} ->
file:write(IdxFile, ?FILE_FORMAT), file:write(IdxFile, ?FILE_FORMAT),
{ok, BloomFilter} = ebloom:new(erlang:min(Size,16#ffffffff), 0.01, 123), {ok, BloomFilter} = ebloom:new(erlang:min(Size, 16#ffffffff), 0.01, 123),
BlockSize = hanoidb:get_opt(block_size, Options, ?NODE_SIZE), BlockSize = hanoidb:get_opt(block_size, Options, ?NODE_SIZE),
{ok, #state{ name=Name, {ok, #state{ name=Name,
index_file_pos=?FIRST_BLOCK_POS, index_file=IdxFile, index_file_pos=?FIRST_BLOCK_POS, index_file=IdxFile,
@ -166,9 +166,8 @@ serialize(#state{ bloom=Bloom, index_file=File, index_file_pos=Position }=State)
deserialize(Binary) -> deserialize(Binary) ->
{ State, BinBloom } = erlang:binary_to_term( Binary ), { State, BinBloom } = erlang:binary_to_term( Binary ),
% io:format("deserializing ~p @ ~p~n", [State#state.name,
% State#state.index_file_pos]),
{ok, Bloom } = ebloom:deserialize(BinBloom), {ok, Bloom } = ebloom:deserialize(BinBloom),
% io:format("deserializing ~p @ ~p // ~p~n", [State#state.name, State#state.index_file_pos, Bloom]),
{ok, IdxFile} = do_open(State#state.name, State#state.opts, []), {ok, IdxFile} = do_open(State#state.name, State#state.opts, []),
State#state{ bloom = Bloom, index_file=IdxFile }. State#state{ bloom = Bloom, index_file=IdxFile }.
@ -215,7 +214,7 @@ flush_nodes(State) ->
flush_nodes(State2). flush_nodes(State2).
add_record(Level, Key, Value, add_record(Level, Key, Value,
#state{ nodes=[ #node{level=Level, members=List, size=NodeSize}=CurrNode |RestNodes], #state{ nodes=[ #node{level=Level, members=List, size=NodeSize}=CurrNode | RestNodes ],
value_count=VC, tombstone_count=TC }=State) -> value_count=VC, tombstone_count=TC }=State) ->
%% The top-of-stack node is at the level we wish to insert at. %% The top-of-stack node is at the level we wish to insert at.
@ -233,7 +232,7 @@ add_record(Level, Key, Value,
NewSize = NodeSize + hanoidb_util:estimate_node_size_increment(List, Key, Value), NewSize = NodeSize + hanoidb_util:estimate_node_size_increment(List, Key, Value),
ok = ebloom:insert( State#state.bloom, Key ), ok = ebloom:insert(State#state.bloom, Key),
if Level == 0 -> if Level == 0 ->
case Value of case Value of