[Bug fix - Gaia-IR] The plan of pattern matching faces a multi-join error

research/query_service/ir/common/build.rs

@@ -53,6 +53,11 @@ fn codegen_inplace() -> Result<(), Box<dyn std::error::Error>> {
 
 #[cfg(not(feature = "proto_inplace"))]
 fn codegen_inplace() -> Result<(), Box<dyn std::error::Error>> {
+    println!("cargo:rerun-if-changed=../proto/common.proto");
+    println!("cargo:rerun-if-changed=../proto/expr.proto");
+    println!("cargo:rerun-if-changed=../proto/algebra.proto");
+    println!("cargo:rerun-if-changed=../proto/schema.proto");
+    println!("cargo:rerun-if-changed=../proto/results.proto");
     prost_build::Config::new()
         .type_attribute(".", "#[derive(Serialize,Deserialize)]")
         .compile_protos(

research/query_service/ir/compiler/src/test/resources/auxilia_alias.json

@@ -21,5 +21,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/auxilia_properties.json

@@ -29,5 +29,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
-}
+}

research/query_service/ir/compiler/src/test/resources/count.json

@@ -21,5 +21,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/count_as.json

@@ -21,5 +21,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/dedup.json

@@ -15,5 +15,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/expand_alias.json

@@ -25,5 +25,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/expand_edge_opt.json

@@ -21,5 +21,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/expand_labels.json

@@ -27,5 +27,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/group.json

@@ -33,5 +33,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/group_key.json

@@ -41,5 +41,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/group_key_count.json

@@ -41,5 +41,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/limit_range.json

@@ -13,5 +13,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
-}
+}

research/query_service/ir/compiler/src/test/resources/order_asc.json

@@ -19,5 +19,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/order_key.json

@@ -27,5 +27,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/order_keys.json

@@ -42,5 +42,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/order_label.json

@@ -23,5 +23,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/order_limit.json

@@ -22,5 +22,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/path_expand.json

@@ -30,5 +30,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/project_key.json

@@ -39,5 +39,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/project_tag.json

@@ -35,5 +35,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/project_tag_key.json

@@ -69,5 +69,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/project_tag_keys.json

@@ -89,5 +89,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/scan_alias.json

@@ -24,5 +24,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/scan_expr.json

@@ -53,5 +53,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/scan_ids.json

@@ -57,5 +57,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/scan_labels.json

@@ -26,5 +26,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/scan_opt.json

@@ -20,5 +20,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/scan_snapshot.json

@@ -22,5 +22,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/compiler/src/test/resources/select_expr.json

@@ -78,5 +78,8 @@
       },
       "children": []
     }
+  ],
+  "roots": [
+    0
   ]
 }

research/query_service/ir/core/src/plan/ffi.rs

@@ -1012,9 +1012,7 @@ mod params {
         if val.is_err() {
             return val.err().unwrap();
         }
-        params
-            .extra
-            .insert(key.unwrap(), val.unwrap());
+        params.extra.insert(key.unwrap(), val.unwrap());
         std::mem::forget(params);
 
         FfiError::success()

research/query_service/ir/core/src/plan/logical.rs

@@ -158,11 +158,15 @@ impl TryFrom<pb::LogicalPlan> for LogicalPlan {
 impl From<LogicalPlan> for pb::LogicalPlan {
     fn from(plan: LogicalPlan) -> Self {
         let mut id_map: HashMap<u32, i32> = HashMap::with_capacity(plan.len());
+        let mut roots = vec![];
         // As there might be some nodes being removed, we gonna remap the nodes' ids
-        for (id, node) in plan.nodes.iter().enumerate() {
-            id_map.insert(node.0 as u32, id as i32);
+        for (new_id, (old_id, node)) in plan.nodes.iter().enumerate() {
+            id_map.insert(old_id as u32, new_id as i32);
+            if node.borrow().parents.is_empty() {
+                roots.push(new_id as i32);
+            }
         }
-        let mut plan_pb = pb::LogicalPlan { nodes: vec![] };
+        let mut plan_pb = pb::LogicalPlan { nodes: vec![], roots };
         for (_, node) in &plan.nodes {
             let mut node_pb = pb::logical_plan::Node { opr: None, children: vec![] };
             let mut operator = node.borrow().opr.clone();
@@ -1432,7 +1436,7 @@ mod test {
         let root_pb = pb::logical_plan::Node { opr: Some(opr.clone()), children: vec![1, 2] };
         let node1_pb = pb::logical_plan::Node { opr: Some(opr.clone()), children: vec![2] };
         let node2_pb = pb::logical_plan::Node { opr: Some(opr.clone()), children: vec![] };
-        let plan_pb = pb::LogicalPlan { nodes: vec![root_pb, node1_pb, node2_pb] };
+        let plan_pb = pb::LogicalPlan { nodes: vec![root_pb, node1_pb, node2_pb], roots: vec![0] };
 
         let plan = LogicalPlan::try_from(plan_pb).unwrap();
         assert_eq!(plan.len(), 3);