diff options
| author | Damien F. Katz <damien@apache.org> | 2009-01-09 22:20:48 +0000 |
|---|---|---|
| committer | Damien F. Katz <damien@apache.org> | 2009-01-09 22:20:48 +0000 |
| commit | 87f45e73df3e37fbb631bcb14871c621ee77489b (patch) | |
| tree | 0e33d44479bc94dd8a28387d771ba5feb037441d /src/couchdb/couch_db.erl | |
| parent | f6664de58f489627fee6e4283a1d17e0c6a99433 (diff) | |
Added support so clients can detect if a server has potentially lost commits after multiple updates, like during bulk imports and so the replicator can detect lost commits on remote replications.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@733174 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_db.erl')
| -rw-r--r-- | src/couchdb/couch_db.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl index c9546240..3011d744 100644 --- a/src/couchdb/couch_db.erl +++ b/src/couchdb/couch_db.erl @@ -64,8 +64,9 @@ create(DbName, Options) -> open(DbName, Options) -> couch_server:open(DbName, Options). -ensure_full_commit(#db{update_pid=UpdatePid}) -> - gen_server:call(UpdatePid, full_commit, infinity). +ensure_full_commit(#db{update_pid=UpdatePid,instance_start_time=StartTime}) -> + ok = gen_server:call(UpdatePid, full_commit, infinity), + {ok, StartTime}. close(#db{fd=Fd}) -> couch_file:drop_ref(Fd). @@ -166,7 +167,8 @@ get_db_info(Db) -> compactor_pid=Compactor, update_seq=SeqNum, name=Name, - fulldocinfo_by_id_btree=FullDocBtree} = Db, + fulldocinfo_by_id_btree=FullDocBtree, + instance_start_time=StartTime} = Db, {ok, Size} = couch_file:bytes(Fd), {ok, {Count, DelCount}} = couch_btree:full_reduce(FullDocBtree), InfoList = [ @@ -176,7 +178,8 @@ get_db_info(Db) -> {update_seq, SeqNum}, {purge_seq, couch_db:get_purge_seq(Db)}, {compact_running, Compactor/=nil}, - {disk_size, Size} + {disk_size, Size}, + {instance_start_time, StartTime} ], {ok, InfoList}. |