You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/01 11:11:17 UTC

[31/48] mem3 commit: updated refs/heads/windsor-merge to ff02b9a

Remove old code_change, set module version to 1


Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/88a6491b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/88a6491b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/88a6491b

Branch: refs/heads/windsor-merge
Commit: 88a6491bba5c7a12f271e3feed6ff8f14b3a840f
Parents: 781dc89
Author: Robert Newson <ro...@cloudant.com>
Authored: Fri Nov 22 16:50:15 2013 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Jul 23 18:46:27 2014 +0100

----------------------------------------------------------------------
 src/mem3_nodes.erl      | 7 ++-----
 src/mem3_shards.erl     | 5 +++--
 src/mem3_sync.erl       | 1 +
 src/mem3_sync_event.erl | 1 +
 src/mem3_sync_nodes.erl | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/88a6491b/src/mem3_nodes.erl
----------------------------------------------------------------------
diff --git a/src/mem3_nodes.erl b/src/mem3_nodes.erl
index 7e97438..a8c1448 100644
--- a/src/mem3_nodes.erl
+++ b/src/mem3_nodes.erl
@@ -12,6 +12,7 @@
 
 -module(mem3_nodes).
 -behaviour(gen_server).
+-vsn(1).
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
     code_change/3]).
 
@@ -83,11 +84,7 @@ handle_info(_Info, State) ->
 terminate(_Reason, _State) ->
     ok.
 
-code_change(_OldVsn, {state, ChangesPid, UpdateSeq, _}, _Extra) ->
-    ets:new(?MODULE, [named_table, {read_concurrency, true}]),
-    initialize_nodelist(),
-    {ok, #state{changes_pid = ChangesPid, update_seq = UpdateSeq}};
-code_change(_OldVsn, State, _Extra) ->
+code_change(_OldVsn, #state{}=State, _Extra) ->
     {ok, State}.
 
 %% internal functions

http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/88a6491b/src/mem3_shards.erl
----------------------------------------------------------------------
diff --git a/src/mem3_shards.erl b/src/mem3_shards.erl
index df8cbac..397fb74 100644
--- a/src/mem3_shards.erl
+++ b/src/mem3_shards.erl
@@ -12,6 +12,7 @@
 
 -module(mem3_shards).
 -behaviour(gen_server).
+-vsn(1).
 -behaviour(config_listener).
 
 -export([init/1, terminate/2, code_change/3]).
@@ -192,8 +193,8 @@ terminate(_Reason, #st{changes_pid=Pid}) ->
     exit(Pid, kill),
     ok.
 
-code_change(_OldVsn, St, _Extra) ->
-    {ok, cache_clear(St)}.
+code_change(_OldVsn, #st{}=St, _Extra) ->
+    {ok, St}.
 
 %% internal functions
 

http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/88a6491b/src/mem3_sync.erl
----------------------------------------------------------------------
diff --git a/src/mem3_sync.erl b/src/mem3_sync.erl
index 3d975fc..1e5b505 100644
--- a/src/mem3_sync.erl
+++ b/src/mem3_sync.erl
@@ -12,6 +12,7 @@
 
 -module(mem3_sync).
 -behaviour(gen_server).
+-vsn(1).
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
     code_change/3]).
 

http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/88a6491b/src/mem3_sync_event.erl
----------------------------------------------------------------------
diff --git a/src/mem3_sync_event.erl b/src/mem3_sync_event.erl
index 2cc86d9..7bca230 100644
--- a/src/mem3_sync_event.erl
+++ b/src/mem3_sync_event.erl
@@ -12,6 +12,7 @@
 
 -module(mem3_sync_event).
 -behaviour(gen_event).
+-vsn(1).
 
 -export([init/1, handle_event/2, handle_call/2, handle_info/2, terminate/2,
     code_change/3]).

http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/88a6491b/src/mem3_sync_nodes.erl
----------------------------------------------------------------------
diff --git a/src/mem3_sync_nodes.erl b/src/mem3_sync_nodes.erl
index e07fd44..0a4bffc 100644
--- a/src/mem3_sync_nodes.erl
+++ b/src/mem3_sync_nodes.erl
@@ -12,6 +12,7 @@
 
 -module(mem3_sync_nodes).
 -behaviour(gen_server).
+-vsn(1).
 
 
 -export([start_link/0]).