Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '1.2'

  • Loading branch information...
commit 089ffd741c41c85d9d901b8b568e781826247458 2 parents 89c6c6a + ffc168d
@jaredmorrow jaredmorrow authored
Showing with 4 additions and 5 deletions.
  1. +1 −1  src/merge_index.app.src
  2. +3 −4 src/mi_scheduler.erl
View
2  src/merge_index.app.src
@@ -1,6 +1,6 @@
{application, merge_index,
[{description, "Merge-Index Data Store"},
- {vsn, "1.2.0"},
+ {vsn, "1.2.1"},
{applications, [kernel,
stdlib,
sasl]},
View
7 src/mi_scheduler.erl
@@ -52,7 +52,7 @@ start() ->
schedule_compaction(Pid) ->
gen_server:call(?MODULE, {schedule_compaction, Pid}, infinity).
-
+
%% ====================================================================
%% gen_server callbacks
@@ -123,9 +123,9 @@ worker_loop(Parent) ->
Parent ! {worker_ready, self()},
receive
{compaction, Pid} ->
- Start = now(),
+ Start = os:timestamp(),
Result = merge_index:compact(Pid),
- ElapsedSecs = timer:now_diff(now(), Start) / 1000000,
+ ElapsedSecs = timer:now_diff(os:timestamp(), Start) / 1000000,
case Result of
{ok, OldSegments, OldBytes} ->
case ElapsedSecs > 1 of
@@ -147,4 +147,3 @@ worker_loop(Parent) ->
after 1000 ->
?MODULE:worker_loop(Parent)
end.
-
Please sign in to comment.
Something went wrong with that request. Please try again.