From 0a230b77e3bda82c898abad8b2b79a6bdc22dd87 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 2 Jul 2014 00:17:25 +0200 Subject: [PATCH] jshund --- .../frontend/js/modules/org/arangodb/arango-collection.js | 3 ++- js/client/modules/org/arangodb/arango-collection.js | 3 ++- js/server/tests/recovery/big-transaction-durability.js | 2 +- js/server/tests/recovery/create-databases.js | 2 +- js/server/tests/recovery/disk-full-no-collection-journal.js | 4 ++-- js/server/tests/recovery/drop-indexes.js | 2 +- js/server/tests/recovery/indexes-bitarray.js | 2 +- js/server/tests/recovery/indexes-hash.js | 3 +-- js/server/tests/recovery/indexes-skiplist.js | 3 +-- js/server/tests/recovery/insert-update-remove-distance.js | 2 +- js/server/tests/recovery/insert-update-remove.js | 2 +- js/server/tests/recovery/many-updates.js | 2 +- js/server/tests/recovery/multi-database-durability.js | 4 ++-- js/server/tests/recovery/no-shutdown-info-multiple-logs.js | 4 ++-- js/server/tests/recovery/transaction-durability-multiple.js | 4 ++-- js/server/tests/recovery/transaction-durability.js | 2 +- js/server/tests/recovery/transaction-no-abort.js | 2 +- js/server/tests/recovery/transaction-no-commit.js | 2 +- js/server/tests/recovery/wait-for-sync.js | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/js/apps/system/aardvark/frontend/js/modules/org/arangodb/arango-collection.js b/js/apps/system/aardvark/frontend/js/modules/org/arangodb/arango-collection.js index 922cbcd52c..322c4c9ef8 100644 --- a/js/apps/system/aardvark/frontend/js/modules/org/arangodb/arango-collection.js +++ b/js/apps/system/aardvark/frontend/js/modules/org/arangodb/arango-collection.js @@ -1049,7 +1049,8 @@ ArangoCollection.prototype.last = function (count) { /// save(, , , ) //////////////////////////////////////////////////////////////////////////////// -ArangoCollection.prototype.save = function (from, to, data, waitForSync) { +ArangoCollection.prototype.save = +ArangoCollection.prototype.insert = function (from, to, data, waitForSync) { var type = this.type(), url; if (type === undefined) { diff --git a/js/client/modules/org/arangodb/arango-collection.js b/js/client/modules/org/arangodb/arango-collection.js index b25f848b16..28463759b9 100644 --- a/js/client/modules/org/arangodb/arango-collection.js +++ b/js/client/modules/org/arangodb/arango-collection.js @@ -1048,7 +1048,8 @@ ArangoCollection.prototype.last = function (count) { /// save(, , , ) //////////////////////////////////////////////////////////////////////////////// -ArangoCollection.prototype.save = function (from, to, data, waitForSync) { +ArangoCollection.prototype.save = +ArangoCollection.prototype.insert = function (from, to, data, waitForSync) { var type = this.type(), url; if (type === undefined) { diff --git a/js/server/tests/recovery/big-transaction-durability.js b/js/server/tests/recovery/big-transaction-durability.js index 0b716933ca..b4e20dba68 100644 --- a/js/server/tests/recovery/big-transaction-durability.js +++ b/js/server/tests/recovery/big-transaction-durability.js @@ -8,7 +8,7 @@ function runSetup () { internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); - var c = db._create("UnitTestsRecovery"); + db._create("UnitTestsRecovery"); db._executeTransaction({ collections: { diff --git a/js/server/tests/recovery/create-databases.js b/js/server/tests/recovery/create-databases.js index 6138e12c18..05ea25a6a1 100644 --- a/js/server/tests/recovery/create-databases.js +++ b/js/server/tests/recovery/create-databases.js @@ -7,7 +7,7 @@ var jsunity = require("jsunity"); function runSetup () { internal.debugClearFailAt(); - var i, j, c; + var c; db._drop("footest"); c = db._create("footest", { id: 99999999 }); c.save({ foo: "bar" }); diff --git a/js/server/tests/recovery/disk-full-no-collection-journal.js b/js/server/tests/recovery/disk-full-no-collection-journal.js index 2b583275d7..89bca5de7f 100644 --- a/js/server/tests/recovery/disk-full-no-collection-journal.js +++ b/js/server/tests/recovery/disk-full-no-collection-journal.js @@ -8,8 +8,8 @@ function runSetup () { internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); - var c = db._create("UnitTestsRecovery"); - + db._create("UnitTestsRecovery"); + internal.debugSetFailAt("CreateJournalDocumentCollection"); db._executeTransaction({ diff --git a/js/server/tests/recovery/drop-indexes.js b/js/server/tests/recovery/drop-indexes.js index e66e47c9da..3d15239e16 100644 --- a/js/server/tests/recovery/drop-indexes.js +++ b/js/server/tests/recovery/drop-indexes.js @@ -49,7 +49,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// testDropIndexes : function () { - var i, j, c, idx; + var i, c, idx; for (i = 0; i < 4; ++i) { c = db._collection("UnitTestsRecovery" + i); diff --git a/js/server/tests/recovery/indexes-bitarray.js b/js/server/tests/recovery/indexes-bitarray.js index fc3b1a0bfa..59adbcac55 100644 --- a/js/server/tests/recovery/indexes-bitarray.js +++ b/js/server/tests/recovery/indexes-bitarray.js @@ -39,7 +39,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// testIndexesBitarray : function () { - var c = db._collection("UnitTestsRecovery"), i; + var c = db._collection("UnitTestsRecovery"); var idx = c.getIndexes()[1]; assertEqual("bitarray", idx.type); assertFalse(idx.unique); diff --git a/js/server/tests/recovery/indexes-hash.js b/js/server/tests/recovery/indexes-hash.js index c3f6e92402..131fddab4f 100644 --- a/js/server/tests/recovery/indexes-hash.js +++ b/js/server/tests/recovery/indexes-hash.js @@ -1,14 +1,13 @@ var db = require("org/arangodb").db; var internal = require("internal"); -var simple = require("org/arangodb/simple-query"); var jsunity = require("jsunity"); function runSetup () { internal.debugClearFailAt(); db._drop("UnitTestsRecovery1"); - var c = db._create("UnitTestsRecovery1"), i, j; + var c = db._create("UnitTestsRecovery1"), i; c.ensureHashIndex("value"); for (i = 0; i < 1000; ++i) { diff --git a/js/server/tests/recovery/indexes-skiplist.js b/js/server/tests/recovery/indexes-skiplist.js index a50812817b..de4e3ff042 100644 --- a/js/server/tests/recovery/indexes-skiplist.js +++ b/js/server/tests/recovery/indexes-skiplist.js @@ -1,14 +1,13 @@ var db = require("org/arangodb").db; var internal = require("internal"); -var simple = require("org/arangodb/simple-query"); var jsunity = require("jsunity"); function runSetup () { internal.debugClearFailAt(); db._drop("UnitTestsRecovery1"); - var c = db._create("UnitTestsRecovery1"), i, j; + var c = db._create("UnitTestsRecovery1"), i; c.ensureSkiplist("value"); for (i = 0; i < 1000; ++i) { diff --git a/js/server/tests/recovery/insert-update-remove-distance.js b/js/server/tests/recovery/insert-update-remove-distance.js index 8b7d3189a5..dbb4d297c7 100644 --- a/js/server/tests/recovery/insert-update-remove-distance.js +++ b/js/server/tests/recovery/insert-update-remove-distance.js @@ -8,7 +8,7 @@ function runSetup () { internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); - var c = db._create("UnitTestsRecovery"); + db._create("UnitTestsRecovery"); db._executeTransaction({ collections: { diff --git a/js/server/tests/recovery/insert-update-remove.js b/js/server/tests/recovery/insert-update-remove.js index f1fb20dcb0..1429fd2cfc 100644 --- a/js/server/tests/recovery/insert-update-remove.js +++ b/js/server/tests/recovery/insert-update-remove.js @@ -8,7 +8,7 @@ function runSetup () { internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); - var c = db._create("UnitTestsRecovery"); + db._create("UnitTestsRecovery"); db._executeTransaction({ collections: { diff --git a/js/server/tests/recovery/many-updates.js b/js/server/tests/recovery/many-updates.js index 69f4302614..7e495157ee 100644 --- a/js/server/tests/recovery/many-updates.js +++ b/js/server/tests/recovery/many-updates.js @@ -37,7 +37,7 @@ function recoverySuite () { //////////////////////////////////////////////////////////////////////////////// testManyUpdates : function () { - var i, c = db._collection("UnitTestsRecovery"); + var c = db._collection("UnitTestsRecovery"); assertEqual(2, c.count()); assertEqual(199999, c.document("value").value); diff --git a/js/server/tests/recovery/multi-database-durability.js b/js/server/tests/recovery/multi-database-durability.js index 720071bc22..9c58c3aa6e 100644 --- a/js/server/tests/recovery/multi-database-durability.js +++ b/js/server/tests/recovery/multi-database-durability.js @@ -18,8 +18,8 @@ function runSetup () { } db._createDatabase(d); db._useDatabase(d); - - var c = db._create("UnitTestsRecovery"); + + db._create("UnitTestsRecovery"); db._executeTransaction({ collections: { diff --git a/js/server/tests/recovery/no-shutdown-info-multiple-logs.js b/js/server/tests/recovery/no-shutdown-info-multiple-logs.js index c47cc9b2b2..943506565a 100644 --- a/js/server/tests/recovery/no-shutdown-info-multiple-logs.js +++ b/js/server/tests/recovery/no-shutdown-info-multiple-logs.js @@ -8,8 +8,8 @@ function runSetup () { internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); - var c = db._create("UnitTestsRecovery"), i; - + db._create("UnitTestsRecovery"); + internal.debugSetFailAt("LogfileManagerWriteShutdown"); db._executeTransaction({ diff --git a/js/server/tests/recovery/transaction-durability-multiple.js b/js/server/tests/recovery/transaction-durability-multiple.js index 46dd3036a1..345cc23d03 100644 --- a/js/server/tests/recovery/transaction-durability-multiple.js +++ b/js/server/tests/recovery/transaction-durability-multiple.js @@ -9,8 +9,8 @@ function runSetup () { db._drop("UnitTestsRecovery1"); db._drop("UnitTestsRecovery2"); - var c1 = db._create("UnitTestsRecovery1"); - var c2 = db._create("UnitTestsRecovery2"); + db._create("UnitTestsRecovery1"); + db._create("UnitTestsRecovery2"); db._executeTransaction({ collections: { diff --git a/js/server/tests/recovery/transaction-durability.js b/js/server/tests/recovery/transaction-durability.js index 001cc28931..e4eba63050 100644 --- a/js/server/tests/recovery/transaction-durability.js +++ b/js/server/tests/recovery/transaction-durability.js @@ -8,7 +8,7 @@ function runSetup () { internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); - var c = db._create("UnitTestsRecovery"); + db._create("UnitTestsRecovery"); db._executeTransaction({ collections: { diff --git a/js/server/tests/recovery/transaction-no-abort.js b/js/server/tests/recovery/transaction-no-abort.js index 0c4a4f2391..8c15c34619 100644 --- a/js/server/tests/recovery/transaction-no-abort.js +++ b/js/server/tests/recovery/transaction-no-abort.js @@ -8,7 +8,7 @@ function runSetup () { internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); - var c = db._create("UnitTestsRecovery"); + db._create("UnitTestsRecovery"); try { db._executeTransaction({ diff --git a/js/server/tests/recovery/transaction-no-commit.js b/js/server/tests/recovery/transaction-no-commit.js index ca68b584ea..7d49257e34 100644 --- a/js/server/tests/recovery/transaction-no-commit.js +++ b/js/server/tests/recovery/transaction-no-commit.js @@ -8,7 +8,7 @@ function runSetup () { internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); - var c = db._create("UnitTestsRecovery"); + db._create("UnitTestsRecovery"); try { db._executeTransaction({ diff --git a/js/server/tests/recovery/wait-for-sync.js b/js/server/tests/recovery/wait-for-sync.js index b3fa057187..dd2a1ff9c9 100644 --- a/js/server/tests/recovery/wait-for-sync.js +++ b/js/server/tests/recovery/wait-for-sync.js @@ -8,7 +8,7 @@ function runSetup () { internal.debugClearFailAt(); db._drop("UnitTestsRecovery"); - var c = db._create("UnitTestsRecovery"), i; + var c = db._create("UnitTestsRecovery"); c.save({ _key: "crashme", thefoxx: "is quick and jumped over the lazy dog" }, true); // wait for sync