SERVER-35847 Remove eval command and remove/update related tests/helpers

1 files changed, 24 insertions, 40 deletions

diff --git a/jstests/serial_run/memory.js b/jstests/serial_run/memory.js
index 3451800b89d..f9b125b24a9 100644
--- a/jstests/serial_run/memory.js
+++ b/jstests/serial_run/memory.js
@@ -11,55 +11,39 @@ for (var i = 0; i < loopNum; ++i) {
     name = "memoryTest" + i;
     if ((i % 1000) == 0)
         print("Processing " + name);
-    db.eval(function(col) {
-        for (var i = 0; i < 100; ++i) {
-            db[col + "_" + i].find();
-        }
-    }, name);
-}
-
-// test recovery of JS engine after out of memory
-db.system.js.save({
-    "_id": "f1",
-    "value": function(n) {
-        a = [];
-        b = [];
-        c = [];
-        for (i = 0; i < n; i++) {
-            a.push(Math.random());
-            b.push(Math.random());
-            c.push(Math.random());
-        }
+    for (var j = 0; j < 100; ++j) {
+        db[name + "_" + j].find();
     }
-});
+}
 
 // do mix of calls to make sure OOM is handled with no permanent damage
-db.eval("f1(10)");
+function doWhereTest(count) {
+    'use strict';
+    print('doWhereTest(' + count + ')');
+    const coll = db.whereCol;
+    coll.drop();
+    coll.insert({a: 1});
+    coll.findOne({$where: "var arr = []; for (var i = 0; i < " + count + "; ++i) {arr.push(0);}"});
+}
+
+doWhereTest(10);
 assert.throws(function() {
-    db.eval("f1(100000000)");
+    doWhereTest(1000000000);
 });
-db.eval("f1(10)");
+doWhereTest(10);
 assert.throws(function() {
-    db.eval("f1(1000000000)");
+    doWhereTest(1000000000);
 });
 
 loopNum = codeCoverageVariant ? 10000 : 1000000;
-db.eval("f1(" + loopNum + ")");
-db.eval("f1(" + loopNum + ")");
-db.eval("f1(" + loopNum + ")");
+doWhereTest(loopNum);
+doWhereTest(loopNum);
+doWhereTest(loopNum);
 assert.throws(function() {
-    db.eval("f1(100000000)");
+    doWhereTest(1000000000);
 });
-db.eval("f1(10)");
-db.eval("f1(" + loopNum + ")");
-db.eval("f1(" + loopNum + ")");
-db.eval("f1(" + loopNum + ")");
 
-// also test $where
-col.drop();
-col.insert({a: 1});
-col.findOne({$where: "var arr = []; for (var i = 0; i < " + loopNum + "; ++i) {arr.push(0);}"});
-assert.throws(function() {
-    col.findOne({$where: "var arr = []; for (var i = 0; i < 1000000000; ++i) {arr.push(0);}"});
-});
-col.findOne({$where: "var arr = []; for (var i = 0; i < " + loopNum + "; ++i) {arr.push(0);}"});
+doWhereTest(10);
+doWhereTest(loopNum);
+doWhereTest(loopNum);
+doWhereTest(loopNum);