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

Update git repositories to be streamed with their entries

Browse source 
co-authored-by: max <max@zed.dev>
This commit is contained in:
Mikayla Maki 2023-05-15 16:15:41 -07:00
parent 68078853b7
commit f59256f761
No known key found for this signature in database
1 changed files with 19 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
use super::{entity_messages, messages, request_messages, ConnectionId, TypedEnvelope}; use super::{entity_messages, messages, request_messages, ConnectionId, TypedEnvelope};
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use async_tungstenite::tungstenite::Message as WebSocketMessage; use async_tungstenite::tungstenite::Message as WebSocketMessage;
use collections::HashMap;
use futures::{SinkExt as _, StreamExt as _}; use futures::{SinkExt as _, StreamExt as _};
use prost::Message as _; use prost::Message as _;
use serde::Serialize; use serde::Serialize;
@ -485,11 +486,15 @@ pub fn split_worktree_update(
max_chunk_size: usize, max_chunk_size: usize,
) -> impl Iterator<Item = UpdateWorktree> { ) -> impl Iterator<Item = UpdateWorktree> {
let mut done_files = false; let mut done_files = false;
let mut done_statuses = false;
let mut repository_index = 0; let mut repository_map = message
let mut root_repo_found = false; .updated_repositories
.into_iter()
.map(|repo| (repo.work_directory_id, repo))
.collect::<HashMap<_, _>>();
iter::from_fn(move || { iter::from_fn(move || {
if done_files && done_statuses { if done_files {
return None; return None;
} }
@ -499,25 +504,6 @@ pub fn split_worktree_update(
.drain(..updated_entries_chunk_size) .drain(..updated_entries_chunk_size)
.collect(); .collect();
let mut updated_repositories: Vec<_> = Default::default();
if !root_repo_found {
for entry in updated_entries.iter() {
if let Some(repo) = message.updated_repositories.get(0) {
if repo.work_directory_id == entry.id {
root_repo_found = true;
updated_repositories.push(RepositoryEntry {
work_directory_id: repo.work_directory_id,
branch: repo.branch.clone(),
removed_repo_paths: Default::default(),
updated_statuses: Default::default(),
});
break;
}
}
}
}
let removed_entries_chunk_size = cmp::min(message.removed_entries.len(), max_chunk_size); let removed_entries_chunk_size = cmp::min(message.removed_entries.len(), max_chunk_size);
let removed_entries = message let removed_entries = message
.removed_entries .removed_entries
@ -526,64 +512,25 @@ pub fn split_worktree_update(
done_files = message.updated_entries.is_empty() && message.removed_entries.is_empty(); done_files = message.updated_entries.is_empty() && message.removed_entries.is_empty();
// Wait to send repositories until after we've guaranteed that their associated entries let mut updated_repositories = Vec::new();
// will be read
if done_files {
let mut total_statuses = 0;
while total_statuses < max_chunk_size
&& repository_index < message.updated_repositories.len()
{
let updated_statuses_chunk_size = cmp::min(
message.updated_repositories[repository_index]
.updated_statuses
.len(),
max_chunk_size - total_statuses,
);
let updated_statuses: Vec<_> = message.updated_repositories[repository_index] if !repository_map.is_empty() {
.updated_statuses for entry in &updated_entries {
.drain(..updated_statuses_chunk_size) if let Some(repo) = repository_map.remove(&entry.id) {
.collect(); updated_repositories.push(repo)
}
total_statuses += updated_statuses.len();
let done_this_repo = message.updated_repositories[repository_index]
.updated_statuses
.is_empty();
let removed_repo_paths = if done_this_repo {
mem::take(
&mut message.updated_repositories[repository_index].removed_repo_paths,
)
} else {
Default::default()
};
updated_repositories.push(RepositoryEntry {
work_directory_id: message.updated_repositories[repository_index]
.work_directory_id,
branch: message.updated_repositories[repository_index]
.branch
.clone(),
updated_statuses,
removed_repo_paths,
});
if done_this_repo {
repository_index += 1;
} }
} }
} else {
Default::default()
};
let removed_repositories = if done_files && done_statuses { let removed_repositories = if done_files {
mem::take(&mut message.removed_repositories) mem::take(&mut message.removed_repositories)
} else { } else {
Default::default() Default::default()
}; };
done_statuses = repository_index >= message.updated_repositories.len(); if done_files {
updated_repositories.extend(mem::take(&mut repository_map).into_values());
}
Some(UpdateWorktree { Some(UpdateWorktree {
project_id: message.project_id, project_id: message.project_id,