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

removed unused functions

This commit is contained in:
Jan Steemann 2015-09-18 16:53:22 +02:00
parent a866927a0c
commit aec802f126
4 changed files with 241 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/Aql/Parser.cpp
View File

@ -50,8 +50,7 @@ Parser::Parser (Query* query)
_offset(0), _offset(0),
_marker(nullptr), _marker(nullptr),
_stack(), _stack(),
_type(AQL_QUERY_READ), _type(AQL_QUERY_READ) {
_writeNode(nullptr) {
_stack.reserve(4); _stack.reserve(4);
} }

24
arangod/Aql/Parser.h
View File

@ -209,24 +209,6 @@ namespace triagens {
AstNode const*, AstNode const*,
AstNode* optionNode); AstNode* optionNode);
////////////////////////////////////////////////////////////////////////////////
/// @brief register the query's data-modification node
////////////////////////////////////////////////////////////////////////////////
void setWriteNode (AstNode* node) {
TRI_ASSERT(_writeNode == nullptr);
TRI_ASSERT(node != nullptr);
_writeNode = node;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief whether or not a write-node was already registered
////////////////////////////////////////////////////////////////////////////////
bool hasWriteNode () const {
return (_writeNode != nullptr);
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief whether or not the query is a data-modification query /// @brief whether or not the query is a data-modification query
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -375,12 +357,6 @@ namespace triagens {
QueryType _type; QueryType _type;
////////////////////////////////////////////////////////////////////////////////
/// @brief the query's data-modification node (if any)
////////////////////////////////////////////////////////////////////////////////
AstNode* _writeNode;
}; };
} }

505
arangod/Aql/grammar.cpp
View File

File diff suppressed because it is too large Load Diff

7
arangod/Aql/grammar.y
View File

@ -594,7 +594,6 @@ remove_statement:
} }
auto node = parser->ast()->createNodeRemove($2, $3, $4); auto node = parser->ast()->createNodeRemove($2, $3, $4);
parser->ast()->addOperation(node); parser->ast()->addOperation(node);
parser->setWriteNode(node);
} }
; ;
@ -605,7 +604,6 @@ insert_statement:
} }
auto node = parser->ast()->createNodeInsert($2, $3, $4); auto node = parser->ast()->createNodeInsert($2, $3, $4);
parser->ast()->addOperation(node); parser->ast()->addOperation(node);
parser->setWriteNode(node);
} }
; ;
@ -617,7 +615,6 @@ update_parameters:
AstNode* node = parser->ast()->createNodeUpdate(nullptr, $1, $2, $3); AstNode* node = parser->ast()->createNodeUpdate(nullptr, $1, $2, $3);
parser->ast()->addOperation(node); parser->ast()->addOperation(node);
parser->setWriteNode(node);
} }
| expression T_WITH expression in_or_into_collection options { | expression T_WITH expression in_or_into_collection options {
if (! parser->configureWriteQuery(AQL_QUERY_UPDATE, $4, $5)) { if (! parser->configureWriteQuery(AQL_QUERY_UPDATE, $4, $5)) {
@ -626,7 +623,6 @@ update_parameters:
AstNode* node = parser->ast()->createNodeUpdate($1, $3, $4, $5); AstNode* node = parser->ast()->createNodeUpdate($1, $3, $4, $5);
parser->ast()->addOperation(node); parser->ast()->addOperation(node);
parser->setWriteNode(node);
} }
; ;
@ -643,7 +639,6 @@ replace_parameters:
AstNode* node = parser->ast()->createNodeReplace(nullptr, $1, $2, $3); AstNode* node = parser->ast()->createNodeReplace(nullptr, $1, $2, $3);
parser->ast()->addOperation(node); parser->ast()->addOperation(node);
parser->setWriteNode(node);
} }
| expression T_WITH expression in_or_into_collection options { | expression T_WITH expression in_or_into_collection options {
if (! parser->configureWriteQuery(AQL_QUERY_REPLACE, $4, $5)) { if (! parser->configureWriteQuery(AQL_QUERY_REPLACE, $4, $5)) {
@ -652,7 +647,6 @@ replace_parameters:
AstNode* node = parser->ast()->createNodeReplace($1, $3, $4, $5); AstNode* node = parser->ast()->createNodeReplace($1, $3, $4, $5);
parser->ast()->addOperation(node); parser->ast()->addOperation(node);
parser->setWriteNode(node);
} }
; ;
@ -718,7 +712,6 @@ upsert_statement:
auto node = parser->ast()->createNodeUpsert(static_cast<AstNodeType>($6), parser->ast()->createNodeReference(TRI_CHAR_LENGTH_PAIR(Variable::NAME_OLD)), $5, $7, $8, $9); auto node = parser->ast()->createNodeUpsert(static_cast<AstNodeType>($6), parser->ast()->createNodeReference(TRI_CHAR_LENGTH_PAIR(Variable::NAME_OLD)), $5, $7, $8, $9);
parser->ast()->addOperation(node); parser->ast()->addOperation(node);
parser->setWriteNode(node);
} }
; ;