Db v4 schema layer

db4-storage/src/api/edges.rs

@@ -193,4 +193,7 @@ pub trait EdgeRefOps<'a>: Copy + Clone + Send + Sync {
 
     fn edge_id(&self) -> EID;
     fn edge_ref(self, dir: Dir) -> Option<EdgeRef>;
+
+    /// Graph-wide edge `Meta`
+    fn edge_meta(&self) -> &Arc<Meta>;
 }

db4-storage/src/pages/edge_page/writer.rs

@@ -57,6 +57,13 @@ impl<'a, MP: DerefMut<Target = MemEdgeSegment> + std::fmt::Debug, ES: EdgeSegmen
         layer_id: LayerId,
     ) -> LocalPOS {
         self.graph_stats.update_time(t.t());
+        // Update the per-layer property presence bitset in Meta.
+        // `.inspect` runs once per emitted item as the iterator is consumed in `insert_edge_internal`
+        let meta = self.writer.edge_meta().clone();
+        let props = props.into_iter().inspect(move |(id, _)| {
+            meta.temporal_prop_mapper()
+                .mark_prop_in_layer(layer_id, *id);
+        });
         if self
             .writer
             .insert_edge_internal(t, edge_pos, src, dst, layer_id, props)
@@ -132,6 +139,15 @@ impl<'a, MP: DerefMut<Target = MemEdgeSegment> + std::fmt::Debug, ES: EdgeSegmen
             }
         }
 
+        // Update the per-layer property presence bitset in Meta.
+        // `.inspect` runs once per emitted item as the iterator is consumed in `insert_edge_internal`
+        let meta = self.writer.edge_meta().clone();
+        let t_meta = meta.as_ref();
+        let t_props = t_props.into_iter().inspect(move |(id, _)| {
+            t_meta
+                .temporal_prop_mapper()
+                .mark_prop_in_layer(layer_id, *id);
+        });
         if self
             .writer
             .insert_edge_internal(t, edge_pos, src, dst, layer_id, t_props)
@@ -142,6 +158,9 @@ impl<'a, MP: DerefMut<Target = MemEdgeSegment> + std::fmt::Debug, ES: EdgeSegmen
 
         self.graph_stats.update_time(t.t());
 
+        let c_props = c_props.into_iter().inspect(move |(id, _)| {
+            meta.metadata_mapper().mark_prop_in_layer(layer_id, *id);
+        });
         self.writer
             .update_const_properties(edge_pos, src, dst, layer_id, c_props);
     }
@@ -213,6 +232,12 @@ impl<'a, MP: DerefMut<Target = MemEdgeSegment> + std::fmt::Debug, ES: EdgeSegmen
         if !existing_edge {
             self.increment_layer_num_edges(layer_id);
         }
+        // Update the per-layer property presence bitset in Meta.
+        // `.inspect` runs once per emitted item as the iterator is consumed in `update_const_properties`
+        let meta = self.writer.edge_meta().clone();
+        let props = props.into_iter().inspect(move |(id, _)| {
+            meta.metadata_mapper().mark_prop_in_layer(layer_id, *id);
+        });
         self.writer
             .update_const_properties(edge_pos, src, dst, layer_id, props);
     }

db4-storage/src/pages/node_page/writer.rs

@@ -155,6 +155,13 @@ impl<'a, MP: DerefMut<Target = MemNodeSegment> + 'a, NS: NodeSegmentOps> NodeWri
         props: impl IntoIterator<Item = (usize, P)>,
     ) {
         self.l_counter.update_time(t.t());
+        // Update the per-layer property presence bitset in Meta.
+        // `.inspect` runs once per emitted item as the iterator is consumed in `add_props`
+        let meta = self.mut_segment.node_meta().clone();
+        let props = props.into_iter().inspect(move |(id, _)| {
+            meta.temporal_prop_mapper()
+                .mark_prop_in_layer(layer_id, *id);
+        });
         let (is_new_node, add) = self.mut_segment.add_props(t, pos, layer_id, props);
         self.mut_segment.increment_est_size(add);
         if is_new_node && !self.page.has_node(pos, layer_id) {
@@ -178,6 +185,12 @@ impl<'a, MP: DerefMut<Target = MemNodeSegment> + 'a, NS: NodeSegmentOps> NodeWri
         layer_id: LayerId,
         props: impl IntoIterator<Item = (usize, P)>,
     ) {
+        // Update the per-layer property presence bitset in Meta.
+        // `.inspect` runs once per emitted item as the iterator is consumed in `update_metadata`
+        let meta = self.mut_segment.node_meta().clone();
+        let props = props.into_iter().inspect(move |(id, _)| {
+            meta.metadata_mapper().mark_prop_in_layer(layer_id, *id);
+        });
         let (is_new_node, add) = self.mut_segment.update_metadata(pos, layer_id, props);
         self.mut_segment.increment_est_size(add);
         if is_new_node && !self.page.has_node(pos, layer_id) {

db4-storage/src/pages/node_store.rs

@@ -52,6 +52,10 @@ pub struct ReadLockedNodeStorage<NS: NodeSegmentOps<Extension = EXT>, EXT> {
 impl<NS: NodeSegmentOps<Extension = EXT>, EXT: PersistenceStrategy<NS = NS>>
     ReadLockedNodeStorage<NS, EXT>
 {
+    pub fn storage(&self) -> &NodeStorageInner<NS, EXT> {
+        &self.storage
+    }
+
     pub fn node_ref(
         &self,
         node: impl Into<VID>,

db4-storage/src/properties/mod.rs

@@ -23,6 +23,7 @@ use std::sync::Arc;
 
 pub mod props_meta_writer;
 
+/// Contains the properties of a `SegmentContainer` (which corresponds to one layer in a Mem(Edge/Node)Segment)
 #[derive(Debug, Default)]
 pub struct Properties {
     c_properties: Vec<PropColumn>,

db4-storage/src/segments/edge/entry.rs

@@ -5,7 +5,11 @@ use crate::{
     generic_time_ops::{AdditionCellsRef, DeletionCellsRef, WithTimeCells},
     segments::{additions::MemAdditions, edge::segment::MemEdgeSegment},
 };
-use raphtory_api::core::entities::{LayerId, edges::edge_ref::Dir, properties::prop::Prop};
+use raphtory_api::core::entities::{
+    LayerId,
+    edges::edge_ref::Dir,
+    properties::{meta::Meta, prop::Prop},
+};
 use raphtory_core::{
     entities::{
         EID, Multiple, VID,
@@ -14,7 +18,7 @@ use raphtory_core::{
     },
     storage::timeindex::{EventTime, TimeIndexOps},
 };
-use std::marker::PhantomData;
+use std::{marker::PhantomData, sync::Arc};
 
 #[derive(Debug)]
 pub struct MemEdgeEntry<'a, MES> {
@@ -227,4 +231,9 @@ impl<'a> EdgeRefOps<'a> for MemEdgeRef<'a> {
     fn internal_num_layers(self) -> usize {
         self.es.as_ref().len()
     }
+
+    #[inline]
+    fn edge_meta(&self) -> &Arc<Meta> {
+        self.es.edge_meta()
+    }
 }

db4-storage/src/segments/mod.rs

@@ -153,6 +153,7 @@ impl<T: HasRow> SparseVec<T> {
     }
 }
 
+/// A single layer's data in a Mem(Edge/Node)Segment.
 #[derive(Debug)]
 pub struct SegmentContainer<T> {
     segment_id: usize,

docs/reference/graphql/graphql_API.md

@@ -1505,61 +1505,6 @@ Composite edge filter (by property, layer, src/dst, etc.).
 </tbody>
 </table>
 
-### EdgeSchema
-
-Describes edges between a specific pair of node types — the property and
-metadata keys seen on such edges, along with their observed value types.
-One `EdgeSchema` per `(srcType, dstType)` pair per layer.
-
-<table>
-<thead>
-<tr>
-<th align="left">Field</th>
-<th align="right">Argument</th>
-<th align="left">Type</th>
-<th align="left">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td colspan="2" valign="top"><strong id="edgeschema.srctype">srcType</strong></td>
-<td valign="top"><a href="#string">String</a>!</td>
-<td>
-
-Returns the type of source for these edges
-
-</td>
-</tr>
-<tr>
-<td colspan="2" valign="top"><strong id="edgeschema.dsttype">dstType</strong></td>
-<td valign="top"><a href="#string">String</a>!</td>
-<td>
-
-Returns the type of destination for these edges
-
-</td>
-</tr>
-<tr>
-<td colspan="2" valign="top"><strong id="edgeschema.properties">properties</strong></td>
-<td valign="top">[<a href="#propertyschema">PropertySchema</a>!]!</td>
-<td>
-
-Returns the list of property schemas for edges connecting these types of nodes
-
-</td>
-</tr>
-<tr>
-<td colspan="2" valign="top"><strong id="edgeschema.metadata">metadata</strong></td>
-<td valign="top">[<a href="#propertyschema">PropertySchema</a>!]!</td>
-<td>
-
-Returns the list of metadata schemas for edges connecting these types of nodes
-
-</td>
-</tr>
-</tbody>
-</table>
-
 ### EdgeWindowSet
 
 A lazy sequence of per-window views of a single edge, produced by
@@ -4297,8 +4242,8 @@ Compute the minimum interval between consecutive timestamps. Returns None if few
 
 ### LayerSchema
 
-Describes a single edge layer — its name and the per `(srcType, dstType)`
-edge schemas observed within it.
+Describes a single edge layer: its name and the edge property/metadata keys
+present in it, with observed variants (property values) on small graphs
 
 <table>
 <thead>
@@ -4320,11 +4265,20 @@ Returns the name of the layer with this schema
 </td>
 </tr>
 <tr>
-<td colspan="2" valign="top"><strong id="layerschema.edges">edges</strong></td>
-<td valign="top">[<a href="#edgeschema">EdgeSchema</a>!]!</td>
+<td colspan="2" valign="top"><strong id="layerschema.properties">properties</strong></td>
+<td valign="top">[<a href="#propertyschema">PropertySchema</a>!]!</td>
+<td>
+
+Returns the list of property schemas present on edges in this layer
+
+</td>
+</tr>
+<tr>
+<td colspan="2" valign="top"><strong id="layerschema.metadata">metadata</strong></td>
+<td valign="top">[<a href="#propertyschema">PropertySchema</a>!]!</td>
 <td>
 
-Returns the list of edge schemas for this edge layer
+Returns the list of metadata schemas present on edges in this layer
 
 </td>
 </tr>