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

Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2

This commit is contained in:
Willi Goesgens 2014-09-12 10:41:30 +02:00
parent 9bb0f22b7b 78b3eaeb3a
commit 3894c8393f
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Aql/Query.cpp
View File

@ -113,6 +113,11 @@ Query::~Query () {
_executor = nullptr;
}
if (_ast != nullptr) {
delete _ast;
_ast = nullptr;
}
// free strings
for (auto it = _strings.begin(); it != _strings.end(); ++it) {
TRI_FreeString(TRI_UNKNOWN_MEM_ZONE, const_cast<char*>(*it));

19
arangod/Aql/RangeInfo.h
View File

@ -61,7 +61,9 @@ namespace triagens {
////////////////////////////////////////////////////////////////////////////////
RangeInfoBound (AstNode const* bound, bool include)
: _bound(), _include(include), _defined(false) {
: _bound(),
_include(include),
_defined(false) {
if (bound->type == NODE_TYPE_VALUE) {
_bound = Json(TRI_UNKNOWN_MEM_ZONE,
bound->toJsonValue(TRI_UNKNOWN_MEM_ZONE));
@ -89,12 +91,17 @@ namespace triagens {
}
RangeInfoBound ()
: _bound(), _include(false), _isConstant(false), _defined(false) {
: _bound(),
_include(false),
_isConstant(false),
_defined(false) {
}
RangeInfoBound ( RangeInfoBound const& copy )
: _bound(copy._bound.copy()), _include(copy._include),
_isConstant(copy._isConstant), _defined(copy._defined) {
RangeInfoBound (RangeInfoBound const& copy)
: _bound(copy._bound.copy()),
_include(copy._include),
_isConstant(copy._isConstant),
_defined(copy._defined) {
}
////////////////////////////////////////////////////////////////////////////////
@ -107,7 +114,7 @@ namespace triagens {
/// @brief delete assignment
////////////////////////////////////////////////////////////////////////////////
RangeInfoBound& operator= ( RangeInfoBound const& copy ) = delete;
RangeInfoBound& operator= (RangeInfoBound const& copy) = delete;
////////////////////////////////////////////////////////////////////////////////
/// @brief explicit assign