From a27e4b77393b588d7fb8077658a8da2c40772194 Mon Sep 17 00:00:00 2001 From: nathan Date: Mon, 11 Mar 2024 07:23:47 +0800 Subject: [PATCH] chore: rename --- .../src/user/{db_record.rs => db_meta.rs} | 8 +++---- collab-database/src/user/mod.rs | 4 ++-- collab-database/src/user/user_db.rs | 24 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) rename collab-database/src/user/{db_record.rs => db_meta.rs} (97%) diff --git a/collab-database/src/user/db_record.rs b/collab-database/src/user/db_meta.rs similarity index 97% rename from collab-database/src/user/db_record.rs rename to collab-database/src/user/db_meta.rs index f77b317ec..e30c29266 100644 --- a/collab-database/src/user/db_record.rs +++ b/collab-database/src/user/db_meta.rs @@ -11,11 +11,11 @@ use crate::database::timestamp; const DATABASES: &str = "databases"; /// Used to store list of [DatabaseMeta]. -pub struct DatabaseViewTrackerList { +pub struct DatabaseMetaList { array_ref: ArrayRefWrapper, } -impl DatabaseViewTrackerList { +impl DatabaseMetaList { pub fn new(array_ref: ArrayRefWrapper) -> Self { Self { array_ref } } @@ -83,8 +83,8 @@ impl DatabaseViewTrackerList { }); } - /// Return all the database view trackers - pub fn get_all_database_tracker(&self) -> Vec { + /// Return all the database meta + pub fn get_all_database_meta(&self) -> Vec { self .array_ref .with_transact_mut(|txn| self.get_all_database_meta_with_txn(txn)) diff --git a/collab-database/src/user/mod.rs b/collab-database/src/user/mod.rs index c4c88e924..72afc3600 100644 --- a/collab-database/src/user/mod.rs +++ b/collab-database/src/user/mod.rs @@ -1,7 +1,7 @@ -pub use db_record::*; +pub use db_meta::*; pub use relation::*; pub use user_db::*; -mod db_record; +mod db_meta; mod relation; mod user_db; diff --git a/collab-database/src/user/user_db.rs b/collab-database/src/user/user_db.rs index 69ab14f06..2a7353d73 100644 --- a/collab-database/src/user/user_db.rs +++ b/collab-database/src/user/user_db.rs @@ -22,7 +22,7 @@ use crate::database::{Database, DatabaseContext, DatabaseData, MutexDatabase}; use crate::database_observer::DatabaseNotify; use crate::error::DatabaseError; -use crate::user::db_record::{DatabaseMeta, DatabaseViewTrackerList}; +use crate::user::db_meta::{DatabaseMeta, DatabaseMetaList}; use crate::views::{CreateDatabaseParams, CreateViewParams, CreateViewParamsValidator}; pub type CollabDocStateByOid = HashMap; @@ -105,7 +105,7 @@ impl WorkspaceDatabase { /// Get the database with the given database id. /// Return None if the database does not exist. pub async fn get_database(&self, database_id: &str) -> Option> { - if !self.database_tracker_list().contains(database_id) { + if !self.database_meta_list().contains(database_id) { return None; } let database = self.open_handlers.lock().get(database_id).cloned(); @@ -172,7 +172,7 @@ impl WorkspaceDatabase { /// Return the database id with the given view id. pub fn get_database_id_with_view_id(&self, view_id: &str) -> Option { self - .database_tracker_list() + .database_meta_list() .get_database_meta_with_view_id(view_id) .map(|record| record.database_id) } @@ -201,7 +201,7 @@ impl WorkspaceDatabase { // Add a new database record. self - .database_tracker_list() + .database_meta_list() .add_database(¶ms.database_id, vec![params.view_id.clone()]); let database_id = params.database_id.clone(); // TODO(RS): insert the first view of the database. @@ -213,7 +213,7 @@ impl WorkspaceDatabase { pub fn track_database(&self, database_id: &str, database_view_ids: Vec) { self - .database_tracker_list() + .database_meta_list() .add_database(database_id, database_view_ids); } @@ -239,7 +239,7 @@ impl WorkspaceDatabase { let params = CreateViewParamsValidator::validate(params)?; if let Some(database) = self.get_database(¶ms.database_id).await { self - .database_tracker_list() + .database_meta_list() .update_database(¶ms.database_id, |record| { // Check if the view is already linked to the database. if record.linked_views.contains(¶ms.view_id) { @@ -256,7 +256,7 @@ impl WorkspaceDatabase { /// Delete the database with the given database id. pub fn delete_database(&self, database_id: &str) { - self.database_tracker_list().delete_database(database_id); + self.database_meta_list().delete_database(database_id); if let Some(collab_db) = self.collab_db.upgrade() { let _ = collab_db.with_write_txn(|w_db_txn| { match w_db_txn.delete_doc(self.uid, database_id) { @@ -280,7 +280,7 @@ impl WorkspaceDatabase { /// Return all the database records. pub fn get_all_databases(&self) -> Vec { - self.database_tracker_list().get_all_database_tracker() + self.database_meta_list().get_all_database_meta() } pub fn get_database_snapshots(&self, database_id: &str) -> Vec { @@ -363,11 +363,11 @@ impl WorkspaceDatabase { ) } - fn database_tracker_list(&self) -> DatabaseViewTrackerList { - DatabaseViewTrackerList::from_collab(&self.collab.lock()) + fn database_meta_list(&self) -> DatabaseMetaList { + DatabaseMetaList::from_collab(&self.collab.lock()) } } -pub fn get_all_database_view_trackers(collab: &Collab) -> Vec { - DatabaseViewTrackerList::from_collab(collab).get_all_database_tracker() +pub fn get_all_database_meta(collab: &Collab) -> Vec { + DatabaseMetaList::from_collab(collab).get_all_database_meta() }