8000 remove some containers from common.h (#9223) · reynoldsm88/arangodb@3f603f0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3f603f0

Browse files
ObiWahnjsteemann
ObiWahn
authored and
jsteemann
committed
remove some containers from common.h (arangodb#9223)
* remove some containers from Common.h * enterprise fixes
1 parent b632d58 commit 3f603f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+147
-62
lines changed

‎arangod/Agency/AgencyComm.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <velocypack/Iterator.h>
3535
#include <velocypack/Sink.h>
3636
#include <velocypack/velocypack-aliases.h>
37+
#include <set>
3738

3839
#include "Basics/ReadLocker.h"
3940
#include "Basics/StringBuffer.h"

‎arangod/Agency/AgencyComm.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "Basics/Common.h"
2929

3030
#include <list>
31+
#include <deque>
3132

3233
#include <boost/uuid/uuid.hpp>
3334
#include <boost/uuid/uuid_generators.hpp>

‎arangod/Agency/Store.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "AgentInterface.h"
2828
#include "Basics/ConditionVariable.h"
2929
#include "Node.h"
30+
#include <map>
3031

3132
namespace arangodb {
3233
namespace consensus {

‎arangod/Aql/AqlTransaction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ std::shared_ptr<AqlTransaction> AqlTransaction::create(
4949
#endif
5050
return std::make_shared<AqlTransaction>(transactionContext, collections, options, isMainTransaction);
5151
}
52-
52+
5353
/// @brief add a list of collections to the transaction
5454
Result AqlTransaction::addCollections(std::map<std::string, aql::Collection*> const& collections) {
5555
Result res;

‎arangod/Aql/AqlTransaction.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#include "Transaction/StandaloneContext.h"
3333
#include "VocBase/vocbase.h"
3434

35+
#include <map>
36+
3537
namespace arangodb {
3638
namespace aql {
3739

@@ -70,7 +72,7 @@ class AqlTransaction : public transaction::Methods {
7072
AqlTransaction(std::shared_ptr<transaction::Context> const& transactionContext,
7173
std::map<std::string, aql::Collection*> const* collections,
7274
transaction::Options const& options, bool isMainTransaction);
73-
75+
7476
/// @brief add a collection to the transaction
7577
Result processCollection(aql::Collection*);
7678

‎arangod/Aql/Collections.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#include "Basics/Common.h"
2828
#include "VocBase/AccessMode.h"
2929

30+
#include <map>
31+
3032
struct TRI_vocbase_t;
3133

3234
namespace arangodb {

‎arangod/Aql/DocumentProducingNode.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include <velocypack/Builder.h>
3030
#include <velocypack/Slice.h>
3131

32+
#include <unordered_set>
33+
3234
namespace arangodb {
3335
namespace aql {
3436
class ExecutionPlan;

‎arangod/Aql/EngineInfoContainerDBServer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "Cluster/ClusterInfo.h"
3232
#include "VocBase/AccessMode.h"
3333

34+
#include <set>
3435
#include <stack>
3536
#include <boost/variant.hpp>
3637

‎arangod/Aql/ExecutionStats.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
#include <velocypack/Builder.h>
3030
#include <velocypack/Slice.h>
31+
#include <map>
3132

3233
namespace arangodb {
3334
namespace velocypack {
@@ -63,7 +64,7 @@ struct ExecutionStats {
6364

6465
/// @brief sets query execution time from the outside
6566
void setExecutionTime(double value) { executionTime = value; }
66-
67+
6768
/// @brief sets the peak memory usage from the outside
6869
void setPeakMemoryUsage(size_t value) { peakMemoryUsage = value; }
6970

‎arangod/Aql/ExecutorInfos.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include "Aql/types.h"
3030
#include "Basics/Common.h"
3131

32+
#include <unordered_set>
33+
3234
namespace arangodb {
3335
namespace aql {
3436

0 commit comments

Comments
 (0)
0