Rename GraphPropSegment etc -> GraphSegment

Author: fabubaker

db4-storage/src/api/graph_props.rs db4-storage/src/api/graph.rsdb4-storage/src/api/graph_props.rs renamed to db4-storage/src/api/graph.rs

@@ -8,7 +8,7 @@ use raphtory_core::entities::properties::tprop::IllegalPropType;
 use raphtory_core::storage::timeindex::TimeIndexEntry;
 use raphtory_api::core::entities::properties::prop::Prop;
 
-pub trait GraphPropSegmentOps: Send + Sync + Debug + 'static
+pub trait GraphSegmentOps: Send + Sync + Debug + 'static
 where
     Self: Sized,
 {

db4-storage/src/api/mod.rs

@@ -1,3 +1,3 @@
 pub mod edges;
 pub mod nodes;
-pub mod graph_props;
+pub mod graph;

db4-storage/src/lib.rs

@@ -26,7 +26,7 @@ use crate::{
 };
 use parking_lot::RwLock;
 use raphtory_api::core::entities::{EID, VID};
-use segments::{edge::MemEdgeSegment, graph_prop::GraphPropSegmentView, node::MemNodeSegment};
+use segments::{edge::MemEdgeSegment, graph::GraphSegmentView, node::MemNodeSegment};
 
 pub mod api;
 pub mod gen_t_props;
@@ -42,7 +42,7 @@ pub mod wal;
 pub type Extension = NoOpStrategy;
 pub type NS<P> = NodeSegmentView<P>;
 pub type ES<P> = EdgeSegmentView<P>;
-pub type GPS = GraphPropSegmentView;
+pub type GS = GraphSegmentView;
 pub type Layer<P> = GraphStore<NS<P>, ES<P>, P>;
 
 pub type WalImpl = NoWal;

db4-storage/src/pages/graph_prop_store.rs db4-storage/src/pages/graph_store.rsdb4-storage/src/pages/graph_prop_store.rs renamed to db4-storage/src/pages/graph_store.rs

@@ -1,15 +1,15 @@
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
-use crate::api::graph_props::GraphPropSegmentOps;
+use crate::api::graph::GraphSegmentOps;
 use crate::error::StorageError;
 use crate::persist::strategy::Config;
 use raphtory_core::entities::properties::graph_meta::GraphMeta;
 
 /// Backing store for graph temporal properties and graph metadata.
 /// GPS: GraphPropSegment?
 #[derive(Debug)]
-pub struct GraphPropStorageInner<GPS, EXT> {
-    page: Arc<GPS>,
+pub struct GraphStorageInner<GS, EXT> {
+    page: Arc<GS>,
 
     /// Stores graph prop metadata (prop name -> prop id mappings, etc).
     graph_meta: Arc<GraphMeta>,
@@ -19,7 +19,7 @@ pub struct GraphPropStorageInner<GPS, EXT> {
     ext: EXT,
 }
 
-impl<GPS: GraphPropSegmentOps, EXT: Config> GraphPropStorageInner<GPS, EXT> {
+impl<GPS: GraphSegmentOps, EXT: Config> GraphStorageInner<GPS, EXT> {
     pub fn new(path: Option<PathBuf>, ext: EXT) -> Self {
         let page = Arc::new(GPS::new());
         let graph_meta = Arc::new(GraphMeta::new());

db4-storage/src/pages/mod.rs

@@ -6,13 +6,13 @@ use crate::{
     persist::strategy::{Config, PersistentStrategy},
     properties::props_meta_writer::PropsMetaWriter,
     segments::{edge::MemEdgeSegment, node::MemNodeSegment},
-    GPS,
+    GS,
 };
 use edge_page::writer::EdgeWriter;
 use edge_store::EdgeStorageInner;
 use node_page::writer::{NodeWriter, WriterPair};
 use node_store::NodeStorageInner;
-use graph_prop_store::GraphPropStorageInner;
+use graph_store::GraphStorageInner;
 use parking_lot::RwLockWriteGuard;
 use raphtory_api::core::{
     entities::properties::{meta::Meta, prop::Prop},
@@ -40,7 +40,7 @@ pub mod locked;
 pub mod node_page;
 pub mod node_store;
 pub mod session;
-pub mod graph_prop_store;
+pub mod graph_store;
 #[cfg(any(test, feature = "test-utils"))]
 pub mod test_utils;
 
@@ -50,7 +50,7 @@ pub mod test_utils;
 pub struct GraphStore<NS, ES, EXT: Config> {
     nodes: Arc<NodeStorageInner<NS, EXT>>,
     edges: Arc<EdgeStorageInner<ES, EXT>>,
-    graph_props: Arc<GraphPropStorageInner<GPS, EXT>>,
+    graph: Arc<GraphStorageInner<GS, EXT>>,
     graph_dir: Option<PathBuf>,
     event_id: AtomicUsize,
     _ext: EXT,
@@ -96,8 +96,8 @@ impl<
         &self.edges
     }
 
-    pub fn graph_props(&self) -> &Arc<GraphPropStorageInner<GPS, EXT>> {
-        &self.graph_props
+    pub fn graph(&self) -> &Arc<GraphStorageInner<GS, EXT>> {
+        &self.graph
     }
 
     pub fn edge_meta(&self) -> &Meta {
@@ -109,7 +109,7 @@ impl<
     }
 
     pub fn graph_meta(&self) -> &GraphMeta {
-        self.graph_props.graph_meta()
+        self.graph.graph_meta()
     }
 
     pub fn earliest(&self) -> i64 {
@@ -142,14 +142,14 @@ impl<
         }
 
         // Load graph temporal properties and metadata
-        let meta = Arc::new(GraphPropStorageInner::load(meta_path, ext.clone())?);
+        let meta = Arc::new(GraphStorageInner::load(meta_path, ext.clone())?);
 
         let t_len = edges.t_len();
 
         Ok(Self {
             nodes,
             edges,
-            graph_props: meta,
+            graph: meta,
             event_id: AtomicUsize::new(t_len),
             graph_dir: Some(graph_dir.as_ref().to_path_buf()),
             _ext: ext,
@@ -182,7 +182,7 @@ impl<
             edge_meta,
             ext.clone(),
         ));
-        let graph_prop_storage = Arc::new(GraphPropStorageInner::new_with_meta(
+        let graph_prop_storage = Arc::new(GraphStorageInner::new_with_meta(
             graph_props_path,
             graph_meta,
             ext.clone(),
@@ -195,7 +195,7 @@ impl<
         Self {
             nodes: node_storage,
             edges: edge_storage,
-            graph_props: graph_prop_storage,
+            graph: graph_prop_storage,
             event_id: AtomicUsize::new(0),
             graph_dir: graph_dir.map(|p| p.to_path_buf()),
             _ext: ext,

db4-storage/src/segments/graph_prop.rs db4-storage/src/segments/graph.rsdb4-storage/src/segments/graph_prop.rs renamed to db4-storage/src/segments/graph.rs

@@ -2,7 +2,7 @@ use raphtory_core::entities::properties::graph_meta::GraphMeta;
 use std::path::Path;
 use std::sync::Arc;
 use std::sync::atomic::AtomicUsize;
-use crate::api::graph_props::{GraphPropSegmentOps, GraphPropOps};
+use crate::api::graph::{GraphSegmentOps, GraphPropOps};
 use crate::error::StorageError;
 use parking_lot::RwLock;
 use raphtory_core::entities::properties::props::MetadataError;
@@ -14,34 +14,34 @@ use crate::properties::Properties;
 
 /// In-memory segment that contains graph temporal properties and graph metadata.
 #[derive(Debug)]
-pub struct MemGraphPropSegment {
+pub struct MemGraphSegment {
     properties: Properties,
 }
 
-impl MemGraphPropSegment {
+impl MemGraphSegment {
     pub fn new() -> Self {
         Self {
             properties: Properties::default(),
         }
     }
 }
 
-/// `GraphPropSegmentView` manages graph temporal properties and graph metadata
+/// `GraphSegmentView` manages graph temporal properties and graph metadata
 /// (constant properties). Reads / writes are always served from the in-memory segment.
 #[derive(Debug)]
-pub struct GraphPropSegmentView {
+pub struct GraphSegmentView {
     /// In-memory segment that contains the latest graph properties
     /// and graph metadata writes.
-    head: Arc<RwLock<MemGraphPropSegment>>,
+    head: Arc<RwLock<MemGraphSegment>>,
 
     /// Estimated size of the segment in bytes.
     est_size: AtomicUsize,
 }
 
-impl GraphPropSegmentOps for GraphPropSegmentView {
+impl GraphSegmentOps for GraphSegmentView {
     fn new() -> Self {
         Self {
-            head: Arc::new(RwLock::new(MemGraphPropSegment::new())),
+            head: Arc::new(RwLock::new(MemGraphSegment::new())),
             est_size: AtomicUsize::new(0),
         }
     }
@@ -51,7 +51,7 @@ impl GraphPropSegmentOps for GraphPropSegmentView {
     }
 }
 
-impl GraphPropOps for GraphPropSegmentView {
+impl GraphPropOps for GraphSegmentView {
     fn get_temporal_prop(&self, prop_id: usize) -> Option<LockedView<'_, TProp>> {
         todo!()
     }

db4-storage/src/segments/mod.rs

@@ -20,7 +20,7 @@ use std::{
 
 pub mod edge;
 pub mod node;
-pub mod graph_prop;
+pub mod graph;
 
 pub mod additions;
 pub mod edge_entry;