fix: vertex and edge iterators with no filters, do not go through the…

… while linked list of edges Fixed issue #1626
ArcadeData · Jun 8, 2024 · 09d1b9e · 09d1b9e
1 parent d272bc4
commit 09d1b9e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/engine/src/main/java/com/arcadedb/graph/EdgeIterator.java b/engine/src/main/java/com/arcadedb/graph/EdgeIterator.java
@@ -45,14 +45,17 @@ public boolean hasNext() {
     if (currentContainer == null)
       return false;
 
-    if (currentPosition.get() < currentContainer.getUsed())
-      return true;
+    while (true) {
+      if (currentPosition.get() < currentContainer.getUsed())
+        return true;
+
+      currentContainer = currentContainer.getPrevious();
+      if (currentContainer == null)
+        break;
 
-    currentContainer = currentContainer.getPrevious();
-    if (currentContainer != null) {
       currentPosition.set(MutableEdgeSegment.CONTENT_START_POSITION);
-      return currentPosition.get() < currentContainer.getUsed();
     }
+
     return false;
   }
 

diff --git a/engine/src/main/java/com/arcadedb/graph/VertexIterator.java b/engine/src/main/java/com/arcadedb/graph/VertexIterator.java
@@ -34,14 +34,17 @@ public boolean hasNext() {
     if (currentContainer == null)
       return false;
 
-    if (currentPosition.get() < currentContainer.getUsed())
-      return true;
+    while (true) {
+      if (currentPosition.get() < currentContainer.getUsed())
+        return true;
+
+      currentContainer = currentContainer.getPrevious();
+      if (currentContainer == null)
+        break;
 
-    currentContainer = currentContainer.getPrevious();
-    if (currentContainer != null) {
       currentPosition.set(MutableEdgeSegment.CONTENT_START_POSITION);
-      return currentPosition.get() < currentContainer.getUsed();
     }
+
     return false;
   }