diff --git a/src/lsm_btree_level.erl b/src/lsm_btree_level.erl index 02286f8..819c208 100644 --- a/src/lsm_btree_level.erl +++ b/src/lsm_btree_level.erl @@ -364,7 +364,7 @@ begin_merge(State) -> file:delete(XFileName), MergePID = proc_lib:spawn_link(fun() -> - {ok, OutCount} = lsm_btree_merger2:merge(AFileName, BFileName, XFileName, + {ok, OutCount} = lsm_btree_merger:merge(AFileName, BFileName, XFileName, 1 bsl (State#state.level + 1), State#state.next =:= undefined), % error_logger:info_msg("merge done ~p,~p -> ~p~n", [AFileName, BFileName, XFileName]), diff --git a/src/lsm_btree_merger.erl b/src/lsm_btree_merger.erl index c883717..58cab47 100644 --- a/src/lsm_btree_merger.erl +++ b/src/lsm_btree_merger.erl @@ -1,4 +1,4 @@ --module(lsm_btree_merger2). +-module(lsm_btree_merger). %% %% Merging two BTrees diff --git a/test/lsm_btree_merger_tests.erl b/test/lsm_btree_merger_tests.erl index 6e5d5da..520e72f 100644 --- a/test/lsm_btree_merger_tests.erl +++ b/test/lsm_btree_merger_tests.erl @@ -31,7 +31,7 @@ merge_test() -> ok = lsm_btree_writer:close(BT2), - {Time,{ok,Count}} = timer:tc(lsm_btree_merger2, merge, ["test1", "test2", "test3", 10000, true]), + {Time,{ok,Count}} = timer:tc(lsm_btree_merger, merge, ["test1", "test2", "test3", 10000, true]), error_logger:info_msg("time to merge: ~p/sec (time=~p, count=~p)~n", [1000000/(Time/Count), Time/1000000, Count]),