Skip to content

Fix high memory usage generating list of torrents for various operations #990

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
omgbeez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix high memory usage generating list of torrents for various operations #990

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
7 changes: 7 additions & 0 deletions server/RdtClient.Data/Data/DataContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class DataContext(DbContextOptions options) : IdentityDbContext(options)
public DbSet<Download> Downloads { get; set; }
public DbSet<Setting> Settings { get; set; }
public DbSet<Torrent> Torrents { get; set; }
public DbSet<TorrentPayload> TorrentPayloads { get; set; }

protected override void OnModelCreating(ModelBuilder builder)
{
Expand All @@ -24,6 +25,12 @@ protected override void OnModelCreating(ModelBuilder builder)
})
.IsUnique();

builder.Entity<Torrent>()
.HasOne(m => m.Payload)
.WithOne(m => m.Torrent)
.HasForeignKey<TorrentPayload>(m => m.TorrentId)
.IsRequired(false);

var cascadeFKs = builder.Model.GetEntityTypes()
.SelectMany(t => t.GetForeignKeys())
.Where(fk => !fk.IsOwnership && fk.DeleteBehavior == DeleteBehavior.Cascade);
Expand Down
1 change: 1 addition & 0 deletions server/RdtClient.Data/Data/ITorrentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public interface ITorrentData
Task<IList<Torrent>> Get();
Task<Torrent?> GetById(Guid torrentId);
Task<Torrent?> GetByHash(String hash);
Task<String?> GetPayloadContent(Guid torrentId);

Task<Torrent> Add(String? rdId,
String hash,
Expand Down
59 changes: 43 additions & 16 deletions server/RdtClient.Data/Data/TorrentData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ public class TorrentData(DataContext dataContext, ILogger<TorrentData>? logger =
{
public async Task<IList<Torrent>> Get()
{
var torrents = await dataContext.Torrents
.AsNoTracking()
.AsSplitQuery()
.Include(m => m.Downloads)
.OrderBy(m => m.Priority ?? 9999)
.ToListAsync();
var torrents = await BuildTorrentQuery(includePayload: false)
.OrderBy(m => m.Priority ?? 9999)
.ToListAsync();

return torrents.OrderBy(m => m.Priority ?? 9999)
.ThenBy(m => m.Added)
Expand All @@ -23,10 +20,8 @@ public async Task<IList<Torrent>> Get()

public async Task<Torrent?> GetById(Guid torrentId)
{
var dbTorrent = await dataContext.Torrents
.AsNoTracking()
.Include(m => m.Downloads)
.FirstOrDefaultAsync(m => m.TorrentId == torrentId);
var dbTorrent = await BuildTorrentQuery(includePayload: true)
.FirstOrDefaultAsync(m => m.TorrentId == torrentId);

if (dbTorrent == null)
{
Expand All @@ -45,10 +40,8 @@ public async Task<IList<Torrent>> Get()
{
hash = hash.ToLower();

var dbTorrent = await dataContext.Torrents
.AsNoTracking()
.Include(m => m.Downloads)
.FirstOrDefaultAsync(m => m.Hash == hash);
var dbTorrent = await BuildTorrentQuery(includePayload: false)
.FirstOrDefaultAsync(m => m.Hash == hash);

if (dbTorrent == null)
{
Expand All @@ -63,6 +56,15 @@ public async Task<IList<Torrent>> Get()
return dbTorrent;
}

public async Task<String?> GetPayloadContent(Guid torrentId)
{
return await dataContext.TorrentPayloads
.AsNoTracking()
.Where(m => m.TorrentId == torrentId)
.Select(m => m.Content)
.FirstOrDefaultAsync();
}

public async Task<Torrent> Add(String? rdId,
String hash,
String? fileOrMagnetContents,
Expand All @@ -88,15 +90,20 @@ public async Task<Torrent> Add(String? rdId,
DownloadManualFiles = torrent.DownloadManualFiles,
DownloadClient = downloadClient,
Type = downloadType,
FileOrMagnet = fileOrMagnetContents,
IsFile = isFile,
Priority = torrent.Priority,
TorrentRetryAttempts = torrent.TorrentRetryAttempts,
DownloadRetryAttempts = torrent.DownloadRetryAttempts,
DeleteOnError = torrent.DeleteOnError,
Lifetime = torrent.Lifetime,
RdStatus = torrent.RdStatus,
RdName = torrent.RdName
RdName = torrent.RdName,
Payload = String.IsNullOrWhiteSpace(fileOrMagnetContents)
? null
: new()
{
Content = fileOrMagnetContents
}
};

await dataContext.Torrents.AddAsync(newTorrent);
Expand Down Expand Up @@ -294,6 +301,10 @@ await dataContext.Downloads
.Where(m => m.TorrentId == torrentId)
.ExecuteDeleteAsync();

await dataContext.TorrentPayloads
.Where(m => m.TorrentId == torrentId)
.ExecuteDeleteAsync();

var deletedTorrents = await dataContext.Torrents
.Where(m => m.TorrentId == torrentId)
.ExecuteDeleteAsync();
Expand All @@ -307,4 +318,20 @@ await dataContext.Downloads
return;
}
}

private IQueryable<Torrent> BuildTorrentQuery(Boolean includePayload)
{
var query = dataContext.Torrents
.AsNoTracking()
.AsSplitQuery()
.Include(m => m.Downloads)
.AsQueryable();

if (includePayload)
{
query = query.Include(m => m.Payload);
}

return query;
}
}
Loading