mirror of https://gitee.com/bigwinds/arangodb
[devel] clear compilation warnings (#8345)
This commit is contained in:
parent
6f9091878c
commit
ee751e8ba3
|
@ -42,7 +42,8 @@ MoveShard::MoveShard(Node const& snapshot, AgentInterface* agent,
|
|||
_from(id(from)),
|
||||
_to(id(to)),
|
||||
_isLeader(isLeader), // will be initialized properly when information known
|
||||
_remainsFollower(remainsFollower) {}
|
||||
_remainsFollower(remainsFollower),
|
||||
_toServerIsFollower(false) {}
|
||||
|
||||
MoveShard::MoveShard(Node const& snapshot, AgentInterface* agent, std::string const& jobId,
|
||||
std::string const& creator, std::string const& database,
|
||||
|
@ -55,11 +56,13 @@ MoveShard::MoveShard(Node const& snapshot, AgentInterface* agent, std::string co
|
|||
_from(id(from)),
|
||||
_to(id(to)),
|
||||
_isLeader(isLeader), // will be initialized properly when information known
|
||||
_remainsFollower(isLeader) {}
|
||||
_remainsFollower(isLeader),
|
||||
_toServerIsFollower(false) {}
|
||||
|
||||
MoveShard::MoveShard(Node const& snapshot, AgentInterface* agent,
|
||||
JOB_STATUS status, std::string const& jobId)
|
||||
: Job(status, snapshot, agent, jobId) {
|
||||
: Job(status, snapshot, agent, jobId),
|
||||
_toServerIsFollower(false) {
|
||||
// Get job details from agency:
|
||||
std::string path = pos[status] + _jobId + "/";
|
||||
auto tmp_database = _snapshot.hasAsString(path + "database");
|
||||
|
|
|
@ -168,6 +168,7 @@ Supervision::Supervision()
|
|||
_okThreshold(5.),
|
||||
_jobId(0),
|
||||
_jobIdMax(0),
|
||||
_haveAborts(false),
|
||||
_selfShutdown(false),
|
||||
_upgraded(false) {}
|
||||
|
||||
|
|
|
@ -150,7 +150,7 @@ class ShortestPathExecutor {
|
|||
|
||||
ShortestPathExecutor() = delete;
|
||||
ShortestPathExecutor(ShortestPathExecutor&&) = default;
|
||||
ShortestPathExecutor(ShortestPathExecutor const&) = default;
|
||||
|
||||
ShortestPathExecutor(Fetcher& fetcher, Infos&);
|
||||
~ShortestPathExecutor();
|
||||
|
||||
|
@ -213,4 +213,4 @@ class ShortestPathExecutor {
|
|||
} // namespace aql
|
||||
} // namespace arangodb
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -39,7 +39,7 @@ class SocketUnixDomain final : public Socket {
|
|||
explicit SocketUnixDomain(rest::GeneralServer::IoContext& context)
|
||||
: Socket(context, false), _socket(context.newDomainSocket()) {}
|
||||
|
||||
SocketUnixDomain(SocketUnixDomain&& that) = default;
|
||||
SocketUnixDomain(SocketUnixDomain&& that) = delete;
|
||||
|
||||
std::string peerAddress() const override { return "local"; }
|
||||
int peerPort() const override { return 0; }
|
||||
|
|
|
@ -470,7 +470,7 @@ Result TailingSyncer::processDocument(TRI_replication_operation_e type,
|
|||
// of the result :-|
|
||||
TRI_ASSERT(type != REPLICATION_MARKER_REMOVE);
|
||||
TRI_ASSERT(!res.errorMessage().empty());
|
||||
conflictDocumentKey = std::move(res.errorMessage());
|
||||
conflictDocumentKey = std::move(res).errorMessage();
|
||||
// restart the while loop above
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -81,13 +81,10 @@ class SupervisedScheduler : public Scheduler {
|
|||
// in a container class and store pointers. -- Maybe there is a better way?
|
||||
boost::lockfree::queue<WorkItem*> _queue[3];
|
||||
|
||||
char _padding1[64];
|
||||
std::atomic<uint64_t> _jobsSubmitted;
|
||||
char _padding2[64];
|
||||
std::atomic<uint64_t> _jobsDequeued;
|
||||
char _padding3[64];
|
||||
std::atomic<uint64_t> _jobsDone;
|
||||
char _padding5[64];
|
||||
// aligning required to prevent false sharing - assumes cache line size is 64
|
||||
alignas(64) std::atomic<uint64_t> _jobsSubmitted;
|
||||
alignas(64) std::atomic<uint64_t> _jobsDequeued;
|
||||
alignas(64) std::atomic<uint64_t> _jobsDone;
|
||||
|
||||
// During a queue operation there a two reasons to manually wake up a worker
|
||||
// 1. the queue length is bigger than _wakeupQueueLength and the last submit time
|
||||
|
@ -96,7 +93,7 @@ class SupervisedScheduler : public Scheduler {
|
|||
//
|
||||
// The last submit time is a thread local variable that stores the time of the last
|
||||
// queue operation.
|
||||
std::atomic<uint64_t> _wakeupQueueLength; // q1
|
||||
alignas(64) std::atomic<uint64_t> _wakeupQueueLength; // q1
|
||||
std::atomic<uint64_t> _wakeupTime_ns, _definitiveWakeupTime_ns; // t3, t4
|
||||
|
||||
// each worker thread has a state block which contains configuration values.
|
||||
|
|
|
@ -176,8 +176,8 @@ SECTION("test_start") {
|
|||
CHECK((nullptr != function));
|
||||
CHECK((entry.second.first == function->arguments));
|
||||
CHECK((
|
||||
entry.second.second == FunctionType::FILTER && arangodb::iresearch::isFilter(*function)
|
||||
|| entry.second.second == FunctionType::SCORER && arangodb::iresearch::isScorer(*function)
|
||||
(entry.second.second == FunctionType::FILTER && arangodb::iresearch::isFilter(*function))
|
||||
|| (entry.second.second == FunctionType::SCORER && arangodb::iresearch::isScorer(*function))
|
||||
));
|
||||
};
|
||||
}
|
||||
|
@ -1091,4 +1091,4 @@ SECTION("test_async") {
|
|||
|
||||
// -----------------------------------------------------------------------------
|
||||
// --SECTION-- END-OF-FILE
|
||||
// -----------------------------------------------------------------------------
|
||||
// -----------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue