Skip to content
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

Jump to bottom

Fix task fanout when retrieving sales #1367

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Fix task fanout when retrieving sales #1367

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
18 changes: 4 additions & 14 deletions src/Universalis.DbAccess/MarketBoard/HistoryDbAccess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
var itemIds = query.ItemIds.ToArray();
var worldItemTuples = Enumerable.Repeat(itemIds, worldIds.Length)
.Zip(worldIds)
.SelectMany(tup =>
.SelectMany(static tup =>
{
var (iIds, worldId) = tup;
return Enumerable.Repeat(worldId, iIds.Length).Zip(iIds);
Expand All @@ -93,21 +93,11 @@
var marketItemsDict = marketItemsList.ToDictionary(mi => (mi.WorldId, mi.ItemId), mi => mi);

// Get sales where an upload time is known
var salesByTuple = await Task.WhenAll(worldItemTuples
.Where(marketItemsDict.ContainsKey)
.Select(async tup =>
{
var (worldId, itemId) = tup;
var results = await _saleStore.RetrieveBySaleTime(worldId, itemId, query.Count ?? 1000,
cancellationToken: cancellationToken);
return (worldId, itemId, results);
}));

// Collect the results
var sales = new Dictionary<(int, int), IEnumerable<Sale>>();
foreach (var (worldId, itemId, results) in salesByTuple)
foreach (var (worldId, itemId) in worldItemTuples.Where(marketItemsDict.ContainsKey))
{
sales[(worldId, itemId)] = results;
sales[(worldId, itemId)] = await _saleStore.RetrieveBySaleTime(worldId, itemId, query.Count ?? 200,

Check warning on line 99 in src/Universalis.DbAccess/MarketBoard/HistoryDbAccess.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

src/Universalis.DbAccess/MarketBoard/HistoryDbAccess.cs#L99 

Assign this magic number '200' to a well-named variable or constant, and use that instead.
cancellationToken: cancellationToken);
}

// Reformat the results as a History instance
Expand Down
Loading