conflict_resolve.rs 6.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186
  1. use crate::RevisionManager;
  2. use bytes::Bytes;
  3. use flowy_error::{FlowyError, FlowyResult};
  4. use flowy_sync::{
  5. entities::{
  6. revision::{RepeatedRevision, Revision, RevisionRange},
  7. ws_data::ServerRevisionWSDataType,
  8. },
  9. util::make_operations_from_revisions,
  10. };
  11. use lib_infra::future::BoxResultFuture;
  12. use lib_ot::core::{AttributeHashMap, DeltaOperations, EmptyAttributes, OperationAttributes};
  13. use serde::de::DeserializeOwned;
  14. use std::{convert::TryFrom, sync::Arc};
  15. pub type OperationsMD5 = String;
  16. pub trait ConflictResolver<T>
  17. where
  18. T: OperationAttributes + Send + Sync,
  19. {
  20. fn compose_delta(&self, delta: DeltaOperations<T>) -> BoxResultFuture<OperationsMD5, FlowyError>;
  21. fn transform_delta(&self, delta: DeltaOperations<T>) -> BoxResultFuture<TransformDeltas<T>, FlowyError>;
  22. fn reset_delta(&self, delta: DeltaOperations<T>) -> BoxResultFuture<OperationsMD5, FlowyError>;
  23. }
  24. pub trait ConflictRevisionSink: Send + Sync + 'static {
  25. fn send(&self, revisions: Vec<Revision>) -> BoxResultFuture<(), FlowyError>;
  26. fn ack(&self, rev_id: String, ty: ServerRevisionWSDataType) -> BoxResultFuture<(), FlowyError>;
  27. }
  28. pub type RichTextConflictController = ConflictController<AttributeHashMap>;
  29. pub type PlainTextConflictController = ConflictController<EmptyAttributes>;
  30. pub struct ConflictController<T>
  31. where
  32. T: OperationAttributes + Send + Sync,
  33. {
  34. user_id: String,
  35. resolver: Arc<dyn ConflictResolver<T> + Send + Sync>,
  36. rev_sink: Arc<dyn ConflictRevisionSink>,
  37. rev_manager: Arc<RevisionManager>,
  38. }
  39. impl<T> ConflictController<T>
  40. where
  41. T: OperationAttributes + Send + Sync + DeserializeOwned + serde::Serialize,
  42. {
  43. pub fn new(
  44. user_id: &str,
  45. resolver: Arc<dyn ConflictResolver<T> + Send + Sync>,
  46. rev_sink: Arc<dyn ConflictRevisionSink>,
  47. rev_manager: Arc<RevisionManager>,
  48. ) -> Self {
  49. let user_id = user_id.to_owned();
  50. Self {
  51. user_id,
  52. resolver,
  53. rev_sink,
  54. rev_manager,
  55. }
  56. }
  57. pub async fn receive_bytes(&self, bytes: Bytes) -> FlowyResult<()> {
  58. let repeated_revision = RepeatedRevision::try_from(bytes)?;
  59. if repeated_revision.is_empty() {
  60. return Ok(());
  61. }
  62. match self.handle_revision(repeated_revision).await? {
  63. None => {}
  64. Some(server_revision) => {
  65. self.rev_sink.send(vec![server_revision]).await?;
  66. }
  67. }
  68. Ok(())
  69. }
  70. pub async fn ack_revision(&self, rev_id: String, ty: ServerRevisionWSDataType) -> FlowyResult<()> {
  71. let _ = self.rev_sink.ack(rev_id, ty).await?;
  72. Ok(())
  73. }
  74. pub async fn send_revisions(&self, range: RevisionRange) -> FlowyResult<()> {
  75. let revisions = self.rev_manager.get_revisions_in_range(range).await?;
  76. let _ = self.rev_sink.send(revisions).await?;
  77. Ok(())
  78. }
  79. async fn handle_revision(&self, repeated_revision: RepeatedRevision) -> FlowyResult<Option<Revision>> {
  80. let mut revisions = repeated_revision.into_inner();
  81. let first_revision = revisions.first().unwrap();
  82. if let Some(local_revision) = self.rev_manager.get_revision(first_revision.rev_id).await {
  83. if local_revision.md5 == first_revision.md5 {
  84. // The local revision is equal to the pushed revision. Just ignore it.
  85. revisions = revisions.split_off(1);
  86. if revisions.is_empty() {
  87. return Ok(None);
  88. }
  89. } else {
  90. return Ok(None);
  91. }
  92. }
  93. let new_delta = make_operations_from_revisions(revisions.clone())?;
  94. let TransformDeltas {
  95. client_prime,
  96. server_prime,
  97. } = self.resolver.transform_delta(new_delta).await?;
  98. match server_prime {
  99. None => {
  100. // The server_prime is None means the client local revisions conflict with the
  101. // // server, and it needs to override the client delta.
  102. let md5 = self.resolver.reset_delta(client_prime).await?;
  103. let repeated_revision = RepeatedRevision::new(revisions);
  104. assert_eq!(repeated_revision.last().unwrap().md5, md5);
  105. let _ = self.rev_manager.reset_object(repeated_revision).await?;
  106. Ok(None)
  107. }
  108. Some(server_prime) => {
  109. let md5 = self.resolver.compose_delta(client_prime.clone()).await?;
  110. for revision in &revisions {
  111. let _ = self.rev_manager.add_remote_revision(revision).await?;
  112. }
  113. let (client_revision, server_revision) = make_client_and_server_revision(
  114. &self.user_id,
  115. &self.rev_manager,
  116. client_prime,
  117. Some(server_prime),
  118. md5,
  119. );
  120. let _ = self.rev_manager.add_remote_revision(&client_revision).await?;
  121. Ok(server_revision)
  122. }
  123. }
  124. }
  125. }
  126. fn make_client_and_server_revision<T>(
  127. user_id: &str,
  128. rev_manager: &Arc<RevisionManager>,
  129. client_delta: DeltaOperations<T>,
  130. server_delta: Option<DeltaOperations<T>>,
  131. md5: String,
  132. ) -> (Revision, Option<Revision>)
  133. where
  134. T: OperationAttributes + serde::Serialize,
  135. {
  136. let (base_rev_id, rev_id) = rev_manager.next_rev_id_pair();
  137. let client_revision = Revision::new(
  138. &rev_manager.object_id,
  139. base_rev_id,
  140. rev_id,
  141. client_delta.json_bytes(),
  142. user_id,
  143. md5.clone(),
  144. );
  145. match server_delta {
  146. None => (client_revision, None),
  147. Some(server_delta) => {
  148. let server_revision = Revision::new(
  149. &rev_manager.object_id,
  150. base_rev_id,
  151. rev_id,
  152. server_delta.json_bytes(),
  153. user_id,
  154. md5,
  155. );
  156. (client_revision, Some(server_revision))
  157. }
  158. }
  159. }
  160. pub type RichTextTransformDeltas = TransformDeltas<AttributeHashMap>;
  161. pub struct TransformDeltas<T>
  162. where
  163. T: OperationAttributes,
  164. {
  165. pub client_prime: DeltaOperations<T>,
  166. pub server_prime: Option<DeltaOperations<T>>,
  167. }