From d623d1a0aba7f97e4024911c7b763891e2e62c6d Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 6 Aug 2014 09:42:06 +0200 Subject: [PATCH 1/2] renamed things --- arangod/Aql/ExecutionNode.cpp | 10 +++++----- arangod/Aql/ExecutionNode.h | 16 ++++++++-------- arangod/Aql/ExecutionPlan.cpp | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arangod/Aql/ExecutionNode.cpp b/arangod/Aql/ExecutionNode.cpp index 418e0cb6bf..a6afa34e53 100644 --- a/arangod/Aql/ExecutionNode.cpp +++ b/arangod/Aql/ExecutionNode.cpp @@ -380,16 +380,16 @@ void SortNode::toJsonHelper (std::map& indexTab, } // ----------------------------------------------------------------------------- -// --SECTION-- methods of AggregateOnUnSortedNode +// --SECTION-- methods of AggregateNode // ----------------------------------------------------------------------------- //////////////////////////////////////////////////////////////////////////////// -/// @brief toJson, for AggregateOnUnSortedNode +/// @brief toJson, for AggregateNode //////////////////////////////////////////////////////////////////////////////// -void AggregateOnUnsortedNode::toJsonHelper (std::map& indexTab, - triagens::basics::Json& nodes, - TRI_memory_zone_t* zone) { +void AggregateNode::toJsonHelper (std::map& indexTab, + triagens::basics::Json& nodes, + TRI_memory_zone_t* zone) { Json json(ExecutionNode::toJsonHelperGeneric(indexTab, nodes, zone)); // call base class method if (json.isEmpty()) { return; diff --git a/arangod/Aql/ExecutionNode.h b/arangod/Aql/ExecutionNode.h index 5e39542996..2b041fe73b 100644 --- a/arangod/Aql/ExecutionNode.h +++ b/arangod/Aql/ExecutionNode.h @@ -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 AggregateOnUnsortedBlock; + friend class AggregateBlock; //////////////////////////////////////////////////////////////////////////////// /// @brief constructor @@ -1023,8 +1023,8 @@ namespace triagens { public: - AggregateOnUnsortedNode (std::vector> aggregateVariables, - Variable const* outVariable) + AggregateNode (std::vector> aggregateVariables, + Variable const* outVariable) : ExecutionNode(), _aggregateVariables(aggregateVariables), _outVariable(outVariable) { } @@ -1041,7 +1041,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// virtual std::string getTypeString () const { - return std::string("AggregateOnUnsortedNode"); + return std::string("AggregateNode"); } //////////////////////////////////////////////////////////////////////////////// @@ -1057,7 +1057,7 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// virtual ExecutionNode* clone () const { - auto c = new AggregateOnUnsortedNode(_aggregateVariables, _outVariable); + auto c = new AggregateNode(_aggregateVariables, _outVariable); cloneDependencies(c); return static_cast(c); } diff --git a/arangod/Aql/ExecutionPlan.cpp b/arangod/Aql/ExecutionPlan.cpp index 463b101d2e..bfd75b0be7 100644 --- a/arangod/Aql/ExecutionPlan.cpp +++ b/arangod/Aql/ExecutionPlan.cpp @@ -414,7 +414,7 @@ ExecutionNode* ExecutionPlan::fromNodeCollect (Ast const* ast, outVariable = static_cast(v->getData()); } - auto en = addNode(new AggregateOnUnsortedNode(aggregateVariables, outVariable)); + auto en = addNode(new AggregateNode(aggregateVariables, outVariable)); return addDependency(previous, en); } From ac7b47c0b74ac9ac8c230222c88179aeae2a3293 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 6 Aug 2014 09:42:36 +0200 Subject: [PATCH 2/2] nullptr --- lib/V8/v8-globals.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/V8/v8-globals.cpp b/lib/V8/v8-globals.cpp index e894903bfa..70c7bb7699 100644 --- a/lib/V8/v8-globals.cpp +++ b/lib/V8/v8-globals.cpp @@ -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* v8g = (TRI_v8_global_t*) isolate->GetData(); - if (v8g == 0) { + if (v8g == nullptr) { v8g = new TRI_v8_global_t(isolate); isolate->SetData(v8g); }