Fixed all lint errors (vesoft-inc#109)

close vesoft-inc#86
tong-hao · Jan 18, 2019 · c06b682 · c06b682
1 parent db2300b
commit c06b682
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 39 deletions.
diff --git a/src/console/NebulaConsole.cpp b/src/console/NebulaConsole.cpp
@@ -16,7 +16,7 @@ DEFINE_string(password, "", "Password used to authenticate");
 int main(int argc, char *argv[]) {
     folly::init(&argc, &argv, true);
 
-    using namespace nebula::graph;
+    using nebula::graph::CliManager;
 
     CliManager cli;
     if (!cli.connect(FLAGS_addr, FLAGS_port, FLAGS_username, FLAGS_password)) {

diff --git a/src/meta/HostManager.h b/src/meta/HostManager.h
@@ -60,7 +60,7 @@ class HostManager final {
     }
 
 private:
-    HostManager(GraphSpaceID space) : space_(space) {}
+    explicit HostManager(GraphSpaceID space) : space_(space) {}
 
 private:
     static std::unordered_map<GraphSpaceID, std::shared_ptr<HostManager>> hostManagers_;

diff --git a/src/raftex/Host.cpp b/src/raftex/Host.cpp
@@ -22,8 +22,8 @@ DEFINE_uint32(max_outstanding_requests, 1024,
 namespace nebula {
 namespace raftex {
 
-using namespace nebula::network;
-using namespace nebula::thrift;
+using nebula::network::NetworkUtils;
+using nebula::thrift::ThriftClientManager;
 
 Host::Host(const HostAddr& addr, std::shared_ptr<RaftPart> part)
         : part_(std::move(part))
@@ -194,7 +194,7 @@ folly::Future<cpp2::AppendLogResponse> Host::appendLogsInternal(
         }
 
         cpp2::AppendLogResponse resp = std::move(t).value();
-        switch(resp.get_error_code()) {
+        switch (resp.get_error_code()) {
             case cpp2::ErrorCode::SUCCEEDED: {
                 VLOG(2) << self->idStr_
                         << "AppendLog request sent successfully";

diff --git a/src/raftex/RaftPart.cpp b/src/raftex/RaftPart.cpp
@@ -32,16 +32,17 @@ DEFINE_uint32(max_batch_size, 256, "The max number of logs in a batch");
 namespace nebula {
 namespace raftex {
 
-using namespace nebula::network;
-using namespace nebula::thrift;
-using namespace nebula::thread;
-using namespace nebula::wal;
+using nebula::network::NetworkUtils;
+using nebula::thrift::ThriftClientManager;
+using nebula::wal::FileBasedWal;
+using nebula::wal::FileBasedWalPolicy;
+using nebula::wal::BufferFlusher;
 
 class AppendLogsIterator final : public LogIterator {
 public:
     AppendLogsIterator(LogID firstLogId,
                        RaftPart::LogCache logs,
-                       std::function<std::string (const std::string&)> casCB)
+                       std::function<std::string(const std::string&)> casCB)
             : firstLogId_(firstLogId)
             , logId_(firstLogId)
             , logs_(std::move(logs))
@@ -164,7 +165,7 @@ class AppendLogsIterator final : public LogIterator {
     LogID firstLogId_;
     LogID logId_;
     RaftPart::LogCache logs_;
-    std::function<std::string (const std::string&)> casCB_;
+    std::function<std::string(const std::string&)> casCB_;
 };
 
 
@@ -265,13 +266,13 @@ void RaftPart::stop() {
         status_ = Status::STOPPED;
 
         hosts = std::move(peerHosts_);
-        for (auto& h: *hosts) {
+        for (auto& h : *hosts) {
             h.second->stop();
         }
         VLOG(2) << idStr_ << "Invoked stop() on all peer hosts";
     }
 
-    for (auto& h: *hosts) {
+    for (auto& h : *hosts) {
         VLOG(2) << idStr_ << "Waiting " << h.second->idStr() << " to stop";
         h.second->waitForStop();
         VLOG(2) << idStr_ << h.second->idStr() << "has stopped";
@@ -451,7 +452,7 @@ RaftPart::replicateLogs(
         LogID committedId,
         TermID prevLogTerm,
         LogID prevLogId) {
-    using namespace folly;
+    using namespace folly;  // NOLINT since the fancy overload of | operator
 
     decltype(peerHosts_) hosts;
     {
@@ -725,8 +726,7 @@ typename RaftPart::Role RaftPart::processElectionResponses(
 
 bool RaftPart::leaderElection() {
     VLOG(2) << idStr_ << "Start leader election...";
-    using namespace apache::thrift;
-    using namespace folly;
+    using namespace folly;  // NOLINT since the fancy overload of | operator
 
     cpp2::AskForVoteRequest voteReq;
     if (!prepareElectionRequest(voteReq)) {
@@ -1153,7 +1153,7 @@ cpp2::ErrorCode RaftPart::verifyLeader(
 
 
 folly::Future<RaftPart::AppendLogResult> RaftPart::sendHeartbeat() {
-    using namespace folly;
+    using namespace folly;  // NOLINT since the fancy overload of | operator
 
     VLOG(2) << idStr_ << "Sending heartbeat to all other hosts";
 
@@ -1237,7 +1237,7 @@ folly::Future<RaftPart::AppendLogResult> RaftPart::sendHeartbeat() {
                 CHECK(self->replicatingLogs_);
                 if (self->logs_.size() > 0) {
                     // continue to replicate the logs
-                    self->sendingPromise_= std::move(self->cachingPromise_);
+                    self->sendingPromise_ = std::move(self->cachingPromise_);
                     self->cachingPromise_.reset();
                     std::swap(swappedOutLogs, self->logs_);
                     firstId = lastLogId_ + 1;

diff --git a/src/raftex/RaftPart.h b/src/raftex/RaftPart.h
@@ -17,7 +17,7 @@
 namespace folly {
 class IOThreadPoolExecutor;
 class EventBase;
-}  // namespace folly;
+}  // namespace folly
 
 namespace nebula {
 

diff --git a/src/raftex/RaftexService.cpp b/src/raftex/RaftexService.cpp
@@ -12,8 +12,6 @@
 namespace nebula {
 namespace raftex {
 
-using namespace folly;
-
 /*******************************************************
  *
  * Implementation of RaftexService

diff --git a/src/raftex/test/LeaderElectionTest.cpp b/src/raftex/test/LeaderElectionTest.cpp
@@ -112,7 +112,8 @@ int main(int argc, char** argv) {
     folly::init(&argc, &argv, true);
     google::SetStderrLogging(google::INFO);
 
-    using namespace nebula::raftex;
+    // `flusher' is extern-declared in RaftexTestBase.h, defined in RaftexTestBase.cpp
+    using nebula::raftex::flusher;
     flusher = std::make_unique<nebula::wal::BufferFlusher>();
 
     return RUN_ALL_TESTS();

diff --git a/src/raftex/test/LogAppendTest.cpp b/src/raftex/test/LogAppendTest.cpp
@@ -152,7 +152,8 @@ int main(int argc, char** argv) {
     folly::init(&argc, &argv, true);
     google::SetStderrLogging(google::INFO);
 
-    using namespace nebula::raftex;
+    // `flusher' is extern-declared in RaftexTestBase.h, defined in RaftexTestBase.cpp
+    using nebula::raftex::flusher;
     flusher = std::make_unique<nebula::wal::BufferFlusher>();
 
     return RUN_ALL_TESTS();

diff --git a/src/raftex/test/LogCASTest.cpp b/src/raftex/test/LogCASTest.cpp
@@ -318,7 +318,8 @@ int main(int argc, char** argv) {
     folly::init(&argc, &argv, true);
     google::SetStderrLogging(google::INFO);
 
-    using namespace nebula::raftex;
+    // `flusher' is extern-declared in RaftexTestBase.h, defined in RaftexTestBase.cpp
+    using nebula::raftex::flusher;
     flusher = std::make_unique<nebula::wal::BufferFlusher>();
 
     return RUN_ALL_TESTS();

diff --git a/src/raftex/test/RaftexTestBase.cpp b/src/raftex/test/RaftexTestBase.cpp
@@ -13,9 +13,9 @@
 namespace nebula {
 namespace raftex {
 
-using namespace network;
-using namespace fs;
-using namespace wal;
+using network::NetworkUtils;
+using fs::FileUtils;
+using wal::BufferFlusher;
 
 std::unique_ptr<BufferFlusher> flusher;
 

diff --git a/src/raftex/test/RaftexTestBase.h b/src/raftex/test/RaftexTestBase.h
@@ -78,7 +78,7 @@ void checkLeadership(std::vector<std::shared_ptr<test::TestShard>>& copies,
 
 class RaftexTestFixture : public ::testing::Test {
 public:
-    RaftexTestFixture(const std::string& testName)
+    explicit RaftexTestFixture(const std::string& testName)
         : testName_(testName) {}
     ~RaftexTestFixture() = default;
 

diff --git a/src/raftex/test/TestShard.cpp b/src/raftex/test/TestShard.cpp
@@ -22,9 +22,9 @@ TestShard::TestShard(size_t idx,
                      wal::BufferFlusher* flusher,
                      std::shared_ptr<folly::IOThreadPoolExecutor> ioPool,
                      std::shared_ptr<thread::GenericThreadPool> workers,
-                     std::function<void (size_t idx, const char*, TermID)>
+                     std::function<void(size_t idx, const char*, TermID)>
                         leadershipLostCB,
-                     std::function<void (size_t idx, const char*, TermID)>
+                     std::function<void(size_t idx, const char*, TermID)>
                         becomeLeaderCB)
         : RaftPart(1,   // clusterId
                    1,   // spaceId

diff --git a/src/raftex/test/TestShard.h b/src/raftex/test/TestShard.h
@@ -28,9 +28,9 @@ class TestShard : public RaftPart {
         wal::BufferFlusher* flusher,
         std::shared_ptr<folly::IOThreadPoolExecutor> ioPool,
         std::shared_ptr<thread::GenericThreadPool> workers,
-        std::function<void (size_t idx, const char*, TermID)>
+        std::function<void(size_t idx, const char*, TermID)>
             leadershipLostCB,
-        std::function<void (size_t idx, const char*, TermID)>
+        std::function<void(size_t idx, const char*, TermID)>
             becomeLeaderCB);
 
     std::shared_ptr<RaftexService> getService() const {
@@ -56,9 +56,9 @@ class TestShard : public RaftPart {
 
     std::unordered_map<LogID, std::string> data_;
 
-    std::function<void (size_t idx, const char*, TermID)>
+    std::function<void(size_t idx, const char*, TermID)>
         leadershipLostCB_;
-    std::function<void (size_t idx, const char*, TermID)>
+    std::function<void(size_t idx, const char*, TermID)>
         becomeLeaderCB_;
 };
 

diff --git a/src/storage/CompactionFilter.h b/src/storage/CompactionFilter.h
@@ -32,7 +32,7 @@ class NebulaCompactionFilter final : public rocksdb::CompactionFilter {
         return false;
     }
 
-    const char* Name() const override { 
+    const char* Name() const override {
         return "NebulaCompactionFilter";
     }
 };

diff --git a/src/storage/QueryBaseProcessor.inl b/src/storage/QueryBaseProcessor.inl
@@ -16,7 +16,7 @@ namespace storage {
 template<typename REQ, typename RESP>
 bool QueryBaseProcessor<REQ, RESP>::validOperation(cpp2::SupportedType vType,
                                               cpp2::StatType statType) {
-    switch(statType) {
+    switch (statType) {
         case cpp2::StatType::SUM:
         case cpp2::StatType::AVG: {
             return vType == cpp2::SupportedType::INT
@@ -43,7 +43,7 @@ void QueryBaseProcessor<REQ, RESP>::collectProps(
     for (auto& prop : props) {
         const auto& name = prop.prop_.get_name();
         VLOG(3) << "collect " << name;
-        switch(prop.type_.type) {
+        switch (prop.type_.type) {
             case cpp2::SupportedType::INT: {
                 int64_t v;
                 auto ret = reader.getInt<int64_t>(name, v);
@@ -78,8 +78,8 @@ void QueryBaseProcessor<REQ, RESP>::collectProps(
                 VLOG(1) << "Unsupport stats!";
                 break;
             }
-        } // switch
-    } // for
+        }  // switch
+    }  // for
 }
 
 template<typename REQ, typename RESP>