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

Minor style fixes

This commit is contained in:
Michael Hackstein 2015-11-17 10:35:32 +01:00
parent 3845f8b7eb
commit 2d9f466f38
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arangod/Aql/TraversalConditionFinder.cpp
View File

@ -34,8 +34,8 @@
using namespace triagens::aql; using namespace triagens::aql;
using EN = triagens::aql::ExecutionNode; using EN = triagens::aql::ExecutionNode;
bool checkPathVariableAccessFeasible(CalculationNode const* cn, bool checkPathVariableAccessFeasible (CalculationNode const* cn,
TraversalNode * tn, TraversalNode* tn,
Variable const* var, Variable const* var,
bool &conditionIsImpossible, bool &conditionIsImpossible,
Ast* ast) { Ast* ast) {
@ -88,8 +88,8 @@ bool checkPathVariableAccessFeasible(CalculationNode const* cn,
} }
// OR? don't know howto continue. // OR? don't know howto continue.
AstNode const * compareNode = nullptr; AstNode const* compareNode = nullptr;
AstNode const * accessNodeBranch = nullptr; AstNode const* accessNodeBranch = nullptr;
for (auto oneNode : onePath) { for (auto oneNode : onePath) {
if (oneNode->type == NODE_TYPE_OPERATOR_BINARY_OR) { if (oneNode->type == NODE_TYPE_OPERATOR_BINARY_OR) {
return false; return false;
@ -135,7 +135,7 @@ bool checkPathVariableAccessFeasible(CalculationNode const* cn,
firstRefNode->changeMember(0, varRefNode); firstRefNode->changeMember(0, varRefNode);
tn->storeSimpleExpression(isEdgeAccess, tn->storeSimpleExpression(isEdgeAccess,
attrAccessTo, attrAccessTo,
NODE_TYPE_OPERATOR_BINARY_EQ, compareNode->type,
newNode, newNode,
filterByNode); filterByNode);

10
arangod/Aql/TraversalNode.cpp
View File

@ -32,7 +32,7 @@ using namespace std;
using namespace triagens::basics; using namespace triagens::basics;
using namespace triagens::aql; using namespace triagens::aql;
void TraversalNode::simpleTravererExpression::toJson(triagens::basics::Json& json, void TraversalNode::simpleTravererExpression::toJson (triagens::basics::Json& json,
TRI_memory_zone_t* zone) const TRI_memory_zone_t* zone) const
{ {
auto op = AstNode::Operators.find(comparisonType); auto op = AstNode::Operators.find(comparisonType);
@ -322,10 +322,10 @@ void TraversalNode::toJsonHelper (triagens::basics::Json& nodes,
json("pathOutVariable", pathOutVariable()->toJson()); json("pathOutVariable", pathOutVariable()->toJson());
} }
if (expressions.size() > 0) { if (_expressions.size() > 0) {
triagens::basics::Json expressionArray = triagens::basics::Json(triagens::basics::Json::Array, triagens::basics::Json expressionArray = triagens::basics::Json(triagens::basics::Json::Array,
expressions.size()); _expressions.size());
for (auto x : expressions) { for (auto x : _expressions) {
triagens::basics::Json exp(zone, triagens::basics::Json::Object); triagens::basics::Json exp(zone, triagens::basics::Json::Object);
x.toJson(exp, zone); x.toJson(exp, zone);
expressionArray(exp); expressionArray(exp);
@ -432,7 +432,7 @@ void TraversalNode::storeSimpleExpression(bool isEdgeAccess,
comparisonType, comparisonType,
varAccess, varAccess,
compareTo}; compareTo};
expressions.emplace_back(e); _expressions.emplace_back(e);
} }

4
arangod/Aql/TraversalNode.h
View File

@ -56,7 +56,7 @@ namespace triagens {
AstNode const* varAccess; AstNode const* varAccess;
AstNode const* compareTo; AstNode const* compareTo;
void toJson(triagens::basics::Json& json, void toJson (triagens::basics::Json& json,
TRI_memory_zone_t* zone) const; TRI_memory_zone_t* zone) const;
}; };
@ -447,7 +447,7 @@ namespace triagens {
/// @brief store a simple comparator filter /// @brief store a simple comparator filter
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
std::vector<simpleTravererExpression> expressions; std::vector<simpleTravererExpression> _expressions;
}; };
} // namespace triagens::aql } // namespace triagens::aql