[couchdb] branch remove-deprecated-dbinfo-bits updated: Missed a few more instances

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a commit to branch remove-deprecated-dbinfo-bits
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/remove-deprecated-dbinfo-bits by this push:
     new f3fe9bb  Missed a few more instances
f3fe9bb is described below

commit f3fe9bbf4db83f548a63b53295d109754682548f
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Thu Sep 5 16:59:17 2019 -0400

    Missed a few more instances
---
 test/elixir/test/compact_test.exs        | 8 ++++----
 test/javascript/tests/attachments.js     | 4 ++--
 test/javascript/tests/design_docs.js     | 4 ++--
 test/javascript/tests/view_compaction.js | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/elixir/test/compact_test.exs b/test/elixir/test/compact_test.exs
index 4c6657e..191267b 100644
--- a/test/elixir/test/compact_test.exs
+++ b/test/elixir/test/compact_test.exs
@@ -21,8 +21,8 @@ defmodule CompactTest do
     db = context[:db_name]
     docs = populate(db)
     info = get_info(db)
-    orig_data_size = info["data_size"]
-    orig_disk_size = info["disk_size"]
+    orig_data_size = info["sizes"]["active"]
+    orig_disk_size = info["sizes"]["file"]
     start_time = info["instance_start_time"]
     assert is_integer(orig_data_size) and is_integer(orig_disk_size)
     assert orig_data_size < orig_disk_size
@@ -42,8 +42,8 @@ defmodule CompactTest do
       assert get_info(db)["instance_start_time"] == start_time
       assert_attachment_available(db)
       info = get_info(db)
-      final_data_size = info["data_size"]
-      final_disk_size = info["disk_size"]
+      final_data_size = info["sizes"]["active"]
+      final_disk_size = info["sizes"]["file"]
       assert final_data_size < final_disk_size
       assert is_integer(final_data_size) and is_integer(final_disk_size)
       assert final_data_size < deleted_data_size
diff --git a/test/javascript/tests/attachments.js b/test/javascript/tests/attachments.js
index 2e831a7..73de018 100644
--- a/test/javascript/tests/attachments.js
+++ b/test/javascript/tests/attachments.js
@@ -218,7 +218,7 @@ couchTests.attachments= function(debug) {
   // re-create them
   var saved3 = db.bulkSave(docs);
 
-  var before = db.info().disk_size;
+  var before = db.info().sizes.file;
 
   // Compact it.
   /*T(db.compact().ok);
@@ -226,7 +226,7 @@ couchTests.attachments= function(debug) {
   // compaction isn't instantaneous, loop until done
   while (db.info().compact_running) {};
 
-  var after = db.info().disk_size;
+  var after = db.info().sizes.file;
 
   // Compaction should reduce the database slightly, but not
   // orders of magnitude (unless attachments introduce sparseness)
diff --git a/test/javascript/tests/design_docs.js b/test/javascript/tests/design_docs.js
index ed1e72f..780fc13 100644
--- a/test/javascript/tests/design_docs.js
+++ b/test/javascript/tests/design_docs.js
@@ -247,7 +247,7 @@ couchTests.design_docs = function(debug) {
 
 
     var prev_view_sig = db.designInfo("_design/test").view_index.signature;
-    var prev_view_size = db.designInfo("_design/test").view_index.disk_size;
+    var prev_view_size = db.designInfo("_design/test").view_index.sizes.file;
 
     db.bulkSave(makeDocs(1, numDocs + 1));
     T(db.ensureFullCommit().ok);
@@ -260,7 +260,7 @@ couchTests.design_docs = function(debug) {
       var dinfo = db.designInfo("_design/test");
       TEquals("test", dinfo.name);
       var vinfo = dinfo.view_index;
-      TEquals(prev_view_size, vinfo.disk_size, "view group disk size didn't change");
+      TEquals(prev_view_size, vinfo.sizes.file, "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
diff --git a/test/javascript/tests/view_compaction.js b/test/javascript/tests/view_compaction.js
index 40ea94c..d1a1e87 100644
--- a/test/javascript/tests/view_compaction.js
+++ b/test/javascript/tests/view_compaction.js
@@ -102,7 +102,7 @@ couchTests.view_compaction = function(debug) {
 
   resp = db.designInfo("_design/foo");
   TEquals(30001, resp.view_index.update_seq);
-  T(resp.view_index.disk_size < disk_size_before_compact);
+  T(resp.view_index.sizes.file < disk_size_before_compact);
   TEquals("number", typeof resp.view_index.sizes.active, "data size is a number");
   T(resp.view_index.sizes.active < resp.view_index.sizes.file, "data size < file size");