Skip to content

Commit

Permalink
fix up compile errors when debugging is enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
beerriot committed Jul 8, 2010
1 parent 17a5780 commit cae15e1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions src/luwak_get_stream.erl
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ map(Parent=#n{}, TreeOffset,
[];
map(Block, TreeOffset, _Map=#map{offset=Offset,ref=Ref,pid=Pid})
when TreeOffset < Offset ->
?debugFmt("B map(~p, ~p, ~p)~n", [Block, TreeOffset, Map]),
?debugFmt("B map(~p, ~p, ~p)~n", [Block, TreeOffset, _Map]),
PartialSize = Offset - TreeOffset,
<<_:PartialSize/binary, Tail/binary>> = luwak_block:data(Block),
?debugFmt("sending ~p~n", [{get, Ref, Tail, Offset}]),
Expand All @@ -127,14 +127,14 @@ map(Block, TreeOffset, _Map=#map{offset=Offset,ref=Ref,pid=Pid})
map(Block, TreeOffset,
_Map=#map{endoffset=EndOffset,ref=Ref,pid=Pid,blocksize=BlockSize})
when BlockSize >= EndOffset - TreeOffset ->
?debugFmt("C map(~p, ~p, ~p)~n", [Block, TreeOffset, Map]),
?debugFmt("C map(~p, ~p, ~p)~n", [Block, TreeOffset, _Map]),
PartialSize = EndOffset - TreeOffset,
<<PartialData:PartialSize/binary, _/binary>> = luwak_block:data(Block),
?debugFmt("sending ~p~n", [{get, Ref, PartialData, TreeOffset}]),
Pid ! {get, Ref, PartialData, TreeOffset},
[];
map(Block, TreeOffset, _Map=#map{ref=Ref,pid=Pid}) ->
?debugFmt("D map(~p, ~p, ~p)~n", [Block, TreeOffset, Map]),
?debugFmt("D map(~p, ~p, ~p)~n", [Block, TreeOffset, _Map]),
Data = luwak_block:data(Block),
?debugFmt("sending ~p~n", [{get, Ref, Data, TreeOffset}]),
Pid ! {get, Ref, Data, TreeOffset},
Expand Down
2 changes: 1 addition & 1 deletion src/luwak_io.erl
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ internal_put_range(Riak, File, Start, Data) ->
end.

write_blocks(_, _, _, _Start, <<>>, _, Written) when is_list(Written) ->
?debugFmt("A write_blocks(_, _, _, ~p, <<>>, _, ~p) ~n", [Start, Written]),
?debugFmt("A write_blocks(_, _, _, ~p, <<>>, _, ~p) ~n", [_Start, Written]),
{ok, lists:reverse(Written)};
%% start aligned sub-block write
write_blocks(Riak, File, undefined, Start, Data, BlockSize, Written)
Expand Down
12 changes: 6 additions & 6 deletions src/luwak_tree.erl
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ get_range(_Riak, _Fun, _Parent = #n{children=[]}, _BlockSize, _TreeStart,
get_range(_Riak, Fun, _Parent = #n{children=[{_,BlockSize}|_]=Children},
BlockSize, TreeStart, Start, End) ->
?debugFmt("A get_range(Riak, ~p, ~p, ~p, ~p, ~p)~n",
[Parent, BlockSize, TreeStart, Start, End]),
[_Parent, BlockSize, TreeStart, Start, End]),
{Nodes, Length} = read_split(Children, TreeStart, Start, End),
luwak_tree_utils:foldrflatmap(Fun, Nodes, Length);
get_range(_Riak, Fun, _Parent = #n{children=Children}, _BlockSize, TreeStart,
Start, End) ->
?debugFmt("B get_range(Riak, ~p, ~p, ~p, ~p, ~p)~n",
[Parent, BlockSize, TreeStart, Start, End]),
[_Parent, _BlockSize, TreeStart, Start, End]),
{Nodes, Length} = read_split(Children, TreeStart, Start, End),
luwak_tree_utils:foldrflatmap(Fun, Nodes, Length).

Expand All @@ -82,7 +82,7 @@ truncate(_Riak, _File, _Start, undefined, _Order, _NodeOffset, _BlockSize) ->
truncate(Riak, File, Start, _Parent=#n{children=Children},
Order, NodeOffset, BlockSize) ->
?debugFmt("B truncate(Riak, File, ~p, ~p, ~p, ~p, ~p)~n",
[Start,Parent,Order,NodeOffset,BlockSize]),
[Start,_Parent,Order,NodeOffset,BlockSize]),
{Keep, {Recurse,_RecLength}, _} = which_child(Children, NodeOffset,
Start, []),
KeepLength = luwak_tree_utils:blocklist_length(Keep),
Expand All @@ -95,7 +95,7 @@ truncate(Riak, File, Start, _Parent=#n{children=Children},
luwak_tree_utils:blocklist_length(NewNodeVal#n.children)}};
truncate(Riak, _File, Start, Block, _Order, NodeOffset, _BlockSize) ->
?debugFmt("C truncate(Riak, File, ~p, ~p, ~p, ~p, ~p)~n",
[Start, Block, _Order, NodeOffset, BlockSize]),
[Start, Block, _Order, NodeOffset, _BlockSize]),
Data = luwak_block:data(Block),
ByteOffset = Start - NodeOffset,
<<Retain:ByteOffset/binary, _/binary>> = Data,
Expand Down Expand Up @@ -277,12 +277,12 @@ which_child([E={_ChildName,Length}], NodeOffset, Pos, Acc)
?debugFmt("A which_child(~p, ~p, ~p)~n", [E, NodeOffset, Pos]),
{lists:reverse([E|Acc]), undefined, []};
which_child([E], _NodeOffset, _Pos, Acc) ->
?debugFmt("B which_child(~p, ~p, ~p)~n", [E, NodeOffset, Pos]),
?debugFmt("B which_child(~p, ~p, ~p)~n", [E, _NodeOffset, _Pos]),
{lists:reverse(Acc), E, []};
which_child([E={_ChildName,Length}|Tail], NodeOffset, Pos, Acc)
when Pos >= NodeOffset + Length ->
?debugFmt("C which_child(~p, ~p, ~p)~n",
[[{ChildName,Length}|Tail], NodeOffset, Pos]),
[[{_ChildName,Length}|Tail], NodeOffset, Pos]),
which_child(Tail, NodeOffset+Length, Pos, [E|Acc]);
which_child([{ChildName,Length}|Tail], NodeOffset, Pos, Acc)
when Pos < NodeOffset + Length ->
Expand Down

0 comments on commit cae15e1

Please sign in to comment.