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 2020/02/06 21:59:53 UTC

[couchdb] branch update-jiffy-1.0.3 created (now 9140e61)

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

davisp pushed a change to branch update-jiffy-1.0.3
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


      at 9140e61  Speed up OOM error

This branch includes the following new commits:

     new 4e7d668  Update to Jiffy 1.0.3
     new 8a26f88  Fix test failure in view_errors.js
     new 9140e61  Speed up OOM error

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[couchdb] 03/03: Speed up OOM error

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to branch update-jiffy-1.0.3
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 9140e61ea51b59b7256e91401fc927a05f0f20ee
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Thu Feb 6 10:21:13 2020 -0600

    Speed up OOM error
    
    This test was timing out just as the "out of memory" error is reported.
    Changing the accumulation from linear to exponential should hopefully
    prevent this from happening.
---
 src/couch/test/eunit/couch_js_tests.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/couch/test/eunit/couch_js_tests.erl b/src/couch/test/eunit/couch_js_tests.erl
index d3d92a2..6665476 100644
--- a/src/couch/test/eunit/couch_js_tests.erl
+++ b/src/couch/test/eunit/couch_js_tests.erl
@@ -17,7 +17,7 @@
 -define(FUNC, <<
   "function(doc) {\n"
   "  var val = \"0123456789ABCDEF\";\n"
-  "  while(true) {emit(val, val);}\n"
+  "  while(true) {val = val + val;}\n"
   "}\n"
 >>).
 


[couchdb] 02/03: Fix test failure in view_errors.js

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to branch update-jiffy-1.0.3
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 8a26f8838f99d6ff84e644409393f38ef7e1b7ff
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Wed Feb 5 14:05:01 2020 -0600

    Fix test failure in view_errors.js
---
 test/javascript/tests/view_errors.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/javascript/tests/view_errors.js b/test/javascript/tests/view_errors.js
index 7aad40c..6b9c754 100644
--- a/test/javascript/tests/view_errors.js
+++ b/test/javascript/tests/view_errors.js
@@ -154,8 +154,13 @@ couchTests.view_errors = function(debug) {
           db.view("infinite/infinite_loop");
           T(0 == 1);
       } catch(e) {
-        console.log("infinite sorrow: "  + e.error);
-          T(e.error == "os_process_error");
+          // This test has two different races. The first is whether
+          // the while loop exhausts the JavaScript RAM limits before
+          // timing. The second is a race between which of two timeouts
+          // fires first. The first timeout is the couch_os_process
+          // waiting for data back from couchjs. The second is the
+          // gen_server call to couch_os_process.
+          T(e.error == "os_process_error" || e.error == "timeout");
       }
 
       // Check error responses for invalid multi-get bodies.


[couchdb] 01/03: Update to Jiffy 1.0.3

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to branch update-jiffy-1.0.3
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 4e7d66821a51d7df198cba40d1543d5f662e6a36
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Wed Feb 5 10:00:33 2020 -0600

    Update to Jiffy 1.0.3
    
    This fixes builds on Windows and CentOS.
---
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rebar.config.script b/rebar.config.script
index 0708606..d344e17 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -157,7 +157,7 @@ DepDescs = [
 {folsom,           "folsom",           {tag, "CouchDB-0.8.3"}},
 {hyper,            "hyper",            {tag, "CouchDB-2.2.0-6"}},
 {ibrowse,          "ibrowse",          {tag, "CouchDB-4.0.1-1"}},
-{jiffy,            "jiffy",            {tag, "CouchDB-1.0.1-1"}},
+{jiffy,            "jiffy",            {tag, "CouchDB-1.0.3-1"}},
 {mochiweb,         "mochiweb",         {tag, "v2.20.0"}},
 {meck,             "meck",             {tag, "0.8.8"}},
 {recon,            "recon",            {tag, "2.5.0"}}