Skip to content

Code Quality: Optimize large folder enumeration performance #17682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Code Quality: Optimize large folder enumeration performance #17682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,28 @@ public static async Task<List<ListedItem>> ListEntries(
Func<List<ListedItem>, Task> intermediateAction,
Dictionary<string, BitmapImage> defaultIconPairs = null)
{
var sampler = new IntervalSampler(500);
var sampler = new IntervalSampler(5000);
var tempList = new List<ListedItem>();
uint count = 0;
var firstRound = true;
var disableIntermediateUpdates = false;

IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

while (true)
{
IReadOnlyList<IStorageItem> items;

uint maxItemsToRetrieve = 300;
uint maxItemsToRetrieve = 5000;

if (intermediateAction is null)
{
// without intermediate action increase batches significantly
maxItemsToRetrieve = 1000;
maxItemsToRetrieve = 10000;
}
else if (firstRound)
{
maxItemsToRetrieve = 32;
maxItemsToRetrieve = 1000;
firstRound = false;
}

Expand Down Expand Up @@ -116,7 +117,10 @@ ex is FileNotFoundException ||
if (countLimit > -1 && count >= countLimit)
break;

if (intermediateAction is not null && (items.Count == maxItemsToRetrieve || sampler.CheckNow()))
if (count > 50000 && !disableIntermediateUpdates)
disableIntermediateUpdates = true;

if (intermediateAction is not null && !disableIntermediateUpdates && (items.Count == maxItemsToRetrieve || sampler.CheckNow()))
{
await intermediateAction(tempList);

Expand Down
8 changes: 6 additions & 2 deletions src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ public static async Task<List<ListedItem>> ListEntries(
Func<List<ListedItem>, Task> intermediateAction
)
{
var sampler = new IntervalSampler(500);
var sampler = new IntervalSampler(5000);
var tempList = new List<ListedItem>();
var count = 0;
var disableIntermediateUpdates = false;

IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
bool CalculateFolderSizes = userSettingsService.FoldersSettingsService.CalculateFolderSizes;
Expand Down Expand Up @@ -89,7 +90,10 @@ Func<List<ListedItem>, Task> intermediateAction
if (cancellationToken.IsCancellationRequested || count == countLimit)
break;

if (intermediateAction is not null && (count == 32 || sampler.CheckNow()))
if (count > 50000 && !disableIntermediateUpdates)
disableIntermediateUpdates = true;

if (intermediateAction is not null && !disableIntermediateUpdates && (count % 10000 == 0 || sampler.CheckNow()))
{
await intermediateAction(tempList);

Expand Down
Loading