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

Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types

This commit is contained in:
jsteemann 2016-09-07 10:01:49 +02:00
parent 2e8aef676b f80b36b6ff
commit 98dc073774
5 changed files with 109 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CHANGELOG
View File

@ -63,7 +63,20 @@ devel
* bug in RAFT implementation of reads. dethroned leader still answered
requests in isolation
v3.0.6 (XXXX-XX-XX)
v3.0.8 (XXXX-XX-XX)
-------------------
* fixed issue #2039
v3.0.7 (2016-09-05)
-------------------
* new supervision job handles db server failure during collection creation.
v3.0.6 (2016-09-02)
-------------------
* fixed issue #2026

9
arangod/Aql/AstNode.cpp
View File

@ -2197,6 +2197,15 @@ void AstNode::stringify(arangodb::basics::StringBuffer* buffer, bool verbose,
return;
}
if (type == NODE_TYPE_OPERATOR_TERNARY) {
getMember(0)->stringify(buffer, verbose, failIfLong);
buffer->appendChar('?');
getMember(1)->stringify(buffer, verbose, failIfLong);
buffer->appendChar(':');
getMember(2)->stringify(buffer, verbose, failIfLong);
return;
}
if (type == NODE_TYPE_RANGE) {
// not used by V8
TRI_ASSERT(numMembers() == 2);

5
arangod/Aql/OptimizerRules.cpp
View File

@ -1463,10 +1463,11 @@ void arangodb::aql::removeRedundantCalculationsRule(
continue;
}
std::string const compareExpression(buffer.c_str(), buffer.length());
bool const isEqual = (buffer.length() == referenceExpression.size() &&
memcmp(buffer.c_str(), referenceExpression.c_str(), buffer.length()) == 0);
buffer.reset();
if (compareExpression == referenceExpression) {
if (isEqual) {
// expressions are identical
auto outvars = current->getVariablesSetHere();
TRI_ASSERT(outvars.size() == 1);

7
arangod/Aql/SortNode.cpp
View File

@ -162,7 +162,12 @@ SortInformation SortNode::getSortInformation(
break;
}
expression->stringify(buffer);
try {
expression->stringify(buffer);
} catch (...) {
result.isValid = false;
return result;
}
result.criteria.emplace_back(
std::make_tuple(const_cast<ExecutionNode const*>(setter), std::string(buffer->c_str(), buffer->length()), (*it).second));
buffer->reset();

81
js/server/tests/aql/aql-ternary.js
View File

@ -31,10 +31,7 @@
var jsunity = require("jsunity");
var helper = require("@arangodb/aql-helper");
var getQueryResults = helper.getQueryResults;
////////////////////////////////////////////////////////////////////////////////
/// @brief test suite
////////////////////////////////////////////////////////////////////////////////
var db = require("@arangodb").db;
function ahuacatlTernaryTestSuite () {
@ -63,6 +60,9 @@ function ahuacatlTernaryTestSuite () {
var actual = getQueryResults("RETURN 1 > 0 ? 2 : -1");
assertEqual(expected, actual);
actual = getQueryResults("RETURN NOOPT(1 > 0 ? 2 : -1)");
assertEqual(expected, actual);
},
////////////////////////////////////////////////////////////////////////////////
@ -74,6 +74,9 @@ function ahuacatlTernaryTestSuite () {
var actual = getQueryResults("RETURN 15 > 15 ? 1 : -1");
assertEqual(expected, actual);
actual = getQueryResults("RETURN NOOPT(15 > 15 ? 1 : -1)");
assertEqual(expected, actual);
},
////////////////////////////////////////////////////////////////////////////////
@ -85,6 +88,9 @@ function ahuacatlTernaryTestSuite () {
var actual = getQueryResults("RETURN 10 + 5 > 15 ? 1 : -1");
assertEqual(expected, actual);
actual = getQueryResults("RETURN NOOPT(10 + 5 > 15 ? 1 : -1)");
assertEqual(expected, actual);
},
////////////////////////////////////////////////////////////////////////////////
@ -96,6 +102,9 @@ function ahuacatlTernaryTestSuite () {
var actual = getQueryResults("RETURN true ? true ? true ? 1 : -1 : -2 : 3");
assertEqual(expected, actual);
actual = getQueryResults("RETURN NOOPT(true ? true ? true ? 1 : -1 : -2 : 3)");
assertEqual(expected, actual);
},
////////////////////////////////////////////////////////////////////////////////
@ -107,6 +116,9 @@ function ahuacatlTernaryTestSuite () {
var actual = getQueryResults("RETURN false ? true ? true ? 1 : -1 : -2 : 3");
assertEqual(expected, actual);
actual = getQueryResults("RETURN NOOPT(false ? true ? true ? 1 : -1 : -2 : 3)");
assertEqual(expected, actual);
},
////////////////////////////////////////////////////////////////////////////////
@ -118,6 +130,9 @@ function ahuacatlTernaryTestSuite () {
var actual = getQueryResults("RETURN true ? false ? true ? 1 : -1 : -2 : 3");
assertEqual(expected, actual);
actual = getQueryResults("RETURN NOOPT(true ? false ? true ? 1 : -1 : -2 : 3)");
assertEqual(expected, actual);
},
////////////////////////////////////////////////////////////////////////////////
@ -129,6 +144,9 @@ function ahuacatlTernaryTestSuite () {
var actual = getQueryResults("RETURN true ? true ? false ? 1 : -1 : -2 : 3");
assertEqual(expected, actual);
actual = getQueryResults("RETURN NOOPT(true ? true ? false ? 1 : -1 : -2 : 3)");
assertEqual(expected, actual);
},
////////////////////////////////////////////////////////////////////////////////
@ -140,6 +158,9 @@ function ahuacatlTernaryTestSuite () {
var actual = getQueryResults("LET a = 1, b = 2, c = 3 RETURN true ? a : b");
assertEqual(expected, actual);
actual = getQueryResults("LET a = 1, b = 2, c = 3 RETURN NOOPT(true ? a : b)");
assertEqual(expected, actual);
},
////////////////////////////////////////////////////////////////////////////////
@ -151,6 +172,9 @@ function ahuacatlTernaryTestSuite () {
var actual = getQueryResults("LET a = 1, b = 2, c = 3 RETURN false ? a : b");
assertEqual(expected, actual);
actual = getQueryResults("LET a = 1, b = 2, c = 3 RETURN NOOPT(false ? a : b)");
assertEqual(expected, actual);
},
////////////////////////////////////////////////////////////////////////////////
@ -162,6 +186,9 @@ function ahuacatlTernaryTestSuite () {
var actual = getQueryResults("LET a = 1, b = 2, c = 3 RETURN true ? false ? a : b : c");
assertEqual(expected, actual);
actual = getQueryResults("LET a = 1, b = 2, c = 3 RETURN NOOPT(true ? false ? a : b : c)");
assertEqual(expected, actual);
},
////////////////////////////////////////////////////////////////////////////////
@ -181,16 +208,62 @@ function ahuacatlTernaryTestSuite () {
assertEqual([ 2 ], getQueryResults("RETURN [ ] ? 2 : 3"));
assertEqual([ 2 ], getQueryResults("RETURN [ 0 ] ? 2 : 3"));
assertEqual([ 2 ], getQueryResults("RETURN { } ? 2 : 3"));
assertEqual([ 2 ], getQueryResults("RETURN NOOPT(1 ? 2 : 3)"));
assertEqual([ 3 ], getQueryResults("RETURN NOOPT(0 ? 2 : 3)"));
assertEqual([ 3 ], getQueryResults("RETURN NOOPT(null ? 2 : 3)"));
assertEqual([ 3 ], getQueryResults("RETURN NOOPT(false ? 2 : 3)"));
assertEqual([ 2 ], getQueryResults("RETURN NOOPT(true ? 2 : 3)"));
assertEqual([ 2 ], getQueryResults("RETURN NOOPT((4) ? 2 : 3)"));
assertEqual([ 2 ], getQueryResults("RETURN NOOPT((4 - 3) ? 2 : 3)"));
assertEqual([ 2 ], getQueryResults("RETURN NOOPT(\"true\" ? 2 : 3)"));
assertEqual([ 3 ], getQueryResults("RETURN NOOPT(\"\" ? 2 : 3)"));
assertEqual([ 2 ], getQueryResults("RETURN NOOPT([ ] ? 2 : 3)"));
assertEqual([ 2 ], getQueryResults("RETURN NOOPT([ 0 ] ? 2 : 3)"));
assertEqual([ 2 ], getQueryResults("RETURN NOOPT({ } ? 2 : 3)"));
}
};
}
////////////////////////////////////////////////////////////////////////////////
/// @brief test suite
////////////////////////////////////////////////////////////////////////////////
function ahuacatlTernaryCollectionTestSuite () {
var c = null;
var cn = "UnittestsAhuacatlTernary";
return {
setUp : function () {
db._drop(cn);
c = db._create(cn);
for (var i = 0; i < 100; ++i) {
c.insert({value:i});
}
},
tearDown : function () {
db._drop(cn);
},
testTernarySimple : function () {
// this mainly tests if stringification of the ternary works...
var query = "FOR i IN 1..10 LET v = i == 333 ? 2 : 3 FOR j IN " + cn + " FILTER j._id == v RETURN 1";
var actual = getQueryResults(query);
assertEqual([], actual);
}
};
}
////////////////////////////////////////////////////////////////////////////////
/// @brief executes the test suite
////////////////////////////////////////////////////////////////////////////////
jsunity.run(ahuacatlTernaryTestSuite);
jsunity.run(ahuacatlTernaryCollectionTestSuite);
return jsunity.done();