fix match shortestPath find loop (vesoft-inc#5738)

fix shortestPath find loop
jievince · Oct 16, 2023 · 496cfb0 · 496cfb0
1 parent 213dfa0
commit 496cfb0
Show file tree

Hide file tree

Showing 6 changed files with 387 additions and 311 deletions.
diff --git a/src/graph/executor/algo/BatchShortestPath.cpp b/src/graph/executor/algo/BatchShortestPath.cpp
@@ -87,9 +87,7 @@ size_t BatchShortestPath::init(const HashSet& startVids, const HashSet& endVids)
       std::unordered_multimap<StartVid, std::pair<EndVid, bool>> terminationMap;
       for (auto& _startVid : _startVids) {
         for (auto& _endVid : _endVids) {
-          if (_startVid != _endVid) {
-            terminationMap.emplace(_startVid, std::make_pair(_endVid, true));
-          }
+          terminationMap.emplace(_startVid, std::make_pair(_endVid, true));
         }
       }
       terminationMaps_.emplace_back(std::move(terminationMap));
@@ -401,6 +399,9 @@ folly::Future<bool> BatchShortestPath::conjunctPath(size_t rowNum, bool oddStep)
       }
       auto& rightPaths = findCommonVid->second;
       for (const auto& srcPaths : leftPathMap.second) {
+        if (srcPaths.second.empty()) {
+          continue;
+        }
         auto range = terminationMap.equal_range(srcPaths.first);
         if (range.first == range.second) {
           continue;
@@ -440,6 +441,9 @@ void BatchShortestPath::doConjunctPath(const std::vector<CustomPath>& leftPaths,
   auto& resultDs = resultDs_[rowNum];
   if (rightPaths.empty()) {
     for (const auto& leftPath : leftPaths) {
+      if (hasSameEdge(leftPath.values)) {
+        continue;
+      }
       auto forwardPath = leftPath.values;
       auto src = forwardPath.front();
       forwardPath.erase(forwardPath.begin());
@@ -467,6 +471,9 @@ void BatchShortestPath::doConjunctPath(const std::vector<CustomPath>& leftPaths,
                          std::make_move_iterator(backwardPath.end()));
       auto dst = forwardPath.back();
       forwardPath.pop_back();
+      if (hasSameEdge(forwardPath)) {
+        continue;
+      }
       Row row;
       row.emplace_back(std::move(src));
       row.emplace_back(List(std::move(forwardPath)));

diff --git a/src/graph/executor/algo/ShortestPathBase.cpp b/src/graph/executor/algo/ShortestPathBase.cpp
@@ -48,6 +48,19 @@ folly::Future<std::vector<Value>> ShortestPathBase::getMeetVidsProps(
       });
 }
 
+bool ShortestPathBase::hasSameEdge(const std::vector<Value>& values) {
+  for (size_t i = 0; i < values.size(); ++i) {
+    if (values[i].isEdge()) {
+      for (size_t j = i + 1; j < values.size(); ++j) {
+        if (values[j].isEdge() && values[j].getEdge() == values[i].getEdge()) {
+          return true;
+        }
+      }
+    }
+  }
+  return false;
+}
+
 std::vector<Value> ShortestPathBase::handlePropResp(PropRpcResponse&& resps) {
   std::vector<Value> vertices;
   auto result = handleCompleteness(resps, FLAGS_accept_partial_success);

diff --git a/src/graph/executor/algo/ShortestPathBase.h b/src/graph/executor/algo/ShortestPathBase.h
@@ -53,6 +53,8 @@ class ShortestPathBase {
 
   void addStats(PropRpcResponse& resp, int64_t timeInUSec) const;
 
+  bool hasSameEdge(const std::vector<Value>& values);
+
   folly::Executor* runner() const;
 
   template <typename Resp>

diff --git a/src/graph/executor/algo/SingleShortestPath.cpp b/src/graph/executor/algo/SingleShortestPath.cpp
@@ -252,6 +252,9 @@ void SingleShortestPath::buildOddPath(size_t rowNum, const std::vector<Value>& m
         Row path = leftPath;
         auto& steps = path.values.back().mutableList().values;
         steps.insert(steps.end(), rightPath.values.begin(), rightPath.values.end() - 1);
+        if (hasSameEdge(steps)) {
+          continue;
+        }
         path.emplace_back(rightPath.values.back());
         resultDs_[rowNum].rows.emplace_back(std::move(path));
         if (singleShortest_) {
@@ -285,6 +288,9 @@ folly::Future<bool> SingleShortestPath::buildEvenPath(size_t rowNum,
           auto& steps = path.values.back().mutableList().values;
           steps.emplace_back(meetVertex);
           steps.insert(steps.end(), rightPath.values.begin(), rightPath.values.end() - 1);
+          if (hasSameEdge(steps)) {
+            continue;
+          }
           path.emplace_back(rightPath.values.back());
           resultDs_[rowNum].rows.emplace_back(std::move(path));
           if (singleShortest_) {