Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Achieve end to end channel buffer synchronization

Browse source 
co-authored-by: max <max@zed.dev>
This commit is contained in:
Mikayla 2023-08-22 13:25:31 -07:00
parent 95ea664725
commit 5a0315c4d5
No known key found for this signature in database
10 changed files with 425 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/rpc/proto/zed.proto
View file

@ -147,6 +147,8 @@ message Envelope {
JoinChannelBufferResponse join_channel_buffer_response = 132;
UpdateChannelBuffer update_channel_buffer = 133;
LeaveChannelBuffer leave_channel_buffer = 134;
AddChannelBufferCollaborator add_channel_buffer_collaborator = 135;
RemoveChannelBufferCollaborator remove_channel_buffer_collaborator = 136;
}
}
@ -416,6 +418,16 @@ message RemoveProjectCollaborator {
PeerId peer_id = 2;
}
message AddChannelBufferCollaborator {
uint64 channel_id = 1;
Collaborator collaborator = 2;
}
message RemoveChannelBufferCollaborator {
uint64 channel_id = 1;
PeerId peer_id = 2;
}
message GetDefinition {
uint64 project_id = 1;
uint64 buffer_id = 2;
@ -546,8 +558,8 @@ message UpdateBuffer {
}
message UpdateChannelBuffer {
uint64 buffer_id = 2;
repeated Operation operations = 3;
uint64 channel_id = 1;
repeated Operation operations = 2;
}
message UpdateBufferFile {
@ -964,9 +976,10 @@ message JoinChannelBuffer {
message JoinChannelBufferResponse {
uint64 buffer_id = 1;
string base_text = 2;
repeated Operation operations = 3;
repeated Collaborator collaborators = 4;
uint32 replica_id = 2;
string base_text = 3;
repeated Operation operations = 4;
repeated Collaborator collaborators = 5;
}
message LeaveChannelBuffer {

11
crates/rpc/src/proto.rs
View file

@ -252,7 +252,9 @@ messages!(
(JoinChannelBuffer, Foreground),
(JoinChannelBufferResponse, Foreground),
(LeaveChannelBuffer, Background),
(UpdateChannelBuffer, Foreground)
(UpdateChannelBuffer, Foreground),
(RemoveChannelBufferCollaborator, Foreground),
(AddChannelBufferCollaborator, Foreground),
);
request_messages!(
@ -376,7 +378,12 @@ entity_messages!(
UpdateDiffBase
);
entity_messages!(buffer_id, UpdateChannelBuffer);
entity_messages!(
channel_id,
UpdateChannelBuffer,
RemoveChannelBufferCollaborator,
AddChannelBufferCollaborator
);
const KIB: usize = 1024;
const MIB: usize = KIB * 1024;