File bitcask-2.0.8-now.patch of Package bitcask
diff -Ndurp bitcask-2.0.8/src/bitcask_nifs.erl bitcask-2.0.8-now/src/bitcask_nifs.erl
--- bitcask-2.0.8/src/bitcask_nifs.erl 2017-03-04 01:37:58.000000000 +0200
+++ bitcask-2.0.8-now/src/bitcask_nifs.erl 2019-07-07 01:21:50.162078745 +0300
@@ -720,7 +720,7 @@ keydir_itr_out_of_date_test2() ->
ok = bitcask_nifs:keydir_itr_int(Ref1, 1000000, 0, 0),
put_till_frozen(Ref1, Name),
{ready, Ref2} = bitcask_nifs:keydir_new(Name),
- %% now() will have ensured a new usecs for keydir_itr/3 - check out of date immediately
+ %% os:timestamp() will have ensured a new usecs for keydir_itr/3 - check out of date immediately
?assertEqual(out_of_date, bitcask_nifs:keydir_itr_int(Ref2, 1000001,
0, 0)),
keydir_itr_release(Ref1),
diff -Ndurp bitcask-2.0.8/test/bitcask_pr156.erl bitcask-2.0.8-now/test/bitcask_pr156.erl
--- bitcask-2.0.8/test/bitcask_pr156.erl 2017-03-04 01:37:58.000000000 +0200
+++ bitcask-2.0.8-now/test/bitcask_pr156.erl 2019-07-07 01:21:38.225359835 +0300
@@ -34,7 +34,7 @@ pr156_regression2_test_() ->
end}.
pr156_regression1(X) ->
- io:format("pr156_regression1 ~p at ~p\n", [X, now()]),
+ io:format("pr156_regression1 ~p at ~p\n", [X, os:timestamp()]),
token:next_name(),
Dir = ?BITCASK ++ ".1." ++ token:get_name(),
os:cmd("rm -rf " ++ Dir),
@@ -74,7 +74,7 @@ pr156_regression1(X) ->
%% r1s11.bos1 executes each of N iterations in about 1500 msec.
pr156_regression2(X) ->
- io:format("pr156_regression2 ~p at ~p\n", [X, now()]),
+ io:format("pr156_regression2 ~p at ~p\n", [X, os:timestamp()]),
token:next_name(),
Dir = ?BITCASK ++ ".2." ++ token:get_name(),
os:cmd("rm -rf " ++ Dir),
diff -Ndurp bitcask-2.0.8/test/bitcask_pulse.erl bitcask-2.0.8-now/test/bitcask_pulse.erl
--- bitcask-2.0.8/test/bitcask_pulse.erl 2017-03-04 01:37:58.000000000 +0200
+++ bitcask-2.0.8-now/test/bitcask_pulse.erl 2019-07-07 01:21:20.114786305 +0300
@@ -276,7 +276,7 @@ host() ->
%% Generate a most likely unique node name
unique_name() ->
- {A, B, C} = erlang:now(),
+ {A, B, C} = os:timestamp(),
list_to_atom(lists:concat([integer_to_list(A), "-",
integer_to_list(B), "-",
integer_to_list(C)])).
@@ -1021,7 +1021,7 @@ custom_shrink(CE=[_,Seed|_], [C|Cs], Rep
end.
check_many(C, N) ->
- check_many(erlang:now(), C, N).
+ check_many(os:timestamp(), C, N).
check_many(_, _, 0) -> true;
check_many(Seed, C0, N) ->
@@ -1037,7 +1037,7 @@ mk_counterexample(CE = [Cmds, _Seed]) wh
CE;
mk_counterexample(Cmds) ->
S = state_after(?MODULE, Cmds),
- [Cmds, erlang:now(),
+ [Cmds, os:timestamp(),
[ {0, []} | [ {I, []}
|| I <- lists:seq(1, length(S#state.readers)) ] ]
++ [ {errors, []}, {events, []} ] ].
@@ -1047,7 +1047,7 @@ mk_counterexample(Cmds, Seed) ->
[Cmds, Seed, Conj].
foo() ->
- erlang:now().
+ os:timestamp().
%% Helper functions
fold(F, X) ->
diff -Ndurp bitcask-2.0.8/test/bitcask_qc.erl bitcask-2.0.8-now/test/bitcask_qc.erl
--- bitcask-2.0.8/test/bitcask_qc.erl 2017-03-04 01:37:58.000000000 +0200
+++ bitcask-2.0.8-now/test/bitcask_qc.erl 2019-07-07 01:21:26.306640497 +0300
@@ -158,7 +158,7 @@ prop_merge() ->
?FORALL({Ops, M1, M2}, {eqc_gen:non_empty(list(ops(Keys, Values))),
choose(1,128), choose(1,128)},
begin
- Tm = tuple_to_list(now()),
+ Tm = tuple_to_list(os:timestamp()),
Dir = lists:flatten(
io_lib:format(
"/tmp/bc.prop.merge.~w.~w.~w", Tm)),
diff -Ndurp bitcask-2.0.8/test/event_logger.erl bitcask-2.0.8-now/test/event_logger.erl
--- bitcask-2.0.8/test/event_logger.erl 2017-03-04 01:37:58.000000000 +0200
+++ bitcask-2.0.8-now/test/event_logger.erl 2019-07-07 01:20:17.621257921 +0300
@@ -128,6 +128,6 @@ add_event(#event{timestamp = Now, data =
State#state{ events = [Event|State#state.events] }.
timestamp() ->
- {A, B, C} = erlang:now(),
+ {A, B, C} = os:timestamp(),
1000000 * (1000000 * A + B) + C.
diff -Ndurp bitcask-2.0.8/test/generic_qc_fsm.erl bitcask-2.0.8-now/test/generic_qc_fsm.erl
--- bitcask-2.0.8/test/generic_qc_fsm.erl 2017-03-04 01:37:58.000000000 +0200
+++ bitcask-2.0.8-now/test/generic_qc_fsm.erl 2019-07-07 01:20:36.788806556 +0300
@@ -163,7 +163,7 @@ prop(FI_enabledP, VerboseP) ->
faulterl_nif:poke("bc_fi_enabled", 0, <<0:8/native>>, false),
[catch erlang:garbage_collect(Pid) || Pid <- erlang:processes()],
- {Ta, Tb, Tc} = now(),
+ {Ta, Tb, Tc} = os:timestamp(),
TestDir = ?TEST_DIR ++ lists:flatten(io_lib:format(".~w.~w.~w", [Ta, Tb, Tc])),
ok = file:make_dir(TestDir),
Env = [{parameter_test_dir, TestDir}],
@@ -443,7 +443,7 @@ fold_all(H) ->
[{K,V}|Acc]
end,
io:format(user, "<f", []),
- ID = now(),
+ ID = os:timestamp(),
event_logger:event({fold, start, ID}),
case bitcask:fold(H, F, []) of
{error, _} ->
diff -Ndurp bitcask-2.0.8/test/token.erl bitcask-2.0.8-now/test/token.erl
--- bitcask-2.0.8/test/token.erl 2017-03-04 01:37:58.000000000 +0200
+++ bitcask-2.0.8-now/test/token.erl 2019-07-07 01:20:44.706620105 +0300
@@ -50,6 +50,6 @@ loop(Name) ->
end.
mk_name() ->
- {A, B, C} = erlang:now(),
+ {A, B, C} = os:timestamp(),
lists:concat([A, "-", B, "-", C]).
