address review

Author: AviAvni

redisgraph/execution_plan.py

@@ -5,6 +5,9 @@ def __init__(self, name, args=None):
         self.children = []
 
     def append_child(self, child):
+        if not isinstance(child, Operation) or self is child:
+            raise Exception("child must be Operation")
+
         self.children.append(child)
         return self
 
@@ -21,9 +24,20 @@ def __eq__(self, o: object) -> bool:
 
         return True
 
+    def __str__(self) -> str:
+        args_str = "" if self.args is None else f" | {self.args}"
+        if len(self.children) == 0:
+            return f"{self.name}{args_str}"
+        else:
+            children = "\n".join(["    " + line for op in self.children for line in str(op).splitlines()])
+            return f"{self.name}{args_str}\n{children}"
+
 
 class ExecutionPlan:
     def __init__(self, plan):
+        if not isinstance(plan, list):
+            raise Exception("plan must be array")
+
         self.plan = plan
         self.structured_plan = self._operation_tree()
 
@@ -46,7 +60,7 @@ def _operation_tree(self):
             elif op_level == level + 1:
                 args = op.split("|")
                 child = Operation(args[0].strip(), None if len(args) == 1 else args[1].strip())
-                current.children.append(child)
+                current.append_child(child)
                 stack.append(current)
                 current = child
                 level += 1

tests/functional/test_all.py

@@ -251,15 +251,34 @@ def test_execution_plan(self):
         (:Rider {name:'Andrea Dovizioso'})-[:rides]->(:Team {name:'Ducati'})"""
         redis_graph.query(create_query)
 
-        result = redis_graph.execution_plan("MATCH (r:Rider)-[:rides]->(t:Team) WHERE t.name = $name RETURN r.name, t.name, $params", {'name': 'Yehuda'})
-        expected = "Results\n    Project\n        Conditional Traverse | (t:Team)->(r:Rider)\n            Filter\n                Node By Label Scan | (t:Team)"
+        result = redis_graph.execution_plan("MATCH (r:Rider)-[:rides]->(t:Team) WHERE t.name = $name RETURN r.name, t.name, $params UNION MATCH (r:Rider)-[:rides]->(t:Team) WHERE t.name = $name RETURN r.name, t.name, $params", {'name': 'Yehuda'})
+        expected = '''\
+Results
+    Distinct
+        Join
+            Project
+                Conditional Traverse | (t:Team)->(r:Rider)
+                    Filter
+                        Node By Label Scan | (t:Team)
+            Project
+                Conditional Traverse | (t:Team)->(r:Rider)
+                    Filter
+                        Node By Label Scan | (t:Team)'''
+        self.assertEquals(str(result.structured_plan), expected)
         self.assertEqual(str(result), expected)
 
         expected = Operation('Results') \
-            .append_child(Operation('Project')
-                          .append_child(Operation('Conditional Traverse', "(t:Team)->(r:Rider)")
-                                        .append_child(Operation("Filter")
-                                                      .append_child(Operation('Node By Label Scan', "(t:Team)")))))
+            .append_child(Operation('Distinct')
+                          .append_child(Operation('Join')
+                                        .append_child(Operation('Project')
+                                                      .append_child(Operation('Conditional Traverse', "(t:Team)->(r:Rider)")
+                                                                    .append_child(Operation("Filter")
+                                                                                  .append_child(Operation('Node By Label Scan', "(t:Team)")))))
+                                        .append_child(Operation('Project')
+                                                      .append_child(Operation('Conditional Traverse', "(t:Team)->(r:Rider)")
+                                                                    .append_child(Operation("Filter")
+                                                                                  .append_child(Operation('Node By Label Scan', "(t:Team)")))))
+                                        ))
 
         self.assertEqual(result.structured_plan, expected)