Merge pull request #58 from microsoft/optimizations

Optimizations

Author: niclasko

flowquery-py/src/graph/data.py

@@ -31,8 +31,12 @@ def next(self) -> bool:
         return False
 
     def clone(self) -> "IndexEntry":
-        """Create a copy of this index entry."""
-        return IndexEntry(list(self._positions))
+        """Create a copy of this index entry.
+
+        Shares the underlying positions list since it is immutable after
+        index construction.  Only the iteration cursor is independent.
+        """
+        return IndexEntry(self._positions)
 
 
 class Layer:

flowquery-py/src/graph/node.py

@@ -83,7 +83,8 @@ def _matches_properties(self, hop: int = 0) -> bool:
                 raise ValueError("No current node data available")
             if key not in record:
                 return False
-            return bool(record[key] == expression.value())
+            if record[key] != expression.value():
+                return False
         return True
 
     def set_value(self, value: Optional[Dict[str, Any]]) -> None:

flowquery-py/src/graph/relationship.py

@@ -81,7 +81,8 @@ def _matches_properties(self, hop: int = 0) -> bool:
                 raise ValueError("No current relationship data available")
             if key not in record:
                 raise ValueError("Relationship does not have property")
-            return bool(record[key] == expression.value())
+            if record[key] != expression.value():
+                return False
         return True
 
     @property

flowquery-py/src/graph/relationship_match_collector.py

@@ -21,6 +21,7 @@ class RelationshipMatchCollector:
     def __init__(self) -> None:
         self._matches: List[RelationshipMatchRecord] = []
         self._node_ids: List[str] = []
+        self._node_id_set: set[str] = set()
 
     def push(self, relationship: 'Relationship', traversal_id: str = "") -> RelationshipMatchRecord:
         """Push a new match onto the collector."""
@@ -42,6 +43,7 @@ def push(self, relationship: 'Relationship', traversal_id: str = "") -> Relation
         }
         self._matches.append(match)
         self._node_ids.append(traversal_id)
+        self._node_id_set.add(traversal_id)
         return match
 
     @property
@@ -61,7 +63,8 @@ def end_node(self, node: 'Node') -> None:
     def pop(self) -> Optional[RelationshipMatchRecord]:
         """Pop the last match from the collector."""
         if self._node_ids:
-            self._node_ids.pop()
+            removed_id = self._node_ids.pop()
+            self._node_id_set.discard(removed_id)
         if self._matches:
             return self._matches.pop()
         return None
@@ -82,4 +85,4 @@ def matches(self) -> List[RelationshipMatchRecord]:
 
     def is_circular(self, next_id: str = "") -> bool:
         """Check if traversing to the given node id would form a cycle."""
-        return next_id in self._node_ids
+        return next_id in self._node_id_set

src/graph/data.ts

@@ -22,7 +22,7 @@ class IndexEntry {
         return false;
     }
     public clone(): IndexEntry {
-        return new IndexEntry([...this._positions]);
+        return new IndexEntry(this._positions);
     }
 }
 

src/graph/node.ts

@@ -66,7 +66,9 @@ class Node extends ASTNode {
             if (!(key in record)) {
                 return false;
             }
-            return record[key] === expression.value();
+            if (record[key] !== expression.value()) {
+                return false;
+            }
         }
         return true;
     }

src/graph/relationship.ts

@@ -63,7 +63,9 @@ class Relationship extends ASTNode {
             if (!(key in record)) {
                 throw new Error("Relationship does not have property");
             }
-            return record[key] === expression.value();
+            if (record[key] !== expression.value()) {
+                return false;
+            }
         }
         return true;
     }

src/graph/relationship_match_collector.ts

@@ -11,6 +11,7 @@ export type RelationshipMatchRecord = {
 class RelationshipMatchCollector {
     private _matches: RelationshipMatchRecord[] = [];
     private _nodeIds: Array<string> = [];
+    private _nodeIdSet: Set<string> = new Set();
 
     public push(relationship: Relationship, traversalId: string): RelationshipMatchRecord {
         const data = relationship.getData();
@@ -27,6 +28,7 @@ class RelationshipMatchCollector {
         };
         this._matches.push(match);
         this._nodeIds.push(traversalId);
+        this._nodeIdSet.add(traversalId);
         return match;
     }
     public set endNode(node: any) {
@@ -35,7 +37,10 @@ class RelationshipMatchCollector {
         }
     }
     public pop(): RelationshipMatchRecord | undefined {
-        this._nodeIds.pop();
+        const removedId = this._nodeIds.pop();
+        if (removedId !== undefined) {
+            this._nodeIdSet.delete(removedId);
+        }
         return this._matches.pop();
     }
     public value(): RelationshipMatchRecord | RelationshipMatchRecord[] | null {
@@ -57,7 +62,7 @@ class RelationshipMatchCollector {
      ** in the current traversal path
      */
     public isCircular(nextId: string): boolean {
-        return this._nodeIds.includes(nextId);
+        return this._nodeIdSet.has(nextId);
     }
 }