From fd4bdaff75840800a13ba771bf8c96d1cc7a2bd2 Mon Sep 17 00:00:00 2001 From: Thijs Klaver Date: Thu, 1 Oct 2015 16:27:36 +0200 Subject: [PATCH 1/3] Replaced erlang:now with erlang:timestamp, as erlang:now is deprecated in Erlang 18. --- src/riak_ensemble_manager.erl | 2 +- src/synctree_leveldb.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/riak_ensemble_manager.erl b/src/riak_ensemble_manager.erl index 36d33e6..c2b71b6 100644 --- a/src/riak_ensemble_manager.erl +++ b/src/riak_ensemble_manager.erl @@ -500,7 +500,7 @@ reload_state() -> -spec initial_state() -> state(). initial_state() -> ets:insert(?ETS, {enabled, false}), - ClusterName = {node(), erlang:now()}, + ClusterName = {node(), erlang:timestamp()}, CS = riak_ensemble_state:new(ClusterName), State=#state{version=0, ensemble_data=[], diff --git a/src/synctree_leveldb.erl b/src/synctree_leveldb.erl index 69d005d..9d2a92d 100644 --- a/src/synctree_leveldb.erl +++ b/src/synctree_leveldb.erl @@ -87,7 +87,7 @@ get_path(Opts) -> case proplists:get_value(path, Opts) of undefined -> Base = "/tmp/ST", - Name = integer_to_list(timestamp(erlang:now())), + Name = integer_to_list(timestamp(erlang:timestamp())), filename:join(Base, Name); Path -> Path From 0566bb737feff8d562b59dc20f0b1299997751c5 Mon Sep 17 00:00:00 2001 From: Thijs Klaver Date: Fri, 2 Oct 2015 13:27:35 +0200 Subject: [PATCH 2/3] Bumped lager dependency. --- rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config index 4352159..9890ddb 100644 --- a/rebar.config +++ b/rebar.config @@ -8,7 +8,7 @@ {dir, "edoc"}]}. {cover_enabled, true}. {xref_checks, [undefined_function_calls]}. -{deps, [{lager, "2.0.3", {git, "git://github.com/basho/lager.git", {tag, "2.0.3"}}}, +{deps, [{lager, "(2.1|2.2).*", {git, "git://github.com/basho/lager.git", {tag, "2.2.0"}}}, {eleveldb, ".*", {git, "git://github.com/basho/eleveldb.git", {tag, "2.1.0"}}}]}. {port_specs, From 2510d4c92a5e83ec8d929e9f422926e9a7dfa9d1 Mon Sep 17 00:00:00 2001 From: Thijs Klaver Date: Wed, 7 Oct 2015 11:33:53 +0200 Subject: [PATCH 3/3] Erlang 18 and backwards compatible using time_compat library. --- rebar.config | 3 ++- src/riak_ensemble_manager.erl | 2 +- src/synctree_leveldb.erl | 5 +---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rebar.config b/rebar.config index 9890ddb..3922604 100644 --- a/rebar.config +++ b/rebar.config @@ -9,7 +9,8 @@ {cover_enabled, true}. {xref_checks, [undefined_function_calls]}. {deps, [{lager, "(2.1|2.2).*", {git, "git://github.com/basho/lager.git", {tag, "2.2.0"}}}, - {eleveldb, ".*", {git, "git://github.com/basho/eleveldb.git", {tag, "2.1.0"}}}]}. + {eleveldb, ".*", {git, "git://github.com/basho/eleveldb.git", {tag, "2.1.0"}}}, + {time_compat, ".*", {git, "git://github.com/lasp-lang/time_compat.git", {branch, "master"}}}]}. {port_specs, [{".*", "priv/riak_ensemble.so", diff --git a/src/riak_ensemble_manager.erl b/src/riak_ensemble_manager.erl index c2b71b6..be90b65 100644 --- a/src/riak_ensemble_manager.erl +++ b/src/riak_ensemble_manager.erl @@ -500,7 +500,7 @@ reload_state() -> -spec initial_state() -> state(). initial_state() -> ets:insert(?ETS, {enabled, false}), - ClusterName = {node(), erlang:timestamp()}, + ClusterName = {node(), time_compat:timestamp()}, CS = riak_ensemble_state:new(ClusterName), State=#state{version=0, ensemble_data=[], diff --git a/src/synctree_leveldb.erl b/src/synctree_leveldb.erl index 9d2a92d..ec16fbd 100644 --- a/src/synctree_leveldb.erl +++ b/src/synctree_leveldb.erl @@ -87,7 +87,7 @@ get_path(Opts) -> case proplists:get_value(path, Opts) of undefined -> Base = "/tmp/ST", - Name = integer_to_list(timestamp(erlang:timestamp())), + Name = integer_to_list(time_compat:unique_integer([positive])), filename:join(Base, Name); Path -> Path @@ -151,9 +151,6 @@ store(Updates, State=?STATE{id=Id, db=DB}) -> _ = eleveldb:write(DB, DBUpdates, []), State. -timestamp({Mega, Secs, Micro}) -> - Mega*1000*1000*1000*1000 + Secs * 1000 * 1000 + Micro. - leveldb_opts() -> [{is_internal_db, true}, {write_buffer_size, 4 * 1024 * 1024},