mirror of https://gitee.com/bigwinds/arangodb
UnitTests: divert to AQL2 in the modifying queries tests; adjust to new reply-syntax.
This commit is contained in:
Willi Goesgens
parent
f8b681a5f8
commit
01363e6759
|
|
@ -114,6 +114,20 @@ function getModifyQueryResults (query, bindVars) {
|
|||
return queryResult.extra;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief return the results of a modify-query; compare aql 1 & 2 results
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
function getModifyQueryResults2 (query, bindVars) {
|
||||
var queryResult = AQL_EXECUTE(query, bindVars);
|
||||
|
||||
if (queryResult instanceof arangodb.ArangoCursor) {
|
||||
return queryResult.getExtra();
|
||||
}
|
||||
|
||||
return queryResult.stats;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief return the results of a query
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -468,21 +482,22 @@ function findReferencedNodes(plan, testNode) {
|
|||
// --SECTION-- module exports
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
exports.isEqual = isEqual;
|
||||
exports.getParseResults = getParseResults;
|
||||
exports.assertParseError = assertParseError;
|
||||
exports.getQueryExplanation = getQueryExplanation;
|
||||
exports.getModifyQueryResults = getModifyQueryResults;
|
||||
exports.getRawQueryResults = getRawQueryResults;
|
||||
exports.getQueryResults = getQueryResults;
|
||||
exports.getQueryResults2 = getQueryResults2;
|
||||
exports.getQueryResultsAQL2 = getQueryResultsAQL2;
|
||||
exports.assertQueryError = assertQueryError;
|
||||
exports.assertQueryError2 = assertQueryError2;
|
||||
exports.getLinearizedPlan = getLinearizedPlan;
|
||||
exports.getCompactPlan = getCompactPlan;
|
||||
exports.findExecutionNodes = findExecutionNodes;
|
||||
exports.findReferencedNodes = findReferencedNodes;
|
||||
exports.isEqual = isEqual;
|
||||
exports.getParseResults = getParseResults;
|
||||
exports.assertParseError = assertParseError;
|
||||
exports.getQueryExplanation = getQueryExplanation;
|
||||
exports.getModifyQueryResults = getModifyQueryResults;
|
||||
exports.getModifyQueryResults2 = getModifyQueryResults2;
|
||||
exports.getRawQueryResults = getRawQueryResults;
|
||||
exports.getQueryResults = getQueryResults;
|
||||
exports.getQueryResults2 = getQueryResults2;
|
||||
exports.getQueryResultsAQL2 = getQueryResultsAQL2;
|
||||
exports.assertQueryError = assertQueryError;
|
||||
exports.assertQueryError2 = assertQueryError2;
|
||||
exports.getLinearizedPlan = getLinearizedPlan;
|
||||
exports.getCompactPlan = getCompactPlan;
|
||||
exports.findExecutionNodes = findExecutionNodes;
|
||||
exports.findReferencedNodes = findReferencedNodes;
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// --SECTION-- END-OF-FILE
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ var db = require("org/arangodb").db;
|
|||
var jsunity = require("jsunity");
|
||||
var helper = require("org/arangodb/aql-helper");
|
||||
var cluster = require("org/arangodb/cluster");
|
||||
var getModifyQueryResults = helper.getModifyQueryResults;
|
||||
var getModifyQueryResults = helper.getModifyQueryResults2;
|
||||
var assertQueryError = helper.assertQueryError2;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -198,11 +198,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testRemoveNothing : function () {
|
||||
var expected = { executed: 0, ignored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN " + cn1 + " FILTER d.value1 < 0 REMOVE d IN " + cn1);
|
||||
var expected = { writesExecuted: 0, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN " + cn1 + " FILTER d.value1 < 0 REMOVE d IN " + cn1, {});
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -210,11 +210,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testRemoveNothingBind : function () {
|
||||
var expected = { executed: 0, ignored: 0 };
|
||||
var expected = { writesExecuted: 0, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn FILTER d.value1 < 0 REMOVE d IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -263,11 +263,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testRemoveIgnore1 : function () {
|
||||
var expected = { executed: 0, ignored: 100 };
|
||||
var expected = { writesExecuted: 0, writesIgnored: 100 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn REMOVE 'foo' IN @@cn OPTIONS { ignoreErrors: true }", { "@cn": cn1 });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -275,11 +275,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testRemoveIgnore2 : function () {
|
||||
var expected = { executed: 100, ignored: 1 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 1 };
|
||||
var actual = getModifyQueryResults("FOR i IN 0..100 REMOVE CONCAT('test', TO_STRING(i)) IN @@cn OPTIONS { ignoreErrors: true }", { "@cn": cn1 });
|
||||
|
||||
assertEqual(0, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -287,11 +287,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testRemoveAll1 : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn REMOVE d IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(0, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -299,11 +299,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testRemoveAll2 : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn REMOVE d._key IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(0, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -311,11 +311,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testRemoveAll3 : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn REMOVE { _key: d._key } IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(0, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -323,11 +323,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testRemoveAll4 : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR i IN 0..99 REMOVE { _key: CONCAT('test', TO_STRING(i)) } IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(0, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -335,11 +335,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testRemoveAll5 : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn REMOVE d INTO @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(0, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
|
||||
|
|
@ -348,11 +348,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testRemoveHalf : function () {
|
||||
var expected = { executed: 50, ignored: 0 };
|
||||
var expected = { writesExecuted: 50, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR i IN 0..99 FILTER i % 2 == 0 REMOVE { _key: CONCAT('test', TO_STRING(i)) } IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(50, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -368,11 +368,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testSingle : function () {
|
||||
var expected = { executed: 1, ignored: 0 };
|
||||
var expected = { writesExecuted: 1, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("REMOVE 'test0' IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(99, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -391,12 +391,12 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testTwoCollectionsJoin1 : function () {
|
||||
var expected = { executed: 50, ignored: 0 };
|
||||
var expected = { writesExecuted: 50, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn1 FILTER d.value1 < 50 REMOVE { _key: d._key } IN @@cn2", { "@cn1": cn1, "@cn2": cn2 });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(0, c2.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -404,12 +404,12 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testTwoCollectionsJoin2 : function () {
|
||||
var expected = { executed: 48, ignored: 0 };
|
||||
var expected = { writesExecuted: 48, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn1 FILTER d.value1 >= 2 && d.value1 < 50 REMOVE { _key: d._key } IN @@cn2", { "@cn1": cn1, "@cn2": cn2 });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(2, c2.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -417,12 +417,12 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testTwoCollectionsIgnoreErrors1 : function () {
|
||||
var expected = { executed: 50, ignored: 50 };
|
||||
var expected = { writesExecuted: 50, writesIgnored: 50 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn1 REMOVE { _key: d._key } IN @@cn2 OPTIONS { ignoreErrors: true }", { "@cn1": cn1, "@cn2": cn2 });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(0, c2.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -430,12 +430,12 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testTwoCollectionsIgnoreErrors2 : function () {
|
||||
var expected = { executed: 0, ignored: 100 };
|
||||
var expected = { writesExecuted: 0, writesIgnored: 100 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn1 REMOVE { _key: CONCAT('foo', d._key) } IN @@cn2 OPTIONS { ignoreErrors: true }", { "@cn1": cn1, "@cn2": cn2 });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(50, c2.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -443,11 +443,11 @@ function ahuacatlRemoveSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testRemoveWaitForSync : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn REMOVE d IN @@cn OPTIONS { waitForSync: true }", { "@cn": cn1 });
|
||||
|
||||
assertEqual(0, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -461,12 +461,12 @@ function ahuacatlRemoveSuite () {
|
|||
for (var i = 0; i < 100; ++i) {
|
||||
edge.save("UnitTestsAhuacatlRemove1/foo" + i, "UnitTestsAhuacatlRemove2/bar", { what: i, _key: "test" + i });
|
||||
}
|
||||
var expected = { executed: 10, ignored: 0 };
|
||||
var expected = { writesExecuted: 10, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR i IN 0..9 REMOVE CONCAT('test', TO_STRING(i)) IN @@cn", { "@cn": edge.name() });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(90, edge.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
db._drop("UnitTestsAhuacatlEdge");
|
||||
}
|
||||
|
||||
|
|
@ -519,11 +519,11 @@ function ahuacatlInsertSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testInsertNothing : function () {
|
||||
var expected = { executed: 0, ignored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN " + cn1 + " FILTER d.value1 < 0 INSERT { foxx: true } IN " + cn1);
|
||||
var expected = { writesExecuted: 0, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN " + cn1 + " FILTER d.value1 < 0 INSERT { foxx: true } IN " + cn1, {});
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -531,11 +531,11 @@ function ahuacatlInsertSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testInsertNothingBind : function () {
|
||||
var expected = { executed: 0, ignored: 0 };
|
||||
var expected = { writesExecuted: 0, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn FILTER d.value1 < 0 INSERT { foxx: true } IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -597,11 +597,11 @@ function ahuacatlInsertSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testInsertIgnore1 : function () {
|
||||
var expected = { executed: 0, ignored: 100 };
|
||||
var expected = { writesExecuted: 0, writesIgnored: 100 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn INSERT d IN @@cn OPTIONS { ignoreErrors: true }", { "@cn": cn1 });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -609,11 +609,11 @@ function ahuacatlInsertSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testInsertIgnore2 : function () {
|
||||
var expected = { executed: 1, ignored: 50 };
|
||||
var expected = { writesExecuted: 1, writesIgnored: 50 };
|
||||
var actual = getModifyQueryResults("FOR i IN 50..100 INSERT { _key: CONCAT('test', TO_STRING(i)) } IN @@cn OPTIONS { ignoreErrors: true }", { "@cn": cn1 });
|
||||
|
||||
assertEqual(101, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -621,11 +621,11 @@ function ahuacatlInsertSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testInsertIgnore3 : function () {
|
||||
var expected = { executed: 51, ignored: 50 };
|
||||
var expected = { writesExecuted: 51, writesIgnored: 50 };
|
||||
var actual = getModifyQueryResults("FOR i IN 0..100 INSERT { _key: CONCAT('test', TO_STRING(i)) } IN @@cn OPTIONS { ignoreErrors: true }", { "@cn": cn2 });
|
||||
|
||||
assertEqual(101, c2.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -633,11 +633,11 @@ function ahuacatlInsertSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testInsertIgnore4 : function () {
|
||||
var expected = { executed: 0, ignored: 100 };
|
||||
var expected = { writesExecuted: 0, writesIgnored: 100 };
|
||||
var actual = getModifyQueryResults("FOR i IN 0..99 INSERT { _key: CONCAT('test', TO_STRING(i)) } IN @@cn OPTIONS { ignoreErrors: true }", { "@cn": cn1 });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -645,11 +645,11 @@ function ahuacatlInsertSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testInsertIgnore5 : function () {
|
||||
var expected = { executed: 50, ignored: 50 };
|
||||
var expected = { writesExecuted: 50, writesIgnored: 50 };
|
||||
var actual = getModifyQueryResults("FOR i IN 0..99 INSERT { _key: CONCAT('test', TO_STRING(i)) } IN @@cn OPTIONS { ignoreErrors: true }", { "@cn": cn2 });
|
||||
|
||||
assertEqual(100, c2.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -657,11 +657,11 @@ function ahuacatlInsertSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testInsertEmpty : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn INSERT { } IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(200, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -669,12 +669,12 @@ function ahuacatlInsertSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testInsertCopy : function () {
|
||||
var expected = { executed: 50, ignored: 0 };
|
||||
var expected = { writesExecuted: 50, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR i IN 50..99 INSERT { _key: CONCAT('test', TO_STRING(i)) } IN @@cn", { "@cn": cn2 });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(100, c2.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -682,12 +682,12 @@ function ahuacatlInsertSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testSingle : function () {
|
||||
var expected = { executed: 1, ignored: 0 };
|
||||
var expected = { writesExecuted: 1, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("INSERT { value: 'foobar', _key: 'test' } IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(101, c1.count());
|
||||
assertEqual("foobar", c1.document("test").value);
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -695,11 +695,11 @@ function ahuacatlInsertSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testInsertWaitForSync : function () {
|
||||
var expected = { executed: 50, ignored: 0 };
|
||||
var expected = { writesExecuted: 50, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR i IN 1..50 INSERT { value: i } INTO @@cn OPTIONS { waitForSync: true }", { "@cn": cn2 });
|
||||
|
||||
assertEqual(100, c1.count());
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -766,10 +766,10 @@ function ahuacatlInsertSuite () {
|
|||
db._drop("UnitTestsAhuacatlEdge");
|
||||
var edge = db._createEdgeCollection("UnitTestsAhuacatlEdge");
|
||||
|
||||
var expected = { executed: 50, ignored: 0 };
|
||||
var expected = { writesExecuted: 50, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR i IN 1..50 INSERT { _key: CONCAT('test', TO_STRING(i)), _from: CONCAT('UnitTestsAhuacatlInsert1/', TO_STRING(i)), _to: CONCAT('UnitTestsAhuacatlInsert2/', TO_STRING(i)), value: [ i ], sub: { foo: 'bar' } } INTO @@cn", { "@cn": edge.name() });
|
||||
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
assertEqual(50, edge.count());
|
||||
|
||||
for (var i = 1; i <= 50; ++i) {
|
||||
|
|
@ -831,10 +831,10 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testUpdateNothing : function () {
|
||||
var expected = { executed: 0, ignored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN " + cn1 + " FILTER d.value1 < 0 UPDATE { foxx: true } IN " + cn1);
|
||||
var expected = { writesExecuted: 0, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN " + cn1 + " FILTER d.value1 < 0 UPDATE { foxx: true } IN " + cn1, {});
|
||||
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -842,10 +842,10 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testUpdateNothingBind : function () {
|
||||
var expected = { executed: 0, ignored: 0 };
|
||||
var expected = { writesExecuted: 0, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn FILTER d.value1 < 0 UPDATE { foxx: true } IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -896,10 +896,10 @@ function ahuacatlUpdateSuite () {
|
|||
|
||||
testUpdateIgnore1 : function () {
|
||||
c1.ensureUniqueConstraint("value3");
|
||||
var expected = { executed: 1, ignored: 99 };
|
||||
var expected = { writesExecuted: 1, writesIgnored: 99 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn UPDATE d WITH { value3: 1 } IN @@cn OPTIONS { ignoreErrors: true }", { "@cn": cn1 });
|
||||
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -908,10 +908,10 @@ function ahuacatlUpdateSuite () {
|
|||
|
||||
testUpdateIgnore2 : function () {
|
||||
c1.ensureUniqueConstraint("value1");
|
||||
var expected = { executed: 0, ignored: 51 };
|
||||
var expected = { writesExecuted: 0, writesIgnored: 51 };
|
||||
var actual = getModifyQueryResults("FOR i IN 50..100 UPDATE { _key: CONCAT('test', TO_STRING(i)), value1: 1 } IN @@cn OPTIONS { ignoreErrors: true }", { "@cn": cn1 });
|
||||
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -919,10 +919,10 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testUpdateEmpty1 : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn UPDATE { _key: d._key } IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
var doc = c1.document("test" + i);
|
||||
assertEqual(i, doc.value1);
|
||||
|
|
@ -935,10 +935,10 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testUpdateEmpty2 : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn UPDATE d IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
var doc = c1.document("test" + i);
|
||||
assertEqual(i, doc.value1);
|
||||
|
|
@ -959,11 +959,11 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testSingle : function () {
|
||||
var expected = { executed: 1, ignored: 0 };
|
||||
var expected = { writesExecuted: 1, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("UPDATE { value: 'foobar', _key: 'test17' } IN @@cn", { "@cn": cn1 });
|
||||
|
||||
assertEqual("foobar", c1.document("test17").value);
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
},
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -971,9 +971,9 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testUpdateOldValue : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn UPDATE { _key: d._key, value1: d.value2, value2: d.value1, value3: d.value1 + 5 } IN @@cn", { "@cn": cn1 });
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
var doc = c1.document("test" + i);
|
||||
|
|
@ -988,9 +988,9 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testUpdateWaitForSync : function () {
|
||||
var expected = { executed: 50, ignored: 0 };
|
||||
var expected = { writesExecuted: 50, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR i IN 1..50 UPDATE { _key: CONCAT('test', TO_STRING(i)) } INTO @@cn OPTIONS { waitForSync: true }", { "@cn": cn1 });
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
var doc = c1.document("test" + i);
|
||||
|
|
@ -1004,9 +1004,9 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testUpdateKeepNullDefault : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn UPDATE d._key WITH { value1: null, value3: 'foobar', value9: null } INTO @@cn", { "@cn": cn1 });
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
var doc = c1.document("test" + i);
|
||||
|
|
@ -1022,9 +1022,9 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testUpdateKeepNullTrue : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn UPDATE d._key WITH { value1: null, value3: 'foobar', value9: null } INTO @@cn OPTIONS { keepNull: true }", { "@cn": cn1 });
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
var doc = c1.document("test" + i);
|
||||
|
|
@ -1040,9 +1040,9 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testUpdateKeepNullFalse : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn UPDATE d._key WITH { value1: null, value3: 'foobar', value9: null } INTO @@cn OPTIONS { keepNull: false }", { "@cn": cn1 });
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
var doc = c1.document("test" + i);
|
||||
|
|
@ -1058,9 +1058,9 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testUpdateFilter : function () {
|
||||
var expected = { executed: 50, ignored: 0 };
|
||||
var expected = { writesExecuted: 50, writesIgnored: 0 };
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn FILTER d.value1 % 2 == 0 UPDATE d._key WITH { value2: 100 } INTO @@cn", { "@cn": cn1 });
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
var doc = c1.document("test" + i);
|
||||
|
|
@ -1078,10 +1078,10 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testUpdateUpdate : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
for (var i = 0; i < 5; ++i) {
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn UPDATE d._key WITH { counter: HAS(d, 'counter') ? d.counter + 1 : 1 } INTO @@cn", { "@cn": cn1 });
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
}
|
||||
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
|
|
@ -1095,10 +1095,10 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testReplace1 : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
for (var i = 0; i < 5; ++i) {
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn REPLACE d._key WITH { value4: 12 } INTO @@cn", { "@cn": cn1 });
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
}
|
||||
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
|
|
@ -1115,10 +1115,10 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testReplace2 : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
for (var i = 0; i < 5; ++i) {
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn REPLACE { _key: d._key, value4: 13 } INTO @@cn", { "@cn": cn1 });
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
}
|
||||
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
|
|
@ -1135,10 +1135,10 @@ function ahuacatlUpdateSuite () {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
testReplaceReplace : function () {
|
||||
var expected = { executed: 100, ignored: 0 };
|
||||
var expected = { writesExecuted: 100, writesIgnored: 0 };
|
||||
for (var i = 0; i < 5; ++i) {
|
||||
var actual = getModifyQueryResults("FOR d IN @@cn REPLACE d._key WITH { value1: d.value1 + 1 } INTO @@cn", { "@cn": cn1 });
|
||||
assertEqual(expected, actual.operations);
|
||||
assertEqual(expected, actual);
|
||||
}
|
||||
|
||||
for (var i = 0; i < 100; ++i) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue