Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

adjusted failure code names

This commit is contained in:
Jan Steemann 2015-04-16 00:28:41 +02:00
parent ff6e56d89c
commit d3569d5c77
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Aql/ExecutionBlock.cpp
View File

@ -3363,7 +3363,7 @@ int SortedAggregateBlock::getOrSkipSome (size_t atLeast,
try {
// emit last buffered group
if (! skipping) {
TRI_IF_FAILURE("AggregateBlock::getOrSkipSome") {
TRI_IF_FAILURE("SortedAggregateBlock::getOrSkipSome") {
THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
}
@ -3649,7 +3649,7 @@ int HashedAggregateBlock::getOrSkipSome (size_t atLeast,
try {
// emit last buffered group
if (! skipping) {
TRI_IF_FAILURE("HashAggregateBlock::getOrSkipSome") {
TRI_IF_FAILURE("HashedAggregateBlock::getOrSkipSome") {
THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
}
}

17
js/server/tests/aql-failures.js
View File

@ -78,7 +78,7 @@ function ahuacatlFailureSuite () {
/// @brief test failure
////////////////////////////////////////////////////////////////////////////////
testAggregateBlock1 : function () {
testSortedAggregateBlock1 : function () {
internal.debugSetFailAt("AggregatorGroup::addValues");
assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value INTO g RETURN [ key, g ]");
assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value2 INTO g RETURN [ key, g ]");
@ -88,13 +88,24 @@ function ahuacatlFailureSuite () {
/// @brief test failure
////////////////////////////////////////////////////////////////////////////////
testAggregateBlock2 : function () {
internal.debugSetFailAt("AggregateBlock::getOrSkipSome");
testSortedAggregateBlock2 : function () {
internal.debugSetFailAt("SortedAggregateBlock::getOrSkipSome");
assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value INTO g RETURN [ key, g ]");
assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value2 INTO g RETURN [ key, g ]");
assertFailingQuery("FOR i IN 1..10000 COLLECT key = i INTO g RETURN [ key, g ]");
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test failure
////////////////////////////////////////////////////////////////////////////////
testHashedAggregateBlock : function () {
internal.debugSetFailAt("HashedAggregateBlock::getOrSkipSome");
assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value RETURN key");
assertFailingQuery("FOR i IN " + c.name() + " COLLECT key = i.value2 RETURN key");
assertFailingQuery("FOR i IN 1..10000 COLLECT key = i RETURN key");
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test failure
////////////////////////////////////////////////////////////////////////////////