facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

mononoke: walker: fix performance regression loading file data

Browse Source 
Summary: Fix performance regression in loading file data.

Reviewed By: farnz

Differential Revision: D19808562

fbshipit-source-id: 098fbd30dcd962b951e3ec040a799b4883ec421e
This commit is contained in:
Alex Hornby 2020-02-10 01:48:04 -08:00 committed by Facebook Github Bot
parent 2b7e7e5676
commit c147600793
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
eden/mononoke/walker/src/scrub.rs
View File

@ -18,7 +18,8 @@ use context::CoreContext;
use fbinit::FacebookInit;
use futures_preview::{
future::{self, BoxFuture, FutureExt},
stream::{Stream, StreamExt, TryStreamExt},
stream::{Stream, TryStreamExt},
TryFutureExt,
};
use slog::Logger;
@ -31,28 +32,24 @@ pub fn loading_stream<InStream, SS>(
where
InStream: Stream<Item = Result<(Node, Option<NodeData>, Option<SS>), Error>> + 'static + Send,
{
s.then(async move |r| match r {
Err(e) => future::err(e),
Ok((n, nd, ss)) => match nd {
Some(NodeData::FileContent(FileContentData::ContentStream(file_bytes_stream)))
if !limit_data_fetch =>
{
let res = file_bytes_stream
.try_fold(0, async move |acc, file_bytes| Ok(acc + file_bytes.size()))
.await;
match res {
Err(e) => future::err(e),
Ok(bytes) => future::ok((
s.map_ok(move |(n, nd, ss)| match nd {
Some(NodeData::FileContent(FileContentData::ContentStream(file_bytes_stream)))
if !limit_data_fetch =>
{
file_bytes_stream
.try_fold(0, |acc, file_bytes| future::ok(acc + file_bytes.size()))
.map_ok(|bytes| {
(
n,
Some(NodeData::FileContent(FileContentData::Consumed(bytes))),
ss,
)),
}
}
_ => future::ok((n, nd, ss)),
},
)
})
.left_future()
}
_ => future::ok((n, nd, ss)).right_future(),
})
.buffer_unordered(scheduled_max)
.try_buffer_unordered(scheduled_max)
}
// Starts from the graph, (as opposed to walking from blobstore enumeration)