Skip to content

Commit e95d0b0

Browse files
committed
Fix bad merge: lastPrefetchArgs -> prefetchCache, prefetchCacheSize
The merge of #2002 (prefetch-offload-to-mount) on top of #2004 (expand-prefetch-cache) left two call sites referencing the removed lastPrefetchArgs variable: - PrefetchVerb.cs line 234: the hydration-fallback path added by #2002 passed lastPrefetchArgs instead of the prefetchCache + prefetchCacheSize parameters added by #2004. - InProcessMount.cs HandlePrefetchBlobsRequest: the mount-side prefetch handler added by #2002 passed lastPrefetchArgs instead of explicit null + 0 (mount-side prefetch is a one-shot download with no noop cache). Assisted-by: Claude Opus 4.6 Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
1 parent fa0c3c5 commit e95d0b0

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

GVFS/GVFS.Mount/InProcessMount.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,8 @@ private void HandlePrefetchBlobsRequest(NamedPipeMessages.Message message, Named
11231123
objectRequestor,
11241124
request.Files,
11251125
request.Folders,
1126-
lastPrefetchArgs,
1126+
prefetchCache: null,
1127+
maxCacheSize: 0,
11271128
chunkSize: 4000,
11281129
searchThreadCount: maxThreads,
11291130
downloadThreadCount: downloadThreads,

GVFS/GVFS/CommandLine/PrefetchVerb.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ protected override void Execute(GVFSEnlistment enlistment)
231231
cacheServerFromConfig,
232232
out objectRequestor,
233233
out resolvedCacheServer);
234-
this.PrefetchBlobs(tracer, enlistment, headCommitId, filesList, foldersList, lastPrefetchArgs, objectRequestor, resolvedCacheServer);
234+
this.PrefetchBlobs(tracer, enlistment, headCommitId, filesList, foldersList, prefetchCache, prefetchCacheSize, objectRequestor, resolvedCacheServer);
235235
}
236236
else
237237
{

0 commit comments

Comments
 (0)