Skip to content

Commit

Permalink
chore: rename
Browse files Browse the repository at this point in the history
  • Loading branch information
appflowy committed Mar 10, 2024
1 parent d570d3a commit a27e4b7
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
Expand Down Expand Up @@ -83,8 +83,8 @@ impl DatabaseViewTrackerList {
});
}

/// Return all the database view trackers
pub fn get_all_database_tracker(&self) -> Vec<DatabaseMeta> {
/// Return all the database meta
pub fn get_all_database_meta(&self) -> Vec<DatabaseMeta> {
self
.array_ref
.with_transact_mut(|txn| self.get_all_database_meta_with_txn(txn))
Expand Down
4 changes: 2 additions & 2 deletions collab-database/src/user/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
24 changes: 12 additions & 12 deletions collab-database/src/user/user_db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, CollabDocState>;
Expand Down Expand Up @@ -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<Arc<MutexDatabase>> {
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();
Expand Down Expand Up @@ -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<String> {
self
.database_tracker_list()
.database_meta_list()
.get_database_meta_with_view_id(view_id)
.map(|record| record.database_id)
}
Expand Down Expand Up @@ -201,7 +201,7 @@ impl WorkspaceDatabase {

// Add a new database record.
self
.database_tracker_list()
.database_meta_list()
.add_database(&params.database_id, vec![params.view_id.clone()]);
let database_id = params.database_id.clone();
// TODO(RS): insert the first view of the database.
Expand All @@ -213,7 +213,7 @@ impl WorkspaceDatabase {

pub fn track_database(&self, database_id: &str, database_view_ids: Vec<String>) {
self
.database_tracker_list()
.database_meta_list()
.add_database(database_id, database_view_ids);
}

Expand All @@ -239,7 +239,7 @@ impl WorkspaceDatabase {
let params = CreateViewParamsValidator::validate(params)?;
if let Some(database) = self.get_database(&params.database_id).await {
self
.database_tracker_list()
.database_meta_list()
.update_database(&params.database_id, |record| {
// Check if the view is already linked to the database.
if record.linked_views.contains(&params.view_id) {
Expand All @@ -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) {
Expand All @@ -280,7 +280,7 @@ impl WorkspaceDatabase {

/// Return all the database records.
pub fn get_all_databases(&self) -> Vec<DatabaseMeta> {
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<CollabSnapshot> {
Expand Down Expand Up @@ -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<DatabaseMeta> {
DatabaseViewTrackerList::from_collab(collab).get_all_database_tracker()
pub fn get_all_database_meta(collab: &Collab) -> Vec<DatabaseMeta> {
DatabaseMetaList::from_collab(collab).get_all_database_meta()
}

0 comments on commit a27e4b7

Please sign in to comment.