You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2010/06/25 16:25:32 UTC
svn commit: r957982 - in /couchdb/branches/0.11.x:
share/www/script/test/compact.js src/couchdb/couch_db_updater.erl
Author: jan
Date: Fri Jun 25 14:25:32 2010
New Revision: 957982
URL: http://svn.apache.org/viewvc?rev=957982&view=rev
Log:
Merge r952732 from trunk:
preserve _revs_limit after compaction. COUCHDB-789
Modified:
couchdb/branches/0.11.x/share/www/script/test/compact.js
couchdb/branches/0.11.x/src/couchdb/couch_db_updater.erl
Modified: couchdb/branches/0.11.x/share/www/script/test/compact.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/www/script/test/compact.js?rev=957982&r1=957981&r2=957982&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/www/script/test/compact.js (original)
+++ couchdb/branches/0.11.x/share/www/script/test/compact.js Fri Jun 25 14:25:32 2010
@@ -39,12 +39,14 @@ couchTests.compact = function(debug) {
T(db.ensureFullCommit().ok);
var deletesize = db.info().disk_size;
T(deletesize > originalsize);
+ T(db.setDbProperty("_revs_limit", 666).ok);
T(db.compact().ok);
T(db.last_req.status == 202);
// compaction isn't instantaneous, loop until done
while (db.info().compact_running) {};
T(db.info().instance_start_time == start_time);
+ T(db.getDbProperty("_revs_limit") === 666);
T(db.ensureFullCommit().ok);
restartServer();
Modified: couchdb/branches/0.11.x/src/couchdb/couch_db_updater.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch_db_updater.erl?rev=957982&r1=957981&r2=957982&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/couch_db_updater.erl (original)
+++ couchdb/branches/0.11.x/src/couchdb/couch_db_updater.erl Fri Jun 25 14:25:32 2010
@@ -165,7 +165,8 @@ handle_cast({compact_done, CompactFilepa
local_docs_btree = NewLocalBtree,
main_pid = Db#db.main_pid,
filepath = Filepath,
- instance_start_time = Db#db.instance_start_time
+ instance_start_time = Db#db.instance_start_time,
+ revs_limit = Db#db.revs_limit
}),
?LOG_DEBUG("CouchDB swapping files ~s and ~s.",