Skip to content

Commit ed2d793

Browse files
vilattofacebook-github-bot
authored andcommitted
Include Tree aux data in the Tree response from sapling backing store
Summary: Modify `fromRawTree` so it can populate the tree aux data when converting from a sapling tree into the eden tree. We check the returned digest_size of the tree aux data to determine if it's a valid aux data. We skip storing it if it's invalid. Later we might want to force sapling to always return a valid tree aux data but for now let's go with the naive way. ## Context Currently we fetch TreeAuxData directly from the backing store without caching. We want to add cache support. The cache will be consist of the in-memory cache (in ObjectStore) as well as the local store. Reviewed By: jdelliot Differential Revision: D73795248 fbshipit-source-id: a8524760a90780842b73c036df4218bcaaf030d5
1 parent c72a679 commit ed2d793

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

third-party/watchman/src/eden/fs/service/eden.thrift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -974,11 +974,18 @@ union ScmTreeOrError {
974974
2: EdenError error;
975975
}
976976

977+
struct TreeAux {
978+
1: DigestSizeOrError digestSize;
979+
2: DigestHashOrError digestHash;
980+
}
981+
977982
struct ScmTreeWithOrigin {
978983
# the SCM tree data
979984
1: ScmTreeOrError scmTreeData;
980985
# where the SCM tree was fetched from
981986
2: DataFetchOrigin origin;
987+
# include the Tree Aux when it's available
988+
3: optional TreeAux treeAux;
982989
}
983990

984991
struct DebugGetScmTreeResponse {

0 commit comments

Comments
 (0)