Reflect interface changes of server DB sharding (#152)

* Reflect interface changes of server DB sharding
yorkie-team · Jan 22, 2024 · 47b2323 · 47b2323
1 parent 7531f9f
commit 47b2323
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/yorkie/proto/src/main/proto/yorkie/v1/yorkie.proto b/yorkie/proto/src/main/proto/yorkie/v1/yorkie.proto
@@ -48,13 +48,15 @@ message ActivateClientResponse {
 }
 
 message DeactivateClientRequest {
+  string client_key = 2;
   string client_id = 1;
 }
 
 message DeactivateClientResponse {
 }
 
 message AttachDocumentRequest {
+  string client_key = 3;
   string client_id = 1;
   ChangePack change_pack = 2;
 }
@@ -65,6 +67,7 @@ message AttachDocumentResponse {
 }
 
 message DetachDocumentRequest {
+  string client_key = 5;
   string client_id = 1;
   string document_id = 2;
   ChangePack change_pack = 3;
@@ -76,7 +79,9 @@ message DetachDocumentResponse {
 }
 
 message WatchDocumentRequest {
+  string client_key = 4;
   string client_id = 1;
+  string document_key = 3;
   string document_id = 2;
 }
 
@@ -92,6 +97,7 @@ message WatchDocumentResponse {
 }
 
 message RemoveDocumentRequest {
+  string client_key = 4;
   string client_id = 1;
   string document_id = 2;
   ChangePack change_pack = 3;
@@ -102,6 +108,7 @@ message RemoveDocumentResponse {
 }
 
 message PushPullChangesRequest {
+  string client_key = 5;
   string client_id = 1;
   string document_id = 2;
   ChangePack change_pack = 3;
@@ -113,12 +120,13 @@ message PushPullChangesResponse {
 }
 
 message BroadcastRequest {
+  string client_key = 6;
   string client_id = 1;
+  string document_key = 5;
   string document_id = 2;
   string topic = 3;
   bytes payload = 4;
 }
 
 message BroadcastResponse {
 }
-
diff --git a/yorkie/src/androidTest/kotlin/dev/yorkie/document/json/JsonTreeSplitMergeTest.kt b/yorkie/src/androidTest/kotlin/dev/yorkie/document/json/JsonTreeSplitMergeTest.kt
@@ -244,7 +244,7 @@ class JsonTreeSplitMergeTest {
     }
 
     @Test
-    fun test_split_and_merge_with_empty_paragraph_left_and_multiple_split_level_left() {
+    fun test_split_and_merge_with_empty_paragraph_and_multiple_split_level_left() {
         withTwoClientsAndDocuments(realTimeSync = false) { c1, c2, d1, d2, _ ->
             d1.updateAsync { root, _ ->
                 root.setNewTree(

diff --git a/yorkie/src/main/kotlin/dev/yorkie/core/Client.kt b/yorkie/src/main/kotlin/dev/yorkie/core/Client.kt
@@ -207,6 +207,7 @@ public class Client @VisibleForTesting internal constructor(
                             changePack = document.createChangePack().toPBChangePack()
                             documentId = documentID
                             pushOnly = syncMode == SyncMode.PushOnly
+                            clientKey = options.key
                         }
                         val response = service.pushPullChanges(
                             request,
@@ -257,6 +258,8 @@ public class Client @VisibleForTesting internal constructor(
                 watchDocumentRequest {
                     clientId = requireClientId().value
                     documentId = attachment.documentID
+                    clientKey = options.key
+                    documentKey = attachment.document.key.value
                 },
                 documentBasedRequestHeader(attachment.document.key),
             ).retry {
@@ -350,6 +353,7 @@ public class Client @VisibleForTesting internal constructor(
             val request = attachDocumentRequest {
                 clientId = requireClientId().value
                 changePack = document.createChangePack().toPBChangePack()
+                clientKey = options.key
             }
             val response = try {
                 service.attachDocument(
@@ -402,6 +406,7 @@ public class Client @VisibleForTesting internal constructor(
                 clientId = requireClientId().value
                 changePack = document.createChangePack().toPBChangePack()
                 documentId = attachment.documentID
+                clientKey = options.key
             }
             val response = try {
                 service.detachDocument(
@@ -437,6 +442,7 @@ public class Client @VisibleForTesting internal constructor(
                 service.deactivateClient(
                     deactivateClientRequest {
                         clientId = requireClientId().value
+                        clientKey = options.key
                     },
                     projectBasedRequestHeader,
                 )
@@ -464,6 +470,7 @@ public class Client @VisibleForTesting internal constructor(
                 clientId = requireClientId().value
                 changePack = document.createChangePack(forceRemove = true).toPBChangePack()
                 documentId = attachment.documentID
+                clientKey = options.key
             }
             val response = try {
                 service.removeDocument(