|
@@ -1,8 +1,15 @@
|
|
|
use crate::services::grid_editor::ClientGridEditor;
|
|
|
+use crate::services::kv_persistence::GridKVPersistence;
|
|
|
use dashmap::DashMap;
|
|
|
+use flowy_collaboration::client_grid::{make_grid_delta, make_grid_revisions};
|
|
|
+use flowy_collaboration::entities::revision::RepeatedRevision;
|
|
|
use flowy_error::{FlowyError, FlowyResult};
|
|
|
+use flowy_grid_data_model::entities::{
|
|
|
+ Field, FieldOrder, Grid, RawRow, RepeatedField, RepeatedFieldOrder, RepeatedRow, RepeatedRowOrder, RowOrder,
|
|
|
+};
|
|
|
use flowy_sync::{RevisionManager, RevisionPersistence, RevisionWebSocket};
|
|
|
use lib_sqlite::ConnectionPool;
|
|
|
+use parking_lot::RwLock;
|
|
|
use std::sync::Arc;
|
|
|
|
|
|
pub trait GridUser: Send + Sync {
|
|
@@ -15,27 +22,63 @@ pub struct GridManager {
|
|
|
grid_editors: Arc<GridEditors>,
|
|
|
grid_user: Arc<dyn GridUser>,
|
|
|
rev_web_socket: Arc<dyn RevisionWebSocket>,
|
|
|
+ kv_persistence: Arc<RwLock<Option<Arc<GridKVPersistence>>>>,
|
|
|
}
|
|
|
|
|
|
impl GridManager {
|
|
|
pub fn new(grid_user: Arc<dyn GridUser>, rev_web_socket: Arc<dyn RevisionWebSocket>) -> Self {
|
|
|
let grid_editors = Arc::new(GridEditors::new());
|
|
|
+
|
|
|
+ // kv_persistence will be initialized after first access.
|
|
|
+ // See get_kv_persistence function below
|
|
|
+ let kv_persistence = Arc::new(RwLock::new(None));
|
|
|
Self {
|
|
|
grid_editors,
|
|
|
grid_user,
|
|
|
rev_web_socket,
|
|
|
+ kv_persistence,
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ #[tracing::instrument(level = "debug", skip_all, err)]
|
|
|
+ pub async fn create_grid<T: AsRef<str>>(
|
|
|
+ &self,
|
|
|
+ grid_id: T,
|
|
|
+ fields: Option<Vec<Field>>,
|
|
|
+ rows: Option<Vec<RawRow>>,
|
|
|
+ ) -> FlowyResult<()> {
|
|
|
+ let grid_id = grid_id.as_ref();
|
|
|
+ let user_id = self.grid_user.user_id()?;
|
|
|
+ let mut field_orders = vec![];
|
|
|
+ let mut row_orders = vec![];
|
|
|
+ if let Some(fields) = fields {
|
|
|
+ field_orders = fields.iter().map(|field| FieldOrder::from(field)).collect::<Vec<_>>();
|
|
|
}
|
|
|
+ if let Some(rows) = rows {
|
|
|
+ row_orders = rows.iter().map(|row| RowOrder::from(row)).collect::<Vec<_>>();
|
|
|
+ }
|
|
|
+
|
|
|
+ let grid = Grid {
|
|
|
+ id: grid_id.to_owned(),
|
|
|
+ field_orders: field_orders.into(),
|
|
|
+ row_orders: row_orders.into(),
|
|
|
+ };
|
|
|
+ let revisions = make_grid_revisions(&user_id, &grid);
|
|
|
+ let db_pool = self.grid_user.db_pool()?;
|
|
|
+ let rev_manager = self.make_grid_rev_manager(grid_id, db_pool)?;
|
|
|
+ let _ = rev_manager.reset_object(revisions).await?;
|
|
|
+ Ok(())
|
|
|
}
|
|
|
|
|
|
- #[tracing::instrument(level = "debug", skip(self, grid_id), fields(grid_id), err)]
|
|
|
- pub async fn open_grid<T: AsRef<str>>(&self, grid_id: T) -> Result<Arc<ClientGridEditor>, FlowyError> {
|
|
|
+ #[tracing::instrument(level = "debug", skip_all, fields(grid_id), err)]
|
|
|
+ pub async fn open_grid<T: AsRef<str>>(&self, grid_id: T) -> FlowyResult<Arc<ClientGridEditor>> {
|
|
|
let grid_id = grid_id.as_ref();
|
|
|
tracing::Span::current().record("grid_id", &grid_id);
|
|
|
- self.get_grid_editor(grid_id).await
|
|
|
+ self.get_or_create_grid_editor(grid_id).await
|
|
|
}
|
|
|
|
|
|
- #[tracing::instrument(level = "trace", skip(self, grid_id), fields(grid_id), err)]
|
|
|
- pub fn close_grid<T: AsRef<str>>(&self, grid_id: T) -> Result<(), FlowyError> {
|
|
|
+ #[tracing::instrument(level = "trace", skip_all, fields(grid_id), err)]
|
|
|
+ pub fn close_grid<T: AsRef<str>>(&self, grid_id: T) -> FlowyResult<()> {
|
|
|
let grid_id = grid_id.as_ref();
|
|
|
tracing::Span::current().record("grid_id", &grid_id);
|
|
|
self.grid_editors.remove(grid_id);
|
|
@@ -43,14 +86,29 @@ impl GridManager {
|
|
|
}
|
|
|
|
|
|
#[tracing::instrument(level = "debug", skip(self, grid_id), fields(doc_id), err)]
|
|
|
- pub fn delete_grid<T: AsRef<str>>(&self, grid_id: T) -> Result<(), FlowyError> {
|
|
|
+ pub fn delete_grid<T: AsRef<str>>(&self, grid_id: T) -> FlowyResult<()> {
|
|
|
let grid_id = grid_id.as_ref();
|
|
|
tracing::Span::current().record("grid_id", &grid_id);
|
|
|
self.grid_editors.remove(grid_id);
|
|
|
Ok(())
|
|
|
}
|
|
|
|
|
|
- async fn get_grid_editor(&self, grid_id: &str) -> FlowyResult<Arc<ClientGridEditor>> {
|
|
|
+ pub async fn get_rows(&self, row_orders: RepeatedRowOrder) -> RepeatedRow {
|
|
|
+ todo!()
|
|
|
+ }
|
|
|
+
|
|
|
+ pub async fn get_fields(&self, field_orders: RepeatedFieldOrder) -> RepeatedField {
|
|
|
+ todo!()
|
|
|
+ }
|
|
|
+
|
|
|
+ pub fn get_grid_editor(&self, grid_id: &str) -> FlowyResult<Arc<ClientGridEditor>> {
|
|
|
+ match self.grid_editors.get(grid_id) {
|
|
|
+ None => Err(FlowyError::internal().context("Should call open_grid function first")),
|
|
|
+ Some(editor) => Ok(editor),
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ async fn get_or_create_grid_editor(&self, grid_id: &str) -> FlowyResult<Arc<ClientGridEditor>> {
|
|
|
match self.grid_editors.get(grid_id) {
|
|
|
None => {
|
|
|
let db_pool = self.grid_user.db_pool()?;
|
|
@@ -65,12 +123,33 @@ impl GridManager {
|
|
|
grid_id: &str,
|
|
|
pool: Arc<ConnectionPool>,
|
|
|
) -> Result<Arc<ClientGridEditor>, FlowyError> {
|
|
|
- let token = self.grid_user.token()?;
|
|
|
- let user_id = self.grid_user.user_id()?;
|
|
|
- let grid_editor = ClientGridEditor::new(&user_id, grid_id, &token, pool, self.rev_web_socket.clone()).await?;
|
|
|
+ let user = self.grid_user.clone();
|
|
|
+ let rev_manager = self.make_grid_rev_manager(grid_id, pool.clone())?;
|
|
|
+ let kv_persistence = self.get_kv_persistence()?;
|
|
|
+ let grid_editor = ClientGridEditor::new(grid_id, user, rev_manager, kv_persistence).await?;
|
|
|
self.grid_editors.insert(grid_id, &grid_editor);
|
|
|
Ok(grid_editor)
|
|
|
}
|
|
|
+
|
|
|
+ fn make_grid_rev_manager(&self, grid_id: &str, pool: Arc<ConnectionPool>) -> FlowyResult<RevisionManager> {
|
|
|
+ let user_id = self.grid_user.user_id()?;
|
|
|
+ let rev_persistence = Arc::new(RevisionPersistence::new(&user_id, grid_id, pool));
|
|
|
+ let rev_manager = RevisionManager::new(&user_id, grid_id, rev_persistence);
|
|
|
+ Ok(rev_manager)
|
|
|
+ }
|
|
|
+
|
|
|
+ fn get_kv_persistence(&self) -> FlowyResult<Arc<GridKVPersistence>> {
|
|
|
+ let read_guard = self.kv_persistence.read();
|
|
|
+ if read_guard.is_some() {
|
|
|
+ return Ok(read_guard.clone().unwrap());
|
|
|
+ }
|
|
|
+ drop(read_guard);
|
|
|
+
|
|
|
+ let pool = self.grid_user.db_pool()?;
|
|
|
+ let kv_persistence = Arc::new(GridKVPersistence::new(pool));
|
|
|
+ *self.kv_persistence.write() = Some(kv_persistence.clone());
|
|
|
+ Ok(kv_persistence)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
pub struct GridEditors {
|