couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r731452 - in /couchdb/trunk: share/www/script/couch.js share/www/script/couch_tests.js src/couchdb/couch_db.erl src/couchdb/couch_db.hrl src/couchdb/couch_db_updater.erl src/couchdb/couch_httpd_db.erl
Date Mon, 05 Jan 2009 05:42:52 GMT
Author: damien
Date: Sun Jan  4 21:42:52 2009
New Revision: 731452

URL: http://svn.apache.org/viewvc?rev=731452&view=rev
Log:
Delayed commit patch. Allows documents to be saved immediately but fully committed asynchronously.
On by default, to fully commit documents synchronously, use X-Couch-Full-Commit=true in the
http header. We still needs to prevent committing view indexes ahead of data and to detect
when a server has crashed causing potentially lost updates during remote replication (fixed
by retrying the incremental replication).

Modified:
    couchdb/trunk/share/www/script/couch.js
    couchdb/trunk/share/www/script/couch_tests.js
    couchdb/trunk/src/couchdb/couch_db.erl
    couchdb/trunk/src/couchdb/couch_db.hrl
    couchdb/trunk/src/couchdb/couch_db_updater.erl
    couchdb/trunk/src/couchdb/couch_httpd_db.erl

Modified: couchdb/trunk/share/www/script/couch.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch.js?rev=731452&r1=731451&r2=731452&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/couch.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch.js [utf-8] Sun Jan  4 21:42:52 2009
@@ -108,6 +108,12 @@
     }
     return result;
   }
+  
+  this.ensureFullCommit = function() {
+    this.last_req = this.request("POST", this.uri + "_ensure_full_commit");
+    CouchDB.maybeThrowError(this.last_req);
+    return JSON.parse(this.last_req.responseText);
+  }
 
   // Applies the map function to the contents of database and returns the results.
   this.query = function(mapFun, reduceFun, options, keys) {

Modified: couchdb/trunk/share/www/script/couch_tests.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_tests.js?rev=731452&r1=731451&r2=731452&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Sun Jan  4 21:42:52 2009
@@ -130,7 +130,11 @@
     T(db.open(existingDoc._id, {rev: existingDoc._rev}) != null);
     
     // make sure restart works
+    T(db.ensureFullCommit().ok);
     restartServer();
+    
+    // make sure we can still open
+    T(db.open(existingDoc._id, {rev: existingDoc._rev}) != null);
   },
   all_docs: function(debug) {
     var db = new CouchDB("test_suite_db");
@@ -1173,6 +1177,7 @@
       }
       T(db.view("test/no_docs").total_rows == 0)
       T(db.view("test/single_doc").total_rows == 1)
+      T(db.ensureFullCommit().ok);
       restartServer();
     };
     
@@ -1214,7 +1219,8 @@
     T(db.deleteDoc(designDoc).ok);
     T(db.open(designDoc._id) == null);
     T(db.view("test/no_docs") == null);
-
+    
+    T(db.ensureFullCommit().ok);
     restartServer();
     T(db.open(designDoc._id) == null);
     T(db.view("test/no_docs") == null);
@@ -2327,6 +2333,7 @@
     // compaction isn't instantaneous, loop until done
     while (db.info().compact_running) {};
     
+    T(db.ensureFullCommit().ok);
     restartServer();
     var xhr = CouchDB.request("GET", "/test_suite_db/bin_doc/foo.txt");
     T(xhr.responseText == "This is a base64 encoded text")

Modified: couchdb/trunk/src/couchdb/couch_db.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_db.erl?rev=731452&r1=731451&r2=731452&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_db.erl (original)
+++ couchdb/trunk/src/couchdb/couch_db.erl Sun Jan  4 21:42:52 2009
@@ -21,7 +21,7 @@
 -export([enum_docs/4,enum_docs/5,enum_docs_since/4,enum_docs_since/5]).
 -export([enum_docs_since_reduce_to_count/1,enum_docs_reduce_to_count/1]).
 -export([increment_update_seq/1,get_purge_seq/1,purge_docs/2,get_last_purged/1]).
--export([start_link/3,make_doc/2,set_admins/2,get_admins/1]).
+-export([start_link/3,make_doc/2,set_admins/2,get_admins/1,ensure_full_commit/1]).
 -export([init/1,terminate/2,handle_call/3,handle_cast/2,code_change/3,handle_info/2]).
 
 
@@ -64,6 +64,9 @@
 open(DbName, Options) ->
     couch_server:open(DbName, Options).
 
+ensure_full_commit(#db{update_pid=UpdatePid}) ->
+    gen_server:call(UpdatePid, full_commit, infinity).
+
 close(#db{fd=Fd}) ->
     couch_file:drop_ref(Fd).
 
@@ -462,7 +465,7 @@
     ok = couch_file:add_ref(Fd),
     gen_server:call(UpdaterPid, get_db).
 
-terminate(_Reason, Db) ->
+terminate(_Reason, _Db) ->
     ok.
     
 handle_call({open_ref_counted_instance, OpenerPid}, _From, #db{fd=Fd}=Db) ->

Modified: couchdb/trunk/src/couchdb/couch_db.hrl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_db.hrl?rev=731452&r1=731451&r2=731452&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_db.hrl (original)
+++ couchdb/trunk/src/couchdb/couch_db.hrl Sun Jan  4 21:42:52 2009
@@ -132,7 +132,8 @@
     validate_doc_funs=[],
     admins=[],
     admins_ptr=nil,
-    user_ctx=#user_ctx{}
+    user_ctx=#user_ctx{},
+    waiting_delayed_commit=nil
     }).
 
 
@@ -161,6 +162,7 @@
     views,
     id_btree=nil,
     current_seq=0,
+    committed_seq=0,
     purge_seq=0,
     query_server=nil,
     commit_fun

Modified: couchdb/trunk/src/couchdb/couch_db_updater.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_db_updater.erl?rev=731452&r1=731451&r2=731452&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_db_updater.erl (original)
+++ couchdb/trunk/src/couchdb/couch_db_updater.erl Sun Jan  4 21:42:52 2009
@@ -54,6 +54,10 @@
         throw: conflict ->
             {reply, conflict, Db}
     end;
+handle_call(full_commit, _From, #db{waiting_delayed_commit=nil}=Db) ->
+    {reply, ok, Db}; % no data waiting, return ok immediately
+handle_call(full_commit, _From, Db) ->
+    {reply, ok, commit_data(Db)}; % commit the data and return ok
 handle_call(increment_update_seq, _From, Db) ->
     Db2 = commit_data(Db#db{update_seq=Db#db.update_seq+1}),
     ok = gen_server:call(Db2#db.main_pid, {db_updated, Db2}),
@@ -185,9 +189,8 @@
         {noreply, Db2}
     end.
 
-handle_info(Msg, Db) ->
-    ?LOG_ERROR("Bad message received for db ~s: ~p", [Db#db.name, Msg]),
-    exit({error, Msg}).
+handle_info(delayed_commit, Db) ->
+    {noreply, commit_data(Db#db{waiting_delayed_commit=nil})}.
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
@@ -456,13 +459,8 @@
     _ ->
         Db4 = refresh_validate_doc_funs(Db3)
     end,
-
-    case lists:member(delay_commit, Options) of
-    true ->
-        {ok, Db4};
-    false ->
-        {ok, commit_data(Db4)}
-    end.
+    
+    {ok, commit_data(Db4, not lists:member(full_commit, Options))}.
 
 update_local_docs(#db{local_docs_btree=Btree}=Db, Docs) ->
     Ids = [Id || #doc{id=Id} <- Docs],
@@ -500,21 +498,34 @@
     {ok, Db#db{local_docs_btree = Btree2}}.
 
 
+commit_data(Db) ->
+    commit_data(Db, false).
 
-commit_data(#db{fd=Fd, header=Header} = Db) ->
-    Header2 = Header#db_header{
+
+commit_data(#db{fd=Fd, header=Header} = Db, Delay) ->
+    Db2 = Db#db{header = Header#db_header{
         update_seq = Db#db.update_seq,
         summary_stream_state = couch_stream:get_state(Db#db.summary_stream),
         docinfo_by_seq_btree_state = couch_btree:get_state(Db#db.docinfo_by_seq_btree),
         fulldocinfo_by_id_btree_state = couch_btree:get_state(Db#db.fulldocinfo_by_id_btree),
         local_docs_btree_state = couch_btree:get_state(Db#db.local_docs_btree),
         admins_ptr = Db#db.admins_ptr
-        },
-    if Header == Header2 ->
-        Db; % unchanged. nothing to do
+        }},
+    if Delay and (Db#db.waiting_delayed_commit == nil) ->
+        Db2#db{waiting_delayed_commit=
+                erlang:send_after(1000, self(), delayed_commit)};
+    Delay ->
+        Db2;
     true ->
-        ok = couch_file:write_header(Fd, ?HEADER_SIG, Header2),
-        Db#db{header = Header2}
+        if Db#db.waiting_delayed_commit /= nil ->
+            case erlang:cancel_timer(Db#db.waiting_delayed_commit) of
+            false -> receive delayed_commit -> ok after 0 -> ok end;
+            _ -> ok
+            end;
+        true -> ok
+        end,
+        ok = couch_file:write_header(Fd, ?HEADER_SIG, Db2#db.header),
+        Db2#db{waiting_delayed_commit=nil}
     end.
 
 copy_raw_doc(SrcFd, SrcSp, DestFd, DestStream) ->

Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_db.erl?rev=731452&r1=731451&r2=731452&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_httpd_db.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_db.erl Sun Jan  4 21:42:52 2009
@@ -89,10 +89,24 @@
 db_req(#httpd{path_parts=[_DbName]}=Req, _Db) ->
     send_method_not_allowed(Req, "DELETE,GET,HEAD,POST");
 
+db_req(#httpd{method='POST',path_parts=[_,<<"_ensure_full_commit">>]}=Req, Db)
->
+    ok = couch_db:ensure_full_commit(Db),
+    send_json(Req, 201, {[
+            {ok, true}
+        ]});
+    
+db_req(#httpd{path_parts=[_,<<"_ensure_full_commit">>]}=Req, _Db) ->
+    send_method_not_allowed(Req, "POST");
+
 db_req(#httpd{method='POST',path_parts=[_,<<"_bulk_docs">>]}=Req, Db) ->
     {JsonProps} = couch_httpd:json_body(Req),
     DocsArray = proplists:get_value(<<"docs">>, JsonProps),
-    % convert all the doc elements to native docs
+    case couch_httpd:header_value(Req, "X-Couch-Full-Commit", "false") of
+    "true" ->
+        Options = [full_commit];
+    _ ->
+        Options = []
+    end,
     case proplists:get_value(<<"new_edits">>, JsonProps, true) of
     true ->
         Docs = lists:map(
@@ -109,7 +123,7 @@
                 Doc#doc{id=Id,revs=Revs}
             end,
             DocsArray),
-        {ok, ResultRevs} = couch_db:update_docs(Db, Docs, []),
+        {ok, ResultRevs} = couch_db:update_docs(Db, Docs, Options),
 
         % output the results
         DocResults = lists:zipwith(
@@ -123,11 +137,6 @@
         ]});
 
     false ->
-        Options =
-        case proplists:get_value(<<"new_edits">>, JsonProps, true) of
-            true -> [new_edits];
-            _ -> []
-        end,
         Docs = [couch_doc:from_json_obj(JsonObj) || JsonObj <- DocsArray],
         ok = couch_db:update_docs(Db, Docs, Options, false),
         send_json(Req, 201, {[
@@ -418,13 +427,19 @@
         [Rev0|_] -> Rev0;
         [] -> undefined
     end,
+    case couch_httpd:header_value(Req, "X-Couch-Full-Commit", "false") of
+    "true" ->
+        Options = [full_commit];
+    _ ->
+        Options = []
+    end,
     case extract_header_rev(Req, ExplicitRev) of
     missing_rev ->
         Revs = [];
     Rev ->
         Revs = [Rev]
     end,
-    {ok, NewRev} = couch_db:update_doc(Db, Doc#doc{id=DocId, revs=Revs}, []),
+    {ok, NewRev} = couch_db:update_doc(Db, Doc#doc{id=DocId, revs=Revs}, Options),
     send_json(Req, 201, [{"Etag", <<"\"", NewRev/binary, "\"">>}], {[
         {ok, true},
         {id, DocId},



Mime
View raw message