added early exit to weighted two sided enumerator, yens still missing

arangodb · hkernbach · Jan 23, 2025 · Apr 28, 2025 · May 6, 2025 · May 6, 2025
commit 7a04512db0966d0a37fd77c3947b0aaa77b296cd
diff --git a/arangod/Graph/Enumerators/WeightedTwoSidedEnumerator.cpp b/arangod/Graph/Enumerators/WeightedTwoSidedEnumerator.cpp
@@ -58,7 +58,8 @@ WeightedTwoSidedEnumerator<
     PathValidator>::Ball::Ball(Direction dir, ProviderType&& provider,
                                GraphOptions const& options,
                                PathValidatorOptions validatorOptions,
-                               arangodb::ResourceMonitor& resourceMonitor)
+                               arangodb::ResourceMonitor& resourceMonitor,
+                               WeightedTwoSidedEnumerator& parent)
     : _resourceMonitor(resourceMonitor),
       _interior(resourceMonitor),
       _queue(resourceMonitor),
@@ -67,7 +68,8 @@ WeightedTwoSidedEnumerator<
       _direction(dir),
       _graphOptions(options),
       _diameter(-std::numeric_limits<double>::infinity()),
-      _haveSeenOtherSide(false) {}
+      _haveSeenOtherSide(false),
+      _parent(parent) {}
 
 template<class QueueType, class PathStoreType, class ProviderType,
          class PathValidator>
@@ -254,6 +256,16 @@ auto WeightedTwoSidedEnumerator<QueueType, PathStoreType, ProviderType,
                                 PathValidator>::Ball::
     computeNeighbourhoodOfNextVertex(Ball& other, CandidatesStore& candidates)
         -> void {
+  if (_graphOptions.isKilled()) {
+    // First clear our own instance (Ball)
+    clear();
+    // Then clear the other instance (Ball)
+    other.clear();
+    // Then clear the parent (WeightedTwoSidedEnumerator)
+    _parent.clear();
+    THROW_ARANGO_EXCEPTION(TRI_ERROR_QUERY_KILLED);
+  }
+
   ensureQueueHasProcessableElement();
   auto tmp = _queue.pop();
 
@@ -414,9 +426,9 @@ WeightedTwoSidedEnumerator<QueueType, PathStoreType, ProviderType,
                                arangodb::ResourceMonitor& resourceMonitor)
     : _options(std::move(options)),
       _left{Direction::FORWARD, std::move(forwardProvider), _options,
-            validatorOptions, resourceMonitor},
+            validatorOptions, resourceMonitor, *this},
       _right{Direction::BACKWARD, std::move(backwardProvider), _options,
-             std::move(validatorOptions), resourceMonitor},
+             std::move(validatorOptions), resourceMonitor, *this},
       _resultsCache(_left, _right),
       _resultPath{_left.provider(), _right.provider()} {
   // For now, we only support KShortestPaths searches, since we do not
@@ -466,7 +478,7 @@ void WeightedTwoSidedEnumerator<QueueType, PathStoreType, ProviderType,
 template<class QueueType, class PathStoreType, class ProviderType,
          class PathValidator>
 bool WeightedTwoSidedEnumerator<QueueType, PathStoreType, ProviderType,
-                                PathValidator>::isDone() const {
+                                PathValidator>::isDone() {
   if (!_candidatesStore.isEmpty()) {
     return false;
   }
@@ -861,7 +873,12 @@ WeightedTwoSidedEnumerator<QueueType, PathStoreType, ProviderType,
 template<class QueueType, class PathStoreType, class ProviderType,
          class PathValidator>
 auto WeightedTwoSidedEnumerator<QueueType, PathStoreType, ProviderType,
-                                PathValidator>::searchDone() const -> bool {
+                                PathValidator>::searchDone() -> bool {
+  if (_options.isKilled()) {
+    // Here we're not inside a Ball, so we can clear via main clear method
+    clear();
+    THROW_ARANGO_EXCEPTION(TRI_ERROR_QUERY_KILLED);
+  }
   if ((_left.noPathLeft() && _right.noPathLeft()) || isAlgorithmFinished()) {
     return true;
   }

diff --git a/arangod/Graph/Enumerators/WeightedTwoSidedEnumerator.h b/arangod/Graph/Enumerators/WeightedTwoSidedEnumerator.h
@@ -221,7 +221,8 @@ class WeightedTwoSidedEnumerator {
    public:
     Ball(Direction dir, ProviderType&& provider, GraphOptions const& options,
BDEB         PathValidatorOptions validatorOptions,
-         arangodb::ResourceMonitor& resourceMonitor);
+         arangodb::ResourceMonitor& resourceMonitor,
+         WeightedTwoSidedEnumerator& parent);
     ~Ball();
     auto clear() -> void;
     auto reset(VertexRef center, size_t depth = 0) -> void;
@@ -296,6 +297,11 @@ class WeightedTwoSidedEnumerator {
     GraphOptions _graphOptions;
     double _diameter = -std::numeric_limits<double>::infinity();
     bool _haveSeenOtherSide;
+
+    // Reference to the parent WeightedTwoSidedEnumerator
+    // Intention: To be able to call clear() on the parent
+    // Case: When a kill signal is received
+    WeightedTwoSidedEnumerator& _parent;
   };
   enum BallSearchLocation { LEFT, RIGHT, FINISH };
 
@@ -345,7 +351,7 @@ class WeightedTwoSidedEnumerator {
    * @return true There will be no further path.
    * @return false There is a chance that there is more data available.
    */
-  [[nodiscard]] bool isDone() const;
+  [[nodiscard]] bool isDone();
 
   /**
    * @brief Reset to new source and target vertices.
@@ -410,7 +416,7 @@ class WeightedTwoSidedEnumerator {
     _right.setForbiddenEdges(std::move(forbidden));
   };
 
- private : [[nodiscard]] auto searchDone() const -> bool;
+ private : [[nodiscard]] auto searchDone() -> bool;
   // Ensure that we have fetched all vertices in the _results list. Otherwise,
   // we will not be able to generate the resulting path
   auto fetchResults() -> void;