facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity

avoid loading blob/tree metadata during hg status

Browse Source 
Summary:
This partially fixes up a perf problem when performing status when a large
number of inodes have been loaded but not materialized (eg: by `find /edenfs
-ls`).

For the FileInode case we'd end up requesting the SHA1 from the store
twice in parallel only to compare it and decide that the file has not
been changed(!)

The remediation is to cut this code over to calling `FileInode::isSameAs` so that
we can short-circuit some of this work.  In addition, we can avoid loading
subtrees if we haven't materialized them and the hash matches up.

Reviewed By: simpkins

Differential Revision: D5783044

fbshipit-source-id: f40da3fadfcf8d9e19221d41e3a5a980454717db
This commit is contained in:
Wez Furlong 2017-09-07 14:39:48 -07:00 committed by Facebook Github Bot
parent 78ef6207e3
commit f30850b8dc
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
eden/fs/inodes/DeferredDiffEntry.cpp
View File

@ -249,6 +249,16 @@ class ModifiedDiffEntry : public DeferredDiffEntry {
return diffRemovedTree(context_, getPath(), scmEntry_);
}
{
auto contents = treeInode->getContents().wlock();
if (!contents->isMaterialized() &&
contents->treeHash.value() == scmEntry_.getHash()) {
// It did not change since it was loaded,
// and it matches the scmEntry we're diffing against.
return makeFuture();
}
}
// Possibly modified directory. Load the Tree in question.
return context_->store->getTree(scmEntry_.getHash()).then([
this,
@ -274,25 +284,9 @@ class ModifiedDiffEntry : public DeferredDiffEntry {
return treeInode->diff(context_, getPath(), nullptr, ignore_, isIgnored_);
}
// Possibly modified file. First check the mode.
// If it is different the file is definitely modified.
if (fileInode->getMode() != scmEntry_.getMode()) {
context_->callback->modifiedFile(getPath(), scmEntry_);
return makeFuture();
}
// TODO: If at some point we add file size info to the TreeEntry, we could
// first check to see if the file size is different, before having to load
// the SHA1 data.
// Load the blob SHA1 and the file contents SHA1, so we can check if the
// contents are modified. Note that we want the FileInode to always
// return a SHA1 to us, even for symlink contents.
auto blobSha1Future = context_->store->getBlobMetadata(scmEntry_.getHash());
auto fileSha1Future = fileInode->getSHA1(false);
return folly::collect(blobSha1Future, fileSha1Future)
.then([this](const std::tuple<BlobMetadata, Hash>& result) {
if (std::get<0>(result).sha1 != std::get<1>(result)) {
return fileInode->isSameAs(scmEntry_.getHash(), scmEntry_.getMode())
.then([this](bool isSame) {
if (!isSame) {
context_->callback->modifiedFile(getPath(), scmEntry_);
}
});