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

cppcheck

This commit is contained in:
jsteemann 2016-08-25 14:04:23 +02:00
parent 667dc8af49
commit c6efe26198
13 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/Agency/AgencyCommon.h
View File

@ -63,7 +63,7 @@ struct read_ret_t {
std::string redirect; ///< @brief If not accepted redirect id std::string redirect; ///< @brief If not accepted redirect id
std::vector<bool> success; ///< @brief Query's precond OK std::vector<bool> success; ///< @brief Query's precond OK
query_t result; ///< @brief Query result query_t result; ///< @brief Query result
read_ret_t(bool a, std::string id, std::vector<bool> suc = std::vector<bool>(), read_ret_t(bool a, std::string const& id, std::vector<bool> const& suc = std::vector<bool>(),
query_t res = nullptr) query_t res = nullptr)
: accepted(a), redirect(id), success(suc), result(res) {} : accepted(a), redirect(id), success(suc), result(res) {}
}; };
@ -76,8 +76,8 @@ struct write_ret_t {
std::vector<bool> applied; std::vector<bool> applied;
std::vector<index_t> indices; // Indices of log entries (if any) to wait for std::vector<index_t> indices; // Indices of log entries (if any) to wait for
write_ret_t() : accepted(false), redirect("") {} write_ret_t() : accepted(false), redirect("") {}
write_ret_t(bool a, std::string id) : accepted(a), redirect(id) {} write_ret_t(bool a, std::string const& id) : accepted(a), redirect(id) {}
write_ret_t(bool a, std::string id, std::vector<bool> const& app, write_ret_t(bool a, std::string const& id, std::vector<bool> const& app,
std::vector<index_t> const& idx) std::vector<index_t> const& idx)
: accepted(a), redirect(id), applied(app), indices(idx) {} : accepted(a), redirect(id), applied(app), indices(idx) {}
}; };

2
arangod/Agency/NotifyCallback.cpp
View File

@ -25,7 +25,7 @@
using namespace arangodb::consensus; using namespace arangodb::consensus;
NotifyCallback::NotifyCallback(std::function<void(bool)> cb) : _cb(cb) {} NotifyCallback::NotifyCallback(std::function<void(bool)> const& cb) : _cb(cb) {}
bool NotifyCallback::operator()(arangodb::ClusterCommResult* res) { bool NotifyCallback::operator()(arangodb::ClusterCommResult* res) {
_cb(res->status == CL_COMM_SENT && res->result->getHttpReturnCode() == 200); _cb(res->status == CL_COMM_SENT && res->result->getHttpReturnCode() == 200);

2
arangod/Agency/NotifyCallback.h
View File

@ -34,7 +34,7 @@ namespace consensus {
class NotifyCallback : public arangodb::ClusterCommCallback { class NotifyCallback : public arangodb::ClusterCommCallback {
public: public:
explicit NotifyCallback(std::function<void(bool)>); explicit NotifyCallback(std::function<void(bool)> const&);
virtual bool operator()(arangodb::ClusterCommResult*) override final; virtual bool operator()(arangodb::ClusterCommResult*) override final;

4
arangod/Agency/Supervision.h
View File

@ -63,13 +63,13 @@ class Supervision : public arangodb::Thread {
}; };
struct VitalSign { struct VitalSign {
VitalSign(ServerStatus s, ServerTimestamp t) VitalSign(ServerStatus const& s, ServerTimestamp const& t)
: myTimestamp(std::chrono::system_clock::now()), : myTimestamp(std::chrono::system_clock::now()),
serverStatus(s), serverStatus(s),
serverTimestamp(t), serverTimestamp(t),
jobId("0") {} jobId("0") {}
void update(ServerStatus s, ServerTimestamp t) { void update(ServerStatus const& s, ServerTimestamp const& t) {
myTimestamp = std::chrono::system_clock::now(); myTimestamp = std::chrono::system_clock::now();
serverStatus = s; serverStatus = s;
serverTimestamp = t; serverTimestamp = t;

4
arangod/Aql/Optimizer.h
View File

@ -218,7 +218,7 @@ class Optimizer {
Rule() = delete; Rule() = delete;
Rule(std::string const& name, RuleFunction func, RuleLevel level, Rule(std::string const& name, RuleFunction const& func, RuleLevel level,
bool canCreateAdditionalPlans, bool canBeDisabled, bool isHidden) bool canCreateAdditionalPlans, bool canBeDisabled, bool isHidden)
: name(name), : name(name),
func(func), func(func),
@ -435,7 +435,7 @@ class Optimizer {
} }
/// @brief register a hidden rule /// @brief register a hidden rule
static void registerHiddenRule(std::string const& name, RuleFunction func, static void registerHiddenRule(std::string const& name, RuleFunction const& func,
RuleLevel level, bool canCreateAdditionalPlans, bool canBeDisabled) { RuleLevel level, bool canCreateAdditionalPlans, bool canBeDisabled) {
registerRule(name, func, level, canCreateAdditionalPlans, canBeDisabled, true); registerRule(name, func, level, canCreateAdditionalPlans, canBeDisabled, true);
} }

2
arangod/Aql/ShortestPathNode.cpp
View File

@ -160,7 +160,7 @@ ShortestPathNode::ShortestPathNode(ExecutionPlan* plan, size_t id,
ShortestPathNode::ShortestPathNode(ExecutionPlan* plan, size_t id, ShortestPathNode::ShortestPathNode(ExecutionPlan* plan, size_t id,
TRI_vocbase_t* vocbase, TRI_vocbase_t* vocbase,
std::vector<std::string> const& edgeColls, std::vector<std::string> const& edgeColls,
std::vector<TRI_edge_direction_e> directions, std::vector<TRI_edge_direction_e> const& directions,
Variable const* inStartVariable, Variable const* inStartVariable,
std::string const& startVertexId, std::string const& startVertexId,
Variable const* inTargetVariable, Variable const* inTargetVariable,

2
arangod/Aql/ShortestPathNode.h
View File

@ -56,7 +56,7 @@ class ShortestPathNode : public ExecutionNode {
private: private:
ShortestPathNode(ExecutionPlan* plan, size_t id, TRI_vocbase_t* vocbase, ShortestPathNode(ExecutionPlan* plan, size_t id, TRI_vocbase_t* vocbase,
std::vector<std::string> const& edgeColls, std::vector<std::string> const& edgeColls,
std::vector<TRI_edge_direction_e> directions, std::vector<TRI_edge_direction_e> const& directions,
Variable const* inStartVariable, Variable const* inStartVariable,
std::string const& startVertexId, std::string const& startVertexId,
Variable const* inTargetVariable, Variable const* inTargetVariable,

2
arangod/Aql/TraversalNode.cpp
View File

@ -251,7 +251,7 @@ TraversalNode::TraversalNode(ExecutionPlan* plan, size_t id,
TraversalNode::TraversalNode( TraversalNode::TraversalNode(
ExecutionPlan* plan, size_t id, TRI_vocbase_t* vocbase, ExecutionPlan* plan, size_t id, TRI_vocbase_t* vocbase,
std::vector<std::string> const& edgeColls, Variable const* inVariable, std::vector<std::string> const& edgeColls, Variable const* inVariable,
std::string const& vertexId, std::vector<TRI_edge_direction_e> directions, std::string const& vertexId, std::vector<TRI_edge_direction_e> const& directions,
uint64_t minDepth, uint64_t maxDepth, TraversalOptions const& options) uint64_t minDepth, uint64_t maxDepth, TraversalOptions const& options)
: ExecutionNode(plan, id), : ExecutionNode(plan, id),
_vocbase(vocbase), _vocbase(vocbase),

2
arangod/Aql/TraversalNode.h
View File

@ -84,7 +84,7 @@ class TraversalNode : public ExecutionNode {
TraversalNode(ExecutionPlan* plan, size_t id, TRI_vocbase_t* vocbase, TraversalNode(ExecutionPlan* plan, size_t id, TRI_vocbase_t* vocbase,
std::vector<std::string> const& edgeColls, std::vector<std::string> const& edgeColls,
Variable const* inVariable, std::string const& vertexId, Variable const* inVariable, std::string const& vertexId,
std::vector<TRI_edge_direction_e> directions, uint64_t minDepth, std::vector<TRI_edge_direction_e> const& directions, uint64_t minDepth,
uint64_t maxDepth, TraversalOptions const& options); uint64_t maxDepth, TraversalOptions const& options);
public: public:

2
arangod/Cluster/ClusterTraverser.h
View File

@ -39,7 +39,7 @@ class ClusterTraverser final : public Traverser {
public: public:
ClusterTraverser( ClusterTraverser(
std::vector<std::string> edgeCollections, TraverserOptions& opts, std::vector<std::string> const& edgeCollections, TraverserOptions& opts,
std::string const& dbname, Transaction* trx) std::string const& dbname, Transaction* trx)
: Traverser(opts), : Traverser(opts),
_edgeCols(edgeCollections), _edgeCols(edgeCollections),

2
arangod/Indexes/SkiplistIndex.h
View File

@ -253,7 +253,7 @@ class SkiplistIterator2 : public IndexIterator {
SkiplistIterator2( SkiplistIterator2(
TRI_Skiplist const* skiplist, TRI_Skiplist const* skiplist,
std::function<int(TRI_index_element_t const*, TRI_index_element_t const*, std::function<int(TRI_index_element_t const*, TRI_index_element_t const*,
arangodb::basics::SkipListCmpType)> CmpElmElm, arangodb::basics::SkipListCmpType)> const& CmpElmElm,
bool reverse, BaseSkiplistLookupBuilder* builder) bool reverse, BaseSkiplistLookupBuilder* builder)
: _skiplistIndex(skiplist), : _skiplistIndex(skiplist),
_reverse(reverse), _reverse(reverse),

12
arangod/VocBase/Ditch.cpp
View File

@ -85,7 +85,7 @@ CompactionDitch::~CompactionDitch() {}
DropDatafileDitch::DropDatafileDitch( DropDatafileDitch::DropDatafileDitch(
Ditches* ditches, TRI_datafile_t* datafile, LogicalCollection* collection, Ditches* ditches, TRI_datafile_t* datafile, LogicalCollection* collection,
std::function<void(TRI_datafile_t*, LogicalCollection*)> callback, char const* filename, std::function<void(TRI_datafile_t*, LogicalCollection*)> const& callback, char const* filename,
int line) int line)
: Ditch(ditches, filename, line), : Ditch(ditches, filename, line),
_datafile(datafile), _datafile(datafile),
@ -96,7 +96,7 @@ DropDatafileDitch::~DropDatafileDitch() {}
RenameDatafileDitch::RenameDatafileDitch( RenameDatafileDitch::RenameDatafileDitch(
Ditches* ditches, TRI_datafile_t* datafile, void* data, Ditches* ditches, TRI_datafile_t* datafile, void* data,
std::function<void(TRI_datafile_t*, void*)> callback, char const* filename, std::function<void(TRI_datafile_t*, void*)> const& callback, char const* filename,
int line) int line)
: Ditch(ditches, filename, line), : Ditch(ditches, filename, line),
_datafile(datafile), _datafile(datafile),
@ -107,7 +107,7 @@ RenameDatafileDitch::~RenameDatafileDitch() {}
UnloadCollectionDitch::UnloadCollectionDitch( UnloadCollectionDitch::UnloadCollectionDitch(
Ditches* ditches, LogicalCollection* collection, Ditches* ditches, LogicalCollection* collection,
std::function<bool(LogicalCollection*)> callback, std::function<bool(LogicalCollection*)> const& callback,
char const* filename, int line) char const* filename, int line)
: Ditch(ditches, filename, line), : Ditch(ditches, filename, line),
_collection(collection), _collection(collection),
@ -417,7 +417,7 @@ CompactionDitch* Ditches::createCompactionDitch(char const* filename,
DropDatafileDitch* Ditches::createDropDatafileDitch( DropDatafileDitch* Ditches::createDropDatafileDitch(
TRI_datafile_t* datafile, LogicalCollection* collection, TRI_datafile_t* datafile, LogicalCollection* collection,
std::function<void(struct TRI_datafile_t*, LogicalCollection*)> callback, std::function<void(struct TRI_datafile_t*, LogicalCollection*)> const& callback,
char const* filename, int line) { char const* filename, int line) {
try { try {
auto ditch = auto ditch =
@ -436,7 +436,7 @@ DropDatafileDitch* Ditches::createDropDatafileDitch(
RenameDatafileDitch* Ditches::createRenameDatafileDitch( RenameDatafileDitch* Ditches::createRenameDatafileDitch(
TRI_datafile_t* datafile, void* data, TRI_datafile_t* datafile, void* data,
std::function<void(struct TRI_datafile_t*, void*)> callback, std::function<void(struct TRI_datafile_t*, void*)> const& callback,
char const* filename, int line) { char const* filename, int line) {
try { try {
auto ditch = auto ditch =
@ -455,7 +455,7 @@ RenameDatafileDitch* Ditches::createRenameDatafileDitch(
UnloadCollectionDitch* Ditches::createUnloadCollectionDitch( UnloadCollectionDitch* Ditches::createUnloadCollectionDitch(
LogicalCollection* collection, LogicalCollection* collection,
std::function<bool(LogicalCollection*)> callback, std::function<bool(LogicalCollection*)> const& callback,
char const* filename, int line) { char const* filename, int line) {
try { try {
auto ditch = new UnloadCollectionDitch(this, collection, callback, auto ditch = new UnloadCollectionDitch(this, collection, callback,

12
arangod/VocBase/Ditch.h
View File

@ -181,7 +181,7 @@ class DropDatafileDitch : public Ditch {
public: public:
DropDatafileDitch(Ditches* ditches, struct TRI_datafile_t* datafile, DropDatafileDitch(Ditches* ditches, struct TRI_datafile_t* datafile,
LogicalCollection* collection, LogicalCollection* collection,
std::function<void(struct TRI_datafile_t*, LogicalCollection*)>, std::function<void(struct TRI_datafile_t*, LogicalCollection*)> const& callback,
char const* filename, int line); char const* filename, int line);
~DropDatafileDitch(); ~DropDatafileDitch();
@ -207,7 +207,7 @@ class RenameDatafileDitch : public Ditch {
public: public:
RenameDatafileDitch(Ditches* ditches, struct TRI_datafile_t* datafile, RenameDatafileDitch(Ditches* ditches, struct TRI_datafile_t* datafile,
void* data, void* data,
std::function<void(struct TRI_datafile_t*, void*)>, std::function<void(struct TRI_datafile_t*, void*)> const& callback,
char const* filename, int line); char const* filename, int line);
~RenameDatafileDitch(); ~RenameDatafileDitch();
@ -233,7 +233,7 @@ class UnloadCollectionDitch : public Ditch {
public: public:
UnloadCollectionDitch( UnloadCollectionDitch(
Ditches* ditches, LogicalCollection* collection, Ditches* ditches, LogicalCollection* collection,
std::function<bool(LogicalCollection*)> callback, std::function<bool(LogicalCollection*)> const& callback,
char const* filename, int line); char const* filename, int line);
~UnloadCollectionDitch(); ~UnloadCollectionDitch();
@ -371,7 +371,7 @@ class Ditches {
DropDatafileDitch* createDropDatafileDitch( DropDatafileDitch* createDropDatafileDitch(
struct TRI_datafile_t* datafile, LogicalCollection* collection, struct TRI_datafile_t* datafile, LogicalCollection* collection,
std::function<void(struct TRI_datafile_t*, LogicalCollection*)> callback, std::function<void(struct TRI_datafile_t*, LogicalCollection*)> const& callback,
char const* filename, int line); char const* filename, int line);
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -380,7 +380,7 @@ class Ditches {
RenameDatafileDitch* createRenameDatafileDitch( RenameDatafileDitch* createRenameDatafileDitch(
struct TRI_datafile_t* datafile, void* data, struct TRI_datafile_t* datafile, void* data,
std::function<void(struct TRI_datafile_t*, void*)> callback, std::function<void(struct TRI_datafile_t*, void*)> const& callback,
char const* filename, int line); char const* filename, int line);
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -389,7 +389,7 @@ class Ditches {
UnloadCollectionDitch* createUnloadCollectionDitch( UnloadCollectionDitch* createUnloadCollectionDitch(
LogicalCollection* collection, LogicalCollection* collection,
std::function<bool(LogicalCollection*)> callback, std::function<bool(LogicalCollection*)> const& callback,
char const* filename, int line); char const* filename, int line);
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////