WIP

Author: genematx

tiled/catalog/adapter.py

@@ -145,8 +145,8 @@ def __init__(self, metadata, specs, top_level_access_blob):
         self.ancestors = []
         self.key = None
         self.data_sources = None
-        self.id = None
-        self.parent_id = None
+        # self.id = None
+        # self.parent = None
         self.access_blob = top_level_access_blob or {}
 
 
@@ -369,7 +369,8 @@ def __repr__(self):
         return f"<{type(self).__name__} /{'/'.join(self.segments)}>"
 
     async def __aiter__(self):
-        statement = select(orm.Node.key).filter(orm.Node.parent_id == self.node.id)
+        # statement = select(orm.Node.key).filter(orm.Node.parent == self.node.id)
+        statement = select(orm.Node.key).filter(orm.Node.ancestors == self.segments)
         for condition in self.conditions:
             statement = statement.filter(condition)
         async with self.context.session() as db:
@@ -378,7 +379,8 @@ async def __aiter__(self):
                 .scalars()
                 .all()
             )
-        statement = select(orm.Node.key).filter(orm.Node.parent_id == self.node.id)
+        # statement = select(orm.Node.key).filter(orm.Node.parent == self.node.id)
+        statement = select(orm.Node.key).filter(orm.Node.ancestors == self.segments)
         async with self.context.session() as db:
             return (await db.execute(statement)).scalar().all()
 
@@ -427,7 +429,8 @@ def apply_conditions(self, statement):
 
     async def async_len(self):
         statement = select(func.count(orm.Node.key)).filter(
-            orm.Node.parent_id == self.node.id
+            # orm.Node.parent == self.node.id
+            orm.Node.ancestors == self.segments
         )
         statement = self.apply_conditions(statement)
         async with self.context.session() as db:
@@ -650,7 +653,7 @@ async def create_node(
 
         node = orm.Node(
             key=key,
-            parent_id=self.node.id,
+            # parent=self.node.id,
             ancestors=self.segments,
             metadata_=metadata,
             structure_family=structure_family,
@@ -1026,7 +1029,8 @@ async def keys_range(self, offset, limit):
                 offset,
                 (offset + limit) if limit is not None else None,  # noqa: E203
             )
-        statement = select(orm.Node.key).filter(orm.Node.parent_id == self.node.id)
+        # statement = select(orm.Node.key).filter(orm.Node.parent == self.node.id)
+        statement = select(orm.Node.key).filter(orm.Node.ancestors == self.segments)
         statement = self.apply_conditions(statement)
         async with self.context.session() as db:
             return (
@@ -1048,7 +1052,8 @@ async def items_range(self, offset, limit):
                 offset,
                 (offset + limit) if limit is not None else None,  # noqa: E203
             )
-        statement = select(orm.Node).filter(orm.Node.parent_id == self.node.id)
+        # statement = select(orm.Node).filter(orm.Node.parent == self.node.id)
+        statement = select(orm.Node).filter(orm.Node.ancestors == self.segments)
         statement = self.apply_conditions(statement)
         async with self.context.session() as db:
             nodes = (

tiled/catalog/orm.py

@@ -64,7 +64,7 @@ class Node(Timestamped, Base):
 
     # This id is internal, never exposed to the client.
     id = Column(Integer, primary_key=True, index=True, autoincrement=True)
-    parent_id = Column(Integer, ForeignKey("nodes.id"), nullable=True)
+    parent = Column(Integer, ForeignKey("nodes.id"), nullable=True)
 
     key = Column(Unicode(1023), nullable=False)
     ancestors = Column(JSONVariant, nullable=True)
@@ -86,17 +86,16 @@ class Node(Timestamped, Base):
         passive_deletes=True,
     )
 
-    # This a self-referencing relationship between parent and children
-    parent = relationship("Node", remote_side=[id], back_populates="children")
-    children = relationship("Node", back_populates="parent")
+    # This is a self-referencing relationship between parent and children
+    prnt_rel = relationship("Node", remote_side=[id], back_populates="chld_rel")
+    chld_rel = relationship("Node", back_populates="prnt_rel")
 
     __table_args__ = (
-        UniqueConstraint("key", "parent_id", name="key_parent_id_unique_constraint"),
+        UniqueConstraint("key", "parent", name="key_parent_unique_constraint"),
         # This index supports comparison operations (==, <, ...).
         # For key-existence operations we will need a GIN index additionally.
         Index(
             "top_level_metadata",
-            "parent_id",
             # include the keys of the default sorting ('time_created', 'id'),
             # used to avoid creating a temp sort index
             "time_created",
@@ -115,11 +114,11 @@ class NodesClosure(Base):
 
     __tablename__ = "nodes_closure"
 
-    parent = Column(Integer, ForeignKey("nodes.id"), primary_key=True)
-    child = Column(Integer, ForeignKey("nodes.id"), primary_key=True)
+    ancestor = Column(Integer, ForeignKey("nodes.id"), primary_key=True)
+    descendant = Column(Integer, ForeignKey("nodes.id"), primary_key=True)
     depth = Column(Integer, nullable=False)
 
-    __table_args__ = (UniqueConstraint("parent", "child", name="parent_child_unique_constraint"),
+    __table_args__ = (UniqueConstraint("ancestor", "descendant", name="ancestor_descendant_unique_constraint"),
     )
 
 class DataSourceAssetAssociation(Base):
@@ -294,12 +293,12 @@ def update_closure_table(target, connection, **kw):
 CREATE TRIGGER update_closure_table_when_inserting
 AFTER INSERT ON nodes
 BEGIN
-    INSERT INTO nodes_closure(parent, child, depth)
+    INSERT INTO nodes_closure(ancestor, descendant, depth)
     SELECT NEW.id, NEW.id, 0;
-    INSERT INTO nodes_closure(parent, child, depth)
-    SELECT p.parent, c.child, p.depth+c.depth+1
+    INSERT INTO nodes_closure(ancestor, descendant, depth)
+    SELECT p.ancestor, c.descendant, p.depth+c.depth+1
     FROM nodes_closure p, nodes_closure c
-    WHERE p.child=NEW.parent_id and c.parent=NEW.id;
+    WHERE p.descendant=NEW.parent and c.ancestor=NEW.id;
 END"""
             )
         )
@@ -310,10 +309,10 @@ def update_closure_table(target, connection, **kw):
 BEFORE DELETE ON nodes
 BEGIN
     DELETE FROM nodes_closure
-    WHERE (parent, child) IN (
-    SELECT p.parent, c.child
+    WHERE (ancestor, descendant) IN (
+    SELECT p.ancestor, c.descendant
     FROM nodes_closure p, nodes_closure c
-    WHERE (p.child=OLD.parent_id OR p.child=OLD.id) AND c.parent=OLD.id);
+    WHERE (p.descendant=OLD.parent OR p.descendant=OLD.id) AND c.ancestor=OLD.id);
 END"""
             )
         )