tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fetching the entire database when adding a round or admin log on SQLite

Browse Source 
EF Core was a mistake
This commit is contained in:
DrSmugleaf
2021-12-20 17:54:50 +01:00
parent ce5f9fe560
commit b5a78073ef
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Content.Server/Database/ServerDbSqlite.cs
View File

@@ -3,13 +3,11 @@ using System.Collections.Generic;
using System.Collections.Immutable; using System.Collections.Immutable;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Text.Json;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.Administration.Logs; using Content.Server.Administration.Logs;
using Content.Server.IP; using Content.Server.IP;
using Content.Server.Preferences.Managers; using Content.Server.Preferences.Managers;
using Content.Shared.Administration.Logs;
using Content.Shared.CCVar; using Content.Shared.CCVar;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
@@ -250,18 +248,6 @@ namespace Content.Server.Database
return (admins.Select(p => (p.a, p.LastSeenUserName)).ToArray(), adminRanks)!; return (admins.Select(p => (p.a, p.LastSeenUserName)).ToArray(), adminRanks)!;
} }
private async Task<int> NextId<TModel>(DbSet<TModel> set, Func<TModel, int> selector) where TModel : class
{
var id = 1;
if (await set.AnyAsync())
{
id = set.Max(selector) + 1;
}
return id;
}
public override async Task<int> AddNewRound(params Guid[] playerIds) public override async Task<int> AddNewRound(params Guid[] playerIds)
{ {
await using var db = await GetDb(); await using var db = await GetDb();
@@ -270,9 +256,15 @@ namespace Content.Server.Database
.Where(player => playerIds.Contains(player.UserId)) .Where(player => playerIds.Contains(player.UserId))
.ToListAsync(); .ToListAsync();
var nextId = 1;
if (await db.DbContext.Round.AnyAsync())
{
nextId = db.DbContext.Round.Max(round => round.Id) + 1;
}
var round = new Round var round = new Round
{ {
Id = await NextId(db.DbContext.Round, round => round.Id), Id = nextId,
Players = players Players = players
}; };
@@ -287,7 +279,12 @@ namespace Content.Server.Database
{ {
await using var db = await GetDb(); await using var db = await GetDb();
var nextId = await NextId(db.DbContext.AdminLog, log => log.Id); var nextId = 1;
if (await db.DbContext.AdminLog.AnyAsync())
{
nextId = db.DbContext.AdminLog.Max(round => round.Id) + 1;
}
var entities = new Dictionary<int, AdminLogEntity>(); var entities = new Dictionary<int, AdminLogEntity>();
foreach (var (log, entityData) in logs) foreach (var (log, entityData) in logs)