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

16
arangod/Aql/TraversalConditionFinder.cpp
View File

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

12
arangod/Aql/TraversalNode.cpp
View File

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

6
arangod/Aql/TraversalNode.h
View File

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