add lock (#4352)

vesoft-inc · Jun 24, 2022 · b01fdd3 · b01fdd3
1 parent c258cc0
commit b01fdd3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/src/graph/executor/algo/BatchShortestPath.cpp b/src/graph/executor/algo/BatchShortestPath.cpp
@@ -135,7 +135,7 @@ folly::Future<Status> BatchShortestPath::getNeighbors(size_t rowNum, size_t step
                      nullptr)
       .via(qctx_->rctx()->runner())
       .thenValue([this, rowNum, reverse, stepNum, getNbrTime](auto&& resp) {
-        addStats(resp, stats_, stepNum, getNbrTime.elapsedInUSec(), reverse);
+        addStats(resp, stepNum, getNbrTime.elapsedInUSec(), reverse);
         return buildPath(rowNum, std::move(resp), reverse);
       });
 }

diff --git a/src/graph/executor/algo/ShortestPathBase.cpp b/src/graph/executor/algo/ShortestPathBase.cpp
@@ -38,7 +38,7 @@ folly::Future<std::vector<Value>> ShortestPathBase::getMeetVidsProps(
                  nullptr)
       .via(qctx_->rctx()->runner())
       .thenValue([this, getPropsTime](PropRpcResponse&& resp) {
-        addStats(resp, stats_, getPropsTime.elapsedInUSec());
+        addStats(resp, getPropsTime.elapsedInUSec());
         return handlePropResp(std::move(resp));
       });
 }
@@ -168,7 +168,6 @@ Status ShortestPathBase::handleErrorCode(nebula::cpp2::ErrorCode code, Partition
 }
 
 void ShortestPathBase::addStats(RpcResponse& resp,
-                                std::unordered_map<std::string, std::string>* stats,
                                 size_t stepNum,
                                 int64_t timeInUSec,
                                 bool reverse) const {
@@ -193,15 +192,17 @@ void ShortestPathBase::addStats(RpcResponse& resp,
   }
   ss << "\n}";
   if (reverse) {
-    stats->emplace(folly::sformat("reverse step {}", stepNum), ss.str());
+    statsLock_.lock();
+    stats_->emplace(folly::sformat("reverse step {}", stepNum), ss.str());
+    statsLock_.unlock();
   } else {
-    stats->emplace(folly::sformat("step {}", stepNum), ss.str());
+    statsLock_.lock();
+    stats_->emplace(folly::sformat("step {}", stepNum), ss.str());
+    statsLock_.unlock();
   }
 }
 
-void ShortestPathBase::addStats(PropRpcResponse& resp,
-                                std::unordered_map<std::string, std::string>* stats,
-                                int64_t timeInUSec) const {
+void ShortestPathBase::addStats(PropRpcResponse& resp, int64_t timeInUSec) const {
   auto& hostLatency = resp.hostLatency();
   std::stringstream ss;
   ss << "{\n";
@@ -217,7 +218,7 @@ void ShortestPathBase::addStats(PropRpcResponse& resp,
     ss << "\n}";
   }
   ss << "\n}";
-  stats->emplace(folly::sformat("get_prop "), ss.str());
+  stats_->emplace(folly::sformat("get_prop "), ss.str());
 }
 
 }  // namespace graph

diff --git a/src/graph/executor/algo/ShortestPathBase.h b/src/graph/executor/algo/ShortestPathBase.h
@@ -43,15 +43,9 @@ class ShortestPathBase {
 
   Status handleErrorCode(nebula::cpp2::ErrorCode code, PartitionID partId) const;
 
-  void addStats(RpcResponse& resp,
-                std::unordered_map<std::string, std::string>* stats,
-                size_t stepNum,
-                int64_t timeInUSec,
-                bool reverse) const;
+  void addStats(RpcResponse& resp, size_t stepNum, int64_t timeInUSec, bool reverse) const;
 
-  void addStats(PropRpcResponse& resp,
-                std::unordered_map<std::string, std::string>* stats,
-                int64_t timeInUSec) const;
+  void addStats(PropRpcResponse& resp, int64_t timeInUSec) const;
 
   template <typename Resp>
   StatusOr<Result::State> handleCompleteness(const storage::StorageRpcResponse<Resp>& rpcResp,
@@ -86,6 +80,7 @@ class ShortestPathBase {
   std::unordered_map<std::string, std::string>* stats_{nullptr};
   size_t maxStep_;
   bool singleShortest_{true};
+  folly::SpinLock statsLock_;
 
   std::vector<DataSet> resultDs_;
   std::vector<DataSet> leftVids_;

diff --git a/src/graph/executor/algo/SingleShortestPath.cpp b/src/graph/executor/algo/SingleShortestPath.cpp
@@ -108,7 +108,7 @@ folly::Future<Status> SingleShortestPath::getNeighbors(size_t rowNum,
                      nullptr)
       .via(qctx_->rctx()->runner())
       .thenValue([this, rowNum, stepNum, getNbrTime, reverse](auto&& resp) {
-        addStats(resp, stats_, stepNum, getNbrTime.elapsedInUSec(), reverse);
+        addStats(resp, stepNum, getNbrTime.elapsedInUSec(), reverse);
         return buildPath(rowNum, std::move(resp), reverse);
       });
 }
@@ -264,6 +264,9 @@ folly::Future<bool> SingleShortestPath::buildEvenPath(size_t rowNum,
       return false;
     }
     for (auto& meetVertex : vertices) {
+      if (!meetVertex.isVertex()) {
+        continue;
+      }
       auto meetVid = meetVertex.getVertex().vid;
       auto leftPaths = createLeftPath(rowNum, meetVid);
       auto rightPaths = createRightPath(rowNum, meetVid, false);