From 3aa348b07dd2fc590bc55e2155cf777f36cc0e28 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: May 08 2016 09:43:24 +0000 Subject: Ver. 1.7.4 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index 6e17c5e..79f50b6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /basho-bitcask-1.6.1-0-gfbbf11e.tar.gz /basho-bitcask-1.6.3-0-gf20db99.tar.gz /bitcask-1.6.3.tar.gz +/bitcask-1.7.4.tar.gz diff --git a/erlang-bitcask-0001-Add-support-for-Erlang-17.patch b/erlang-bitcask-0001-Add-support-for-Erlang-17.patch deleted file mode 100644 index 6f0525f..0000000 --- a/erlang-bitcask-0001-Add-support-for-Erlang-17.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Christopher Meiklejohn -Date: Tue, 24 Feb 2015 21:47:13 -0500 -Subject: [PATCH] Add support for Erlang 17. - - -diff --git a/rebar.config b/rebar.config -index 8b4542e..de38fef 100644 ---- a/rebar.config -+++ b/rebar.config -@@ -1,3 +1,5 @@ -+{erl_opts, [debug_info, -+ {platform_define, "^[0-9]+", namespaced_types}]}. - {port_specs, [{"priv/bitcask.so", ["c_src/*.c"]}]}. - - {deps, [ -diff --git a/src/bitcask_merge_delete.erl b/src/bitcask_merge_delete.erl -index f27cc5d..86fe8ab 100644 ---- a/src/bitcask_merge_delete.erl -+++ b/src/bitcask_merge_delete.erl -@@ -40,10 +40,16 @@ - -include_lib("eunit/include/eunit.hrl"). - -endif. - ---define(SERVER, ?MODULE). -+-define(SERVER, ?MODULE). - -define(TIMEOUT, 1000). - ---record(state, {q :: queue()}). -+-ifdef(namespaced_types). -+-type merge_queue() :: queue:queue(). -+-else. -+-type merge_queue() :: queue(). -+-endif. -+ -+-record(state, {q :: merge_queue()}). - - %%%=================================================================== - %%% API diff --git a/erlang-bitcask-0001-Don-t-use-deprecated-erlang-now-0.patch b/erlang-bitcask-0001-Don-t-use-deprecated-erlang-now-0.patch new file mode 100644 index 0000000..d9a1173 --- /dev/null +++ b/erlang-bitcask-0001-Don-t-use-deprecated-erlang-now-0.patch @@ -0,0 +1,127 @@ +From: Peter Lemenkov +Date: Sun, 17 Apr 2016 17:06:14 +0300 +Subject: [PATCH] Don't use deprecated erlang:now/0 + +Signed-off-by: Peter Lemenkov + +diff --git a/test/bitcask_pr156.erl b/test/bitcask_pr156.erl +index 5cdfc46..7916524 100644 +--- a/test/bitcask_pr156.erl ++++ b/test/bitcask_pr156.erl +@@ -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 --git a/test/bitcask_pulse.erl b/test/bitcask_pulse.erl +index abdd970..9acf632 100644 +--- a/test/bitcask_pulse.erl ++++ b/test/bitcask_pulse.erl +@@ -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], Repeat) -> + 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]) when is_list(Cmds) -> + 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 --git a/test/bitcask_qc.erl b/test/bitcask_qc.erl +index f30f6cc..624d989 100644 +--- a/test/bitcask_qc.erl ++++ b/test/bitcask_qc.erl +@@ -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 --git a/test/event_logger.erl b/test/event_logger.erl +index 52b1080..78a9c97 100644 +--- a/test/event_logger.erl ++++ b/test/event_logger.erl +@@ -128,6 +128,6 @@ add_event(#event{timestamp = Now, data = Data}, State) -> + State#state{ events = [Event|State#state.events] }. + + timestamp() -> +- {A, B, C} = erlang:now(), ++ {A, B, C} = os:timestamp(), + 1000000 * (1000000 * A + B) + C. + +diff --git a/test/generic_qc_fsm.erl b/test/generic_qc_fsm.erl +index 541feb9..9c9d46b 100644 +--- a/test/generic_qc_fsm.erl ++++ b/test/generic_qc_fsm.erl +@@ -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, " +diff --git a/test/token.erl b/test/token.erl +index e9a0a54..9dfa6ec 100644 +--- a/test/token.erl ++++ b/test/token.erl +@@ -50,6 +50,6 @@ loop(Name) -> + end. + + mk_name() -> +- {A, B, C} = erlang:now(), ++ {A, B, C} = os:timestamp(), + lists:concat([A, "-", B, "-", C]). + diff --git a/erlang-bitcask.spec b/erlang-bitcask.spec index 8748fbb..8bdebad 100644 --- a/erlang-bitcask.spec +++ b/erlang-bitcask.spec @@ -3,8 +3,8 @@ Name: erlang-%{realname} -Version: 1.6.3 -Release: 11%{?dist} +Version: 1.7.4 +Release: 1%{?dist} Summary: Eric Brewer-inspired key/value store Group: Development/Languages License: ASL 2.0 @@ -14,7 +14,7 @@ VCS: scm:git:https://github.com/%{upstream}/%{realname}.git %endif Source0: https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}-%{version}.tar.gz Source1: bitcask.licensing -Patch1: erlang-bitcask-0001-Add-support-for-Erlang-17.patch +Patch1: erlang-bitcask-0001-Don-t-use-deprecated-erlang-now-0.patch BuildRequires: erlang-meck BuildRequires: erlang-rebar %{?__erlang_nif_version:Requires: %{__erlang_nif_version}} @@ -26,7 +26,7 @@ Eric Brewer-inspired key/value store. %prep %setup -q -n %{realname}-%{version} -%patch1 -p1 -b .R18 +%patch1 -p1 -b .deprecated %build @@ -36,6 +36,9 @@ Eric Brewer-inspired key/value store. %install %{erlang_install} +cp -arv priv/bitcask.schema %{buildroot}%{erlang_appdir}/priv +cp -arv priv/bitcask_multi.schema %{buildroot}%{erlang_appdir}/priv + %check %{erlang_test} @@ -47,6 +50,9 @@ Eric Brewer-inspired key/value store. %changelog +* Sun Apr 17 2016 Peter Lemenkov - 1.7.4-1 +- Ver. 1.7.4 + * Fri Apr 15 2016 Peter Lemenkov - 1.6.1-11 - Drop unneeded macro diff --git a/sources b/sources index d8c1ebf..03d2bff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a3f496d1a115d87754fd5734590752d bitcask-1.6.3.tar.gz +2f8a83196d0bc5c6c8eb54e5f32f840f bitcask-1.7.4.tar.gz