stats metrics renamed: os_open_files -> open_os_files, database_changes -> database_writes

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@749583 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 8 insertions, 8 deletions

diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl
index 963c834b..92026ff1 100644
--- a/src/couchdb/couch_db.erl
+++ b/src/couchdb/couch_db.erl
@@ -286,7 +286,7 @@ update_docs(#db{update_pid=UpdatePid}=Db, Docs, Options) ->
     update_docs(#db{update_pid=UpdatePid}=Db, Docs, Options, true).
 
 update_docs(Db, Docs, Options, false) ->
-    couch_stats_collector:increment({couchdb, database_changes}),
+    couch_stats_collector:increment({couchdb, database_writes}),
     DocBuckets = group_alike_docs(Docs),
     Ids = [Id || [#doc{id=Id}|_] <- DocBuckets],
     
@@ -323,7 +323,7 @@ update_docs(Db, Docs, Options, false) ->
     write_and_commit(Db, DocBuckets2, Options);
     
 update_docs(Db, Docs, Options, true) ->
-    couch_stats_collector:increment({couchdb, database_changes}),
+    couch_stats_collector:increment({couchdb, database_writes}),
 
     % go ahead and generate the new revision ids for the documents.
     Docs2 = lists:map(
diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index 364eafd6..4db55e70 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -285,14 +285,14 @@ init({Filepath, Options, ReturnPid, Ref}) ->
                 true ->
                     {ok, 0} = file:position(Fd, 0),
                     ok = file:truncate(Fd),
-                    couch_stats_collector:increment({couchdb, os_files_open}),
+                    couch_stats_collector:increment({couchdb, open_os_files}),
                     {ok, Fd};
                 false ->
                     ok = file:close(Fd),
                     init_status_error(ReturnPid, Ref, file_exists)
                 end;
             false ->
-                couch_stats_collector:increment({couchdb, os_files_open}),
+                couch_stats_collector:increment({couchdb, open_os_files}),
                 {ok, Fd}
             end;
         Error ->
@@ -304,7 +304,7 @@ init({Filepath, Options, ReturnPid, Ref}) ->
         {ok, Fd_Read} ->
             {ok, Fd} = file:open(Filepath, [read, write, raw, binary]),
             ok = file:close(Fd_Read),
-            couch_stats_collector:increment({couchdb, os_files_open}),
+            couch_stats_collector:increment({couchdb, open_os_files}),
             {ok, Fd};
         Error ->
             init_status_error(ReturnPid, Ref, Error)
@@ -313,7 +313,7 @@ init({Filepath, Options, ReturnPid, Ref}) ->
 
 
 terminate(_Reason, _Fd) ->
-    couch_stats_collector:decrement({couchdb, os_files_open}),
+    couch_stats_collector:decrement({couchdb, open_os_files}),
     ok.
 
 
diff --git a/src/couchdb/couch_stats_aggregator.erl b/src/couchdb/couch_stats_aggregator.erl
index 063f4791..bc37ab96 100644
--- a/src/couchdb/couch_stats_aggregator.erl
+++ b/src/couchdb/couch_stats_aggregator.erl
@@ -299,10 +299,10 @@ init_descriptions() ->
     % a trailing full-stop / period.
     
     % please keep this in alphabetical order
-    ets:insert(?MODULE, {{couchdb, database_changes}, <<"number of times a database was changed">>}),
+    ets:insert(?MODULE, {{couchdb, database_writes}, <<"number of times a database was changed">>}),
     ets:insert(?MODULE, {{couchdb, database_reads}, <<"number of times a document was read from a database">>}),
     ets:insert(?MODULE, {{couchdb, open_databases}, <<"number of open databases">>}),
-    ets:insert(?MODULE, {{couchdb, os_files_open}, <<"number of file descriptors CouchDB has open">>}),
+    ets:insert(?MODULE, {{couchdb, open_os_files}, <<"number of file descriptors CouchDB has open">>}),
     ets:insert(?MODULE, {{couchdb, request_time}, <<"length of a request inside CouchDB without MochiWeb">>}),
     
     ets:insert(?MODULE, {{httpd, bulk_requests}, <<"number of bulk requests">>}),