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

Oops, I left a merge in.

Browse source
This commit is contained in:
Gregory Burd 2012-06-22 10:53:04 +01:00
parent 9eabb78d06
commit d0245c85c0
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/hanoidb_writer.erl
View file

@ -172,11 +172,7 @@ do_open(Name, Options, OpenOpts) ->
%% @doc flush pending nodes and write trailer %% @doc flush pending nodes and write trailer
flush_nodes(#state{ nodes=[], last_node_pos=LastNodePos, last_node_size=_LastNodeSize, bloom=Bloom }=State) -> flush_nodes(#state{ nodes=[], last_node_pos=LastNodePos, last_node_size=_LastNodeSize, bloom=Bloom }=State) ->
<<<<<<< Updated upstream
BloomBin = zlib:zip(term_to_binary(Bloom)),
=======
BloomBin = term_to_binary(Bloom, [compressed]), BloomBin = term_to_binary(Bloom, [compressed]),
>>>>>>> Stashed changes
BloomSize = byte_size(BloomBin), BloomSize = byte_size(BloomBin),
IdxFile = State#state.index_file, IdxFile = State#state.index_file,