mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-29 16:07:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

tree: when merging files, read all sides concurrently

Browse source 
This should help a bit when merging files using a high-latency
backend.
This commit is contained in:
Martin von Zweigbergk 2024-09-04 09:25:54 -07:00 committed by Martin von Zweigbergk
parent bc06b2a442
commit 5e620bb7ef
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/src/tree.rs
View file

@ -22,6 +22,7 @@ use std::hash::Hasher;
use std::io::Read; use std::io::Read;
use std::sync::Arc; use std::sync::Arc;
use futures::future::try_join_all;
use itertools::Itertools; use itertools::Itertools;
use pollster::FutureExt; use pollster::FutureExt;
use tracing::instrument; use tracing::instrument;
@ -457,20 +458,19 @@ pub async fn try_resolve_file_conflict(
// cannot // cannot
let file_id_conflict = file_id_conflict.simplify(); let file_id_conflict = file_id_conflict.simplify();
// TODO: Read the files concurrently let content_futures = file_id_conflict.into_iter().map(|file_id| async {
let contents: Merge<Vec<u8>> =
file_id_conflict.try_map(|&file_id| -> BackendResult<Vec<u8>> {
let mut content = vec![]; let mut content = vec![];
store let mut reader = store.read_file_async(filename, file_id).await?;
.read_file(filename, file_id)? reader
.read_to_end(&mut content) .read_to_end(&mut content)
.map_err(|err| BackendError::ReadObject { .map_err(|err| BackendError::ReadObject {
object_type: file_id.object_type(), object_type: file_id.object_type(),
hash: file_id.hex(), hash: file_id.hex(),
source: err.into(), source: err.into(),
})?; })?;
Ok(content) BackendResult::Ok(content)
})?; });
let contents = Merge::from_vec(try_join_all(content_futures).await?);
let merge_result = files::merge(&contents); let merge_result = files::merge(&contents);
match merge_result { match merge_result {
MergeResult::Resolved(merged_content) => { MergeResult::Resolved(merged_content) => {