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-08-06 12:51:29 +02:00
parent b068fa92ed ac7b47c0b7
commit 52710f15cd
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arangod/Aql/ExecutionNode.cpp
View File

@ -380,16 +380,16 @@ void SortNode::toJsonHelper (std::map<ExecutionNode*, int>& indexTab,
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- methods of AggregateOnUnSortedNode // --SECTION-- methods of AggregateNode
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief toJson, for AggregateOnUnSortedNode /// @brief toJson, for AggregateNode
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void AggregateOnUnsortedNode::toJsonHelper (std::map<ExecutionNode*, int>& indexTab, void AggregateNode::toJsonHelper (std::map<ExecutionNode*, int>& indexTab,
triagens::basics::Json& nodes, triagens::basics::Json& nodes,
TRI_memory_zone_t* zone) { TRI_memory_zone_t* zone) {
Json json(ExecutionNode::toJsonHelperGeneric(indexTab, nodes, zone)); // call base class method Json json(ExecutionNode::toJsonHelperGeneric(indexTab, nodes, zone)); // call base class method
if (json.isEmpty()) { if (json.isEmpty()) {
return; return;

16
arangod/Aql/ExecutionNode.h
View File

@ -1005,17 +1005,17 @@ namespace triagens {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- class AggregateOnUnsortedNode // --SECTION-- class AggregateNode
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief class AggregateOnUnsortedNode, derived from ExecutionNode /// @brief class AggregateNode, derived from ExecutionNode
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
class AggregateOnUnsortedNode : public ExecutionNode { class AggregateNode : public ExecutionNode {
friend class ExecutionBlock; friend class ExecutionBlock;
friend class AggregateOnUnsortedBlock; friend class AggregateBlock;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief constructor /// @brief constructor
@ -1023,8 +1023,8 @@ namespace triagens {
public: public:
AggregateOnUnsortedNode (std::vector<std::pair<Variable const*, Variable const*>> aggregateVariables, AggregateNode (std::vector<std::pair<Variable const*, Variable const*>> aggregateVariables,
Variable const* outVariable) Variable const* outVariable)
: ExecutionNode(), _aggregateVariables(aggregateVariables), _outVariable(outVariable) { : ExecutionNode(), _aggregateVariables(aggregateVariables), _outVariable(outVariable) {
} }
@ -1041,7 +1041,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
virtual std::string getTypeString () const { virtual std::string getTypeString () const {
return std::string("AggregateOnUnsortedNode"); return std::string("AggregateNode");
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1057,7 +1057,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
virtual ExecutionNode* clone () const { virtual ExecutionNode* clone () const {
auto c = new AggregateOnUnsortedNode(_aggregateVariables, _outVariable); auto c = new AggregateNode(_aggregateVariables, _outVariable);
cloneDependencies(c); cloneDependencies(c);
return static_cast<ExecutionNode*>(c); return static_cast<ExecutionNode*>(c);
} }

2
arangod/Aql/ExecutionPlan.cpp
View File

@ -414,7 +414,7 @@ ExecutionNode* ExecutionPlan::fromNodeCollect (Ast const* ast,
outVariable = static_cast<Variable*>(v->getData()); outVariable = static_cast<Variable*>(v->getData());
} }
auto en = addNode(new AggregateOnUnsortedNode(aggregateVariables, outVariable)); auto en = addNode(new AggregateNode(aggregateVariables, outVariable));
return addDependency(previous, en); return addDependency(previous, en);
} }

2
lib/V8/v8-globals.cpp
View File

@ -219,7 +219,7 @@ TRI_v8_global_s::~TRI_v8_global_s () {
TRI_v8_global_t* TRI_CreateV8Globals(v8::Isolate* isolate) { TRI_v8_global_t* TRI_CreateV8Globals(v8::Isolate* isolate) {
TRI_v8_global_t* v8g = (TRI_v8_global_t*) isolate->GetData(); TRI_v8_global_t* v8g = (TRI_v8_global_t*) isolate->GetData();
if (v8g == 0) { if (v8g == nullptr) {
v8g = new TRI_v8_global_t(isolate); v8g = new TRI_v8_global_t(isolate);
isolate->SetData(v8g); isolate->SetData(v8g);
} }