You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2011/06/15 02:16:25 UTC

svn commit: r1135865 - in /couchdb/branches/1.0.x: ./ etc/default/couchdb share/www/script/test/design_docs.js

Author: davisp
Date: Wed Jun 15 00:16:25 2011
New Revision: 1135865

URL: http://svn.apache.org/viewvc?rev=1135865&view=rev
Log:
Backport of 1029026 from trunk.

Avoiding hardcoded value for the view index disk size.


Modified:
    couchdb/branches/1.0.x/   (props changed)
    couchdb/branches/1.0.x/etc/default/couchdb   (props changed)
    couchdb/branches/1.0.x/share/www/script/test/design_docs.js

Propchange: couchdb/branches/1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 15 00:16:25 2011
@@ -6,4 +6,4 @@
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
 /couchdb/tags/0.10.0:825400
-/couchdb/trunk:984170,984178,984214,984228,984237,984241,984501,991073,1029025,1029030,1045203,1083714,1095557,1095581,1097300,1099479
+/couchdb/trunk:984170,984178,984214,984228,984237,984241,984501,991073,1029025-1029026,1029030,1045203,1083714,1095557,1095581,1097300,1099479

Propchange: couchdb/branches/1.0.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 15 00:16:25 2011
@@ -6,5 +6,5 @@
 /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
 /couchdb/tags/0.10.0/etc/default/couchdb:825400
-/couchdb/trunk/etc/default/couchdb:984170,984178,984214,984228,984237,984241,984501,991073,1029025,1029030,1045203,1083714,1095557,1095581,1097300,1099479
+/couchdb/trunk/etc/default/couchdb:984170,984178,984214,984228,984237,984241,984501,991073,1029025-1029026,1029030,1045203,1083714,1095557,1095581,1097300,1099479
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/1.0.x/share/www/script/test/design_docs.js
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/share/www/script/test/design_docs.js?rev=1135865&r1=1135864&r2=1135865&view=diff
==============================================================================
--- couchdb/branches/1.0.x/share/www/script/test/design_docs.js (original)
+++ couchdb/branches/1.0.x/share/www/script/test/design_docs.js Wed Jun 15 00:16:25 2011
@@ -94,6 +94,7 @@ function() {
   TEquals("javascript", JSON.parse(xhr.responseText).language);
 
   var prev_view_sig = db.designInfo("_design/test").view_index.signature;
+  var prev_view_size = db.designInfo("_design/test").view_index.disk_size;
 
   db.bulkSave(makeDocs(1, numDocs + 1));
   T(db.ensureFullCommit().ok);
@@ -106,7 +107,7 @@ function() {
     var dinfo = db.designInfo("_design/test");
     TEquals("test", dinfo.name);
     var vinfo = dinfo.view_index;
-    TEquals(51, vinfo.disk_size);
+    TEquals(prev_view_size, vinfo.disk_size, "view group disk size didn't change");
     TEquals(false, vinfo.compact_running);
     TEquals(prev_view_sig, vinfo.signature, 'ddoc sig');
     // wait some time (there were issues where an update