infrahub-server 1.6.3__py3-none-any.whl → 1.7.0b0__py3-none-any.whl

infrahub/core/query/branch.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-from infrahub import config
 from infrahub.core.branch.enums import BranchStatus
 from infrahub.core.constants import GLOBAL_BRANCH_NAME
 from infrahub.core.query import Query, QueryType
@@ -70,89 +69,78 @@ CALL (vertex_id) {
         self.add_to_query(query)
 
 
-class GetAllBranchInternalRelationshipQuery(Query):
-    name: str = "get_internal_relationship"
+class RebaseBranchQuery(Query):
+    """Rebase a branch onto the default branch by updating edge timestamps
 
-    type: QueryType = QueryType.READ
-    insert_return: bool = False
-
-    async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
-        query = """
-        MATCH p = ()-[r]-()
-        WHERE r.branch = $branch_name
-        RETURN DISTINCT r
-        """
-        self.add_to_query(query=query)
-        self.params["branch_name"] = self.branch.name
-        self.return_labels = ["r"]
-
-
-class RebaseBranchUpdateRelationshipQuery(Query):
-    name: str = "rebase_branch_update"
+    For every edge on this branch
+        if it has a from time before $at and no to time, update it to $at
+        if it has a to time before $at, delete the edge
+        if it has a to time after $at, update the from time to $at
+    Then delete any orphaned vertices
+    """
 
+    name: str = "rebase_branch"
     type: QueryType = QueryType.WRITE
-
-    def __init__(self, ids: list[str], **kwargs: Any) -> None:
-        self.ids = ids
-        super().__init__(**kwargs)
+    insert_return: bool = False
+    raise_error_if_empty: bool = False
 
     async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
-        query = """
-        MATCH ()-[r]->()
-        WHERE %(id_func)s(r) IN $ids
-        SET r.from = $at
-        SET r.conflict = NULL
-        """ % {
-            "id_func": db.get_id_function_name(),
-        }
-
-        self.add_to_query(query=query)
-
+        self.params["branch_name"] = self.branch.name
         self.params["at"] = self.at.to_string()
-        self.params["ids"] = [db.to_database_id(id) for id in self.ids]
-        self.return_labels = [f"{db.get_id_function_name()}(r)"]
-
-
-class RebaseBranchDeleteRelationshipQuery(Query):
-    name: str = "rebase_branch_delete"
 
-    type: QueryType = QueryType.WRITE
-    insert_return: bool = False
-
-    def __init__(self, ids: list[str], **kwargs: Any) -> None:
-        self.ids = ids
-        super().__init__(**kwargs)
+        query = """
+// --------------
+// Get all edges on this branch with their source and destination vertices
+// --------------
+MATCH (s)-[r]-(d)
+WHERE r.branch = $branch_name
+WITH DISTINCT r, s, d
+WITH r, s, d,
+    CASE
+        // No `to` and `from` <= at: update
+        WHEN r.to IS NULL AND r.from <= $at THEN TRUE
+        // Has `to` and `to` < at: delete
+        WHEN r.to IS NOT NULL AND r.to < $at THEN FALSE
+        // Has `to` and `to` >= at: update
+        ELSE TRUE
+    END AS do_update
 
-    async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
-        if config.SETTINGS.database.db_type == config.DatabaseType.MEMGRAPH:
-            query = """
-            MATCH p = (s)-[r]-(d)
-            WHERE %(id_func)s(r) IN $ids
-            DELETE r
-            """
-        else:
-            query = """
-            MATCH p = (s)-[r]-(d)
-            WHERE %(id_func)s(r) IN $ids
-            DELETE r
-            WITH *
-            UNWIND nodes(p) AS n
-            MATCH (n)
-            WHERE NOT exists((n)--())
-            DELETE n
-            """
-        query %= {
-            "id_func": db.get_id_function_name(),
-        }
+// --------------
+// Process updates: set from = at for relationships we're keeping
+// --------------
+CALL (r, do_update) {
+    WITH r, do_update
+    WHERE do_update = TRUE
+    SET r.from = $at
+}
 
+// --------------
+// Delete the edges
+// --------------
+WITH r, s, d, do_update
+WHERE do_update = FALSE
+CALL (r, s, d) {
+    DELETE r
+}
+// --------------
+// Clean up any orpahned nodes edges
+// --------------
+WITH DISTINCT s, d
+UNWIND [s, d] AS n
+WITH DISTINCT n
+CALL (n) {
+    MATCH (n)
+    WHERE NOT exists((n)--())
+    DELETE n
+}
+        """
         self.add_to_query(query=query)
 
-        self.params["ids"] = [db.to_database_id(id) for id in self.ids]
-
 
 class BranchNodeGetListQuery(StandardNodeGetListQuery):
     def __init__(self, exclude_global: bool = False, **kwargs: Any) -> None:
         self.raw_filter = f"n.status <> '{BranchStatus.DELETING.value}'"
+
         if exclude_global:
             self.raw_filter += f" AND n.name <> '{GLOBAL_BRANCH_NAME}'"
 

infrahub/core/query/diff.py

@@ -77,7 +77,7 @@ class DiffCountChanges(Query):
         AND diff_rel.branch in $branch_names
         AND (
             (diff_rel.from >= $from_time AND diff_rel.from < $to_time)
-            OR (diff_rel.to >= $to_time AND diff_rel.to < $to_time)
+            OR (diff_rel.to >= $from_time AND diff_rel.to < $to_time)
         )
         AND (p.branch_support = "aware" OR q.branch_support = "aware")
         WITH diff_rel.branch AS branch_name, count(*) AS num_changes
@@ -335,7 +335,7 @@ CALL (p, q, diff_rel, row_from_time) {
     AND type(r_node) IN ["HAS_ATTRIBUTE", "IS_RELATED"]
     AND any(l in labels(node) WHERE l in ["Attribute", "Relationship"])
     AND node.branch_support IN [$branch_aware, $branch_agnostic]
-    AND type(r_prop) IN ["IS_VISIBLE", "IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE", "IS_RELATED"]
+    AND type(r_prop) IN ["IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE", "IS_RELATED"]
     AND any(l in labels(prop) WHERE l in ["Boolean", "Node", "AttributeValue"])
     AND (top_diff_rel.to IS NULL OR top_diff_rel.to >= r_node.from)
     AND (r_node.to IS NULL OR r_node.to >= r_prop.from)
@@ -532,7 +532,7 @@ CALL (root, r_root, p, diff_rel, q) {
     )
     WHERE %(id_func)s(mid_r_root) =  %(id_func)s(r_root)
     AND %(id_func)s(mid_diff_rel) =  %(id_func)s(diff_rel)
-    AND type(r_prop) IN ["IS_VISIBLE", "IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE", "IS_RELATED"]
+    AND type(r_prop) IN ["IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE", "IS_RELATED"]
     AND any(l in labels(prop) WHERE l in ["Boolean", "Node", "AttributeValue"])
     AND r_prop.from < $to_time AND r_prop.branch = mid_diff_rel.branch
     AND (mid_diff_rel.to IS NULL OR mid_diff_rel.to >= r_prop.from)
@@ -609,7 +609,7 @@ class DiffPropertyPathsQuery(DiffCalculationQuery):
 MATCH diff_rel_path = (root:Root)<-[r_root:IS_PART_OF]-(n:Node)-[r_node]-(p)-[diff_rel {branch: $branch_name}]->(q)
 WHERE p.branch_support = $branch_aware
 AND any(l in labels(p) WHERE l in ["Attribute", "Relationship"])
-AND type(diff_rel) IN ["IS_VISIBLE", "IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE"]
+AND type(diff_rel) IN ["IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE"]
 AND any(l in labels(q) WHERE l in ["Boolean", "Node", "AttributeValue"])
 AND type(r_node) IN ["HAS_ATTRIBUTE", "IS_RELATED"]
 // node ID and field name filtering first pass