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/28 14:11:52 UTC
[16/50] couch commit: updated refs/heads/master to 9d0ac7d
Remove old code_change, set module version to 1
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/e0174241
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/e0174241
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/e0174241
Branch: refs/heads/master
Commit: e01742411765a0ba988ec7ffbd75ff92e817a3e7
Parents: 936e74b
Author: Robert Newson <ro...@cloudant.com>
Authored: Fri Nov 22 16:30:53 2013 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Aug 28 13:00:00 2014 +0100
----------------------------------------------------------------------
src/couch_auth_cache.erl | 1 +
src/couch_db_updater.erl | 1 +
src/couch_drv.erl | 1 +
src/couch_event_sup.erl | 1 +
src/couch_external_manager.erl | 1 +
src/couch_external_server.erl | 1 +
src/couch_file.erl | 1 +
src/couch_native_process.erl | 1 +
src/couch_os_process.erl | 1 +
src/couch_proc_manager.erl | 7 +------
src/couch_server.erl | 3 ++-
src/couch_stats_collector.erl | 5 ++---
src/couch_stream.erl | 1 +
src/couch_task_status.erl | 1 +
src/couch_uuids.erl | 1 +
src/couch_work_queue.erl | 1 +
16 files changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_auth_cache.erl
----------------------------------------------------------------------
diff --git a/src/couch_auth_cache.erl b/src/couch_auth_cache.erl
index 82fb095..d53cff0 100644
--- a/src/couch_auth_cache.erl
+++ b/src/couch_auth_cache.erl
@@ -12,6 +12,7 @@
-module(couch_auth_cache).
-behaviour(gen_server).
+-vsn(1).
-behaviour(config_listener).
% public API
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_db_updater.erl
----------------------------------------------------------------------
diff --git a/src/couch_db_updater.erl b/src/couch_db_updater.erl
index 6979256..3ff5963 100644
--- a/src/couch_db_updater.erl
+++ b/src/couch_db_updater.erl
@@ -12,6 +12,7 @@
-module(couch_db_updater).
-behaviour(gen_server).
+-vsn(1).
-export([btree_by_id_split/1, btree_by_id_join/2, btree_by_id_reduce/2]).
-export([btree_by_seq_split/1, btree_by_seq_join/2, btree_by_seq_reduce/2]).
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_drv.erl
----------------------------------------------------------------------
diff --git a/src/couch_drv.erl b/src/couch_drv.erl
index 7fe119a..4424114 100644
--- a/src/couch_drv.erl
+++ b/src/couch_drv.erl
@@ -12,6 +12,7 @@
-module(couch_drv).
-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-couch/blob/e0174241/src/couch_event_sup.erl
----------------------------------------------------------------------
diff --git a/src/couch_event_sup.erl b/src/couch_event_sup.erl
index e9e7214..39e728c 100644
--- a/src/couch_event_sup.erl
+++ b/src/couch_event_sup.erl
@@ -16,6 +16,7 @@
-module(couch_event_sup).
-behaviour(gen_server).
+-vsn(1).
-include_lib("couch/include/couch_db.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_external_manager.erl
----------------------------------------------------------------------
diff --git a/src/couch_external_manager.erl b/src/couch_external_manager.erl
index a8cad63..d2fa1ea 100644
--- a/src/couch_external_manager.erl
+++ b/src/couch_external_manager.erl
@@ -12,6 +12,7 @@
-module(couch_external_manager).
-behaviour(gen_server).
+-vsn(1).
-behaviour(config_listener).
-export([start_link/0, execute/2]).
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_external_server.erl
----------------------------------------------------------------------
diff --git a/src/couch_external_server.erl b/src/couch_external_server.erl
index 123e2e1..40d9113 100644
--- a/src/couch_external_server.erl
+++ b/src/couch_external_server.erl
@@ -12,6 +12,7 @@
-module(couch_external_server).
-behaviour(gen_server).
+-vsn(1).
-behaviour(config_listener).
-export([start_link/2, stop/1, execute/2]).
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_file.erl
----------------------------------------------------------------------
diff --git a/src/couch_file.erl b/src/couch_file.erl
index a5bcbd1..4fda603 100644
--- a/src/couch_file.erl
+++ b/src/couch_file.erl
@@ -12,6 +12,7 @@
-module(couch_file).
-behaviour(gen_server).
+-vsn(1).
-include_lib("couch/include/couch_db.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_native_process.erl
----------------------------------------------------------------------
diff --git a/src/couch_native_process.erl b/src/couch_native_process.erl
index e59a223..b09716e 100644
--- a/src/couch_native_process.erl
+++ b/src/couch_native_process.erl
@@ -39,6 +39,7 @@
% to help simplify your view code.
-module(couch_native_process).
-behaviour(gen_server).
+-vsn(1).
-export([start_link/0,init/1,terminate/2,handle_call/3,handle_cast/2,code_change/3,
handle_info/2]).
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_os_process.erl
----------------------------------------------------------------------
diff --git a/src/couch_os_process.erl b/src/couch_os_process.erl
index f4d65e9..676d540 100644
--- a/src/couch_os_process.erl
+++ b/src/couch_os_process.erl
@@ -12,6 +12,7 @@
-module(couch_os_process).
-behaviour(gen_server).
+-vsn(1).
-export([start_link/1, start_link/2, start_link/3, stop/1]).
-export([set_timeout/2, prompt/2, killer/1]).
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_proc_manager.erl
----------------------------------------------------------------------
diff --git a/src/couch_proc_manager.erl b/src/couch_proc_manager.erl
index 2744c88..18c82e6 100644
--- a/src/couch_proc_manager.erl
+++ b/src/couch_proc_manager.erl
@@ -13,6 +13,7 @@
-module(couch_proc_manager).
-behaviour(gen_server).
-behaviour(config_listener).
+-vsn(1).
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
code_change/3]).
@@ -232,12 +233,6 @@ terminate(_Reason, #state{tab=Tab}) ->
ok.
code_change(_OldVsn, #state{}=State, _Extra) ->
- {ok, State};
-code_change(_OldVsn, {state, Tab}, _Extra) ->
- State = #state{tab = Tab, threshold_ts = {0,0,0}},
- ProcInts = lists:map(fun import_proc/1, ets:tab2list(Tab)),
- ets:delete_all_objects(Tab),
- ets:insert(Tab, ProcInts),
{ok, State}.
handle_config_change("query_server_config", _, _, _, _) ->
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_server.erl
----------------------------------------------------------------------
diff --git a/src/couch_server.erl b/src/couch_server.erl
index fd4691c..28dfc79 100644
--- a/src/couch_server.erl
+++ b/src/couch_server.erl
@@ -13,6 +13,7 @@
-module(couch_server).
-behaviour(gen_server).
-behaviour(config_listener).
+-vsn(1).
-export([open/2,create/2,delete/2,get_version/0,get_version/1,get_uuid/0]).
-export([all_databases/0, all_databases/2]).
@@ -507,7 +508,7 @@ handle_cast({update_lru, _DbName}, Server) ->
handle_cast(Msg, Server) ->
{stop, {unknown_cast_message, Msg}, Server}.
-code_change(_, State, _) ->
+code_change(_OldVsn, #server{}=State, _Extra) ->
{ok, State}.
handle_info({'EXIT', _Pid, config_change}, Server) ->
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_stats_collector.erl
----------------------------------------------------------------------
diff --git a/src/couch_stats_collector.erl b/src/couch_stats_collector.erl
index 2ed647c..5bf4864 100644
--- a/src/couch_stats_collector.erl
+++ b/src/couch_stats_collector.erl
@@ -17,6 +17,7 @@
-module(couch_stats_collector).
-behaviour(gen_server).
+-vsn(1).
-export([start/0, stop/0]).
-export([all/0, all/1, get/1, increment/1, decrement/1, record/2, clear/1]).
@@ -109,9 +110,7 @@ handle_info({'DOWN', Ref, _, _, _}, State) ->
couch_stats_collector:decrement(Stat),
{noreply, dict:erase(Ref, State)}.
-code_change(_OldVersion, State, _Extra) when is_list(State) ->
- {ok, dict:from_list(State)};
-code_change(_OldVersion, State, _Extra) ->
+code_change(_, State, _Extra) ->
{ok, State}.
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_stream.erl
----------------------------------------------------------------------
diff --git a/src/couch_stream.erl b/src/couch_stream.erl
index 6e7213b..e71542c 100644
--- a/src/couch_stream.erl
+++ b/src/couch_stream.erl
@@ -12,6 +12,7 @@
-module(couch_stream).
-behaviour(gen_server).
+-vsn(1).
% public API
-export([open/1, open/2, close/1]).
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_task_status.erl
----------------------------------------------------------------------
diff --git a/src/couch_task_status.erl b/src/couch_task_status.erl
index 8dc91b4..8a8dbf2 100644
--- a/src/couch_task_status.erl
+++ b/src/couch_task_status.erl
@@ -12,6 +12,7 @@
-module(couch_task_status).
-behaviour(gen_server).
+-vsn(1).
% This module is used to track the status of long running tasks.
% Long running tasks register themselves, via a call to add_task/1, and then
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_uuids.erl
----------------------------------------------------------------------
diff --git a/src/couch_uuids.erl b/src/couch_uuids.erl
index e891abb..2cee58b 100644
--- a/src/couch_uuids.erl
+++ b/src/couch_uuids.erl
@@ -13,6 +13,7 @@
-include_lib("couch/include/couch_db.hrl").
-behaviour(gen_server).
+-vsn(1).
-behaviour(config_listener).
-export([start/0, stop/0]).
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/e0174241/src/couch_work_queue.erl
----------------------------------------------------------------------
diff --git a/src/couch_work_queue.erl b/src/couch_work_queue.erl
index ea871e2..5d747de 100644
--- a/src/couch_work_queue.erl
+++ b/src/couch_work_queue.erl
@@ -12,6 +12,7 @@
-module(couch_work_queue).
-behaviour(gen_server).
+-vsn(1).
-include_lib("couch/include/couch_db.hrl").