Add ServerSeq into ChangeInfo (#197)

yorkie-team · Jun 5, 2024 · 586a003 · 586a003
1 parent 080f2cc
commit 586a003
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/yorkie/src/main/kotlin/dev/yorkie/api/ChangeConverter.kt b/yorkie/src/main/kotlin/dev/yorkie/api/ChangeConverter.kt
@@ -48,6 +48,7 @@ internal fun PBChangeID.toChangeID(): ChangeID {
         clientSeq.toUInt(),
         lamport,
         actorId.toActorID(),
+        serverSeq,
     )
 }
 
@@ -57,6 +58,7 @@ internal fun ChangeID.toPBChangeID(): PBChangeID {
         clientSeq = changeID.clientSeq.toInt()
         lamport = changeID.lamport
         actorId = changeID.actor.toByteString()
+        serverSeq = changeID.serverSeq
     }
 }
 

diff --git a/yorkie/src/main/kotlin/dev/yorkie/document/Document.kt b/yorkie/src/main/kotlin/dev/yorkie/document/Document.kt
@@ -474,7 +474,7 @@ public class Document(
     }
 
     private fun Change.toChangeInfo(operationInfos: List<OperationInfo>) =
-        Event.ChangeInfo(message.orEmpty(), operationInfos, id.actor)
+        Event.ChangeInfo(message.orEmpty(), operationInfos, id.actor, id.clientSeq, id.serverSeq)
 
     public fun toJson(): String {
         return root.toJson()
@@ -574,6 +574,8 @@ public class Document(
             public val message: String,
             public val operations: List<OperationInfo>,
             public val actorID: ActorID,
+            public val clientSeq: UInt,
+            public val serverSeq: Long,
         )
     }
 

diff --git a/yorkie/src/main/kotlin/dev/yorkie/document/change/ChangeID.kt b/yorkie/src/main/kotlin/dev/yorkie/document/change/ChangeID.kt
@@ -11,6 +11,7 @@ internal data class ChangeID(
     val clientSeq: UInt,
     val lamport: Long,
     val actor: ActorID,
+    val serverSeq: Long = 0,
 ) {
 
     /**

diff --git a/yorkie/src/main/kotlin/dev/yorkie/document/crdt/CrdtTree.kt b/yorkie/src/main/kotlin/dev/yorkie/document/crdt/CrdtTree.kt
@@ -670,7 +670,7 @@ internal data class CrdtTree(
         val parentNode = tree.findFloorNode(parentID)
         val leftNode = tree.findFloorNode(leftSiblingID)
         require(parentNode != null && leftNode != null) {
-            "cannot find node at $this"
+            "cannot find node of CrdtTreePos($parentID, $leftSiblingID)"
         }
 
         /**