diff options
| author | John Christopher Anderson <jchris@apache.org> | 2009-03-13 22:15:34 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2009-03-13 22:15:34 +0000 |
| commit | 9007e2d21dea8b0185c0096b30364a8ee40a3867 (patch) | |
| tree | 7d8dacb2c8cd619f18dfab8fdb40d146ac28c85a /src/couchdb/couch_db.hrl | |
| parent | 65608e14e8911b33c30178d717d745edc9f66c17 (diff) | |
Commit Damien's rep_security branch to trunk.
Changes bulk_docs conflict checking.
Breaks file format, see mailing list for data upgrade procedure, or
http://wiki.apache.org/couchdb/Breaking_changes
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@753448 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_db.hrl')
| -rw-r--r-- | src/couchdb/couch_db.hrl | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/couchdb/couch_db.hrl b/src/couchdb/couch_db.hrl index 026afe14..f460f450 100644 --- a/src/couchdb/couch_db.hrl +++ b/src/couchdb/couch_db.hrl @@ -69,7 +69,7 @@ -record(doc, { id = <<"">>, - revs = [], + revs = {0, []}, % the json body object. body = {[]}, @@ -104,7 +104,7 @@ % if the disk revision is incremented, then new upgrade logic will need to be % added to couch_db_updater:init_db. --define(LATEST_DISK_VERSION, 0). +-define(LATEST_DISK_VERSION, 1). -record(db_header, {disk_version = ?LATEST_DISK_VERSION, @@ -115,13 +115,14 @@ local_docs_btree_state = nil, purge_seq = 0, purged_docs = nil, - admins_ptr = nil + admins_ptr = nil, + revs_limit = 1000 }). -record(db, - {main_pid=nil, - update_pid=nil, - compactor_pid=nil, + {main_pid = nil, + update_pid = nil, + compactor_pid = nil, instance_start_time, % number of microsecs since jan 1 1970 as a binary string fd, fd_ref_counter, @@ -133,11 +134,12 @@ update_seq, name, filepath, - validate_doc_funs=[], - admins=[], - admins_ptr=nil, - user_ctx=#user_ctx{}, - waiting_delayed_commit=nil + validate_doc_funs = [], + admins = [], + admins_ptr = nil, + user_ctx = #user_ctx{}, + waiting_delayed_commit = nil, + revs_limit = 1000 }). |