neighbor search: skip visited nodes

graphsense · Dec 12, 2023 · df91192 · df91192
1 parent 0014475
commit df91192
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/gsrest/service/entities_service.py b/gsrest/service/entities_service.py
@@ -288,7 +288,7 @@ def key_accessor(neighbor):
     result = \
         await bfs(request, entity, key_accessor,
                   list_neighbors, stop_neighbor, match_neighbor,
-                  depth)
+                  depth, skip_visited=True)
 
     async def resolve(neighbor):
         if not with_tag:
@@ -332,14 +332,18 @@ async def bfs(request,
               list_neighbors,
               stop_neighbor,
               match_neighbor,
-              max_depth=3):
+              max_depth=3,
+              skip_visited=True):
 
     # collect matching paths
     matching_paths = []
 
     # maintain a queue of paths
     queue = []
 
+    # visited nodes
+    visited = set()
+
     start = True
 
     # count number of requests
@@ -387,12 +391,13 @@ def retrieve_neighbor(last):
         for neighbors, path in zip(list_of_neighbors, paths):
             for neighbor in neighbors:
 
+                id = key_accessor(neighbor)
                 new_path = list(path)
                 new_path.append(neighbor)
 
                 # found path
                 if match_neighbor(neighbor):
-                    request.app.logger.debug(f"MATCH {key_accessor(neighbor)}")
+                    request.app.logger.debug(f"MATCH {id}")
                     matching_paths.append(new_path)
                     continue
 
@@ -403,9 +408,17 @@ def retrieve_neighbor(last):
 
                 # stop if stop criteria fulfilled
                 if (stop_neighbor(neighbor)):
-                    request.app.logger.debug(f"STOP {key_accessor(neighbor)}")
+                    request.app.logger.debug(f"STOP {id}")
+                    continue
+
+                # stop if node was already visited
+                if id in visited:
+                    request.app.logger.debug(f"ALREADY VISITED {id}")
                     continue
 
+                if skip_visited:
+                    visited.add(id)
+
                 queue.append(new_path)
 
         if len(queue) == 0 or run_time > SEARCH_TIMEOUT: