Fix database connection pool contention (maybe)
Instead of acquiring a connection per service per request, we acquire connections more often but at a more granular level, meaning they're also disposed of more quickly instead of staying for a long time in case of long-running commands or leaks.
This commit is contained in:
Ske
@@ -10,81 +10,96 @@ using NodaTime;
|
||||
|
||||
namespace PluralKit {
|
||||
public class SystemStore {
|
||||
private IDbConnection conn;
|
||||
private DbConnectionFactory _conn;
|
||||
|
||||
public SystemStore(IDbConnection conn) {
|
||||
this.conn = conn;
|
||||
public SystemStore(DbConnectionFactory conn) {
|
||||
this._conn = conn;
|
||||
}
|
||||
|
||||
public async Task<PKSystem> Create(string systemName = null) {
|
||||
// TODO: handle HID collision case
|
||||
var hid = Utils.GenerateHid();
|
||||
return await conn.QuerySingleAsync<PKSystem>("insert into systems (hid, name) values (@Hid, @Name) returning *", new { Hid = hid, Name = systemName });
|
||||
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QuerySingleAsync<PKSystem>("insert into systems (hid, name) values (@Hid, @Name) returning *", new { Hid = hid, Name = systemName });
|
||||
}
|
||||
|
||||
public async Task Link(PKSystem system, ulong accountId) {
|
||||
await conn.ExecuteAsync("insert into accounts (uid, system) values (@Id, @SystemId)", new { Id = accountId, SystemId = system.Id });
|
||||
using (var conn = _conn.Obtain())
|
||||
await conn.ExecuteAsync("insert into accounts (uid, system) values (@Id, @SystemId)", new { Id = accountId, SystemId = system.Id });
|
||||
}
|
||||
|
||||
public async Task Unlink(PKSystem system, ulong accountId) {
|
||||
await conn.ExecuteAsync("delete from accounts where uid = @Id and system = @SystemId", new { Id = accountId, SystemId = system.Id });
|
||||
using (var conn = _conn.Obtain())
|
||||
await conn.ExecuteAsync("delete from accounts where uid = @Id and system = @SystemId", new { Id = accountId, SystemId = system.Id });
|
||||
}
|
||||
|
||||
public async Task<PKSystem> GetByAccount(ulong accountId) {
|
||||
return await conn.QuerySingleOrDefaultAsync<PKSystem>("select systems.* from systems, accounts where accounts.system = systems.id and accounts.uid = @Id", new { Id = accountId });
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QuerySingleOrDefaultAsync<PKSystem>("select systems.* from systems, accounts where accounts.system = systems.id and accounts.uid = @Id", new { Id = accountId });
|
||||
}
|
||||
|
||||
public async Task<PKSystem> GetByHid(string hid) {
|
||||
return await conn.QuerySingleOrDefaultAsync<PKSystem>("select * from systems where systems.hid = @Hid", new { Hid = hid.ToLower() });
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QuerySingleOrDefaultAsync<PKSystem>("select * from systems where systems.hid = @Hid", new { Hid = hid.ToLower() });
|
||||
}
|
||||
|
||||
public async Task<PKSystem> GetByToken(string token) {
|
||||
return await conn.QuerySingleOrDefaultAsync<PKSystem>("select * from systems where token = @Token", new { Token = token });
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QuerySingleOrDefaultAsync<PKSystem>("select * from systems where token = @Token", new { Token = token });
|
||||
}
|
||||
|
||||
public async Task<PKSystem> GetById(int id)
|
||||
{
|
||||
return await conn.QuerySingleOrDefaultAsync<PKSystem>("select * from systems where id = @Id", new { Id = id });
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QuerySingleOrDefaultAsync<PKSystem>("select * from systems where id = @Id", new { Id = id });
|
||||
}
|
||||
|
||||
public async Task Save(PKSystem system) {
|
||||
await conn.ExecuteAsync("update systems set name = @Name, description = @Description, tag = @Tag, avatar_url = @AvatarUrl, token = @Token, ui_tz = @UiTz where id = @Id", system);
|
||||
using (var conn = _conn.Obtain())
|
||||
await conn.ExecuteAsync("update systems set name = @Name, description = @Description, tag = @Tag, avatar_url = @AvatarUrl, token = @Token, ui_tz = @UiTz where id = @Id", system);
|
||||
}
|
||||
|
||||
public async Task Delete(PKSystem system) {
|
||||
await conn.ExecuteAsync("delete from systems where id = @Id", system);
|
||||
using (var conn = _conn.Obtain())
|
||||
await conn.ExecuteAsync("delete from systems where id = @Id", system);
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<ulong>> GetLinkedAccountIds(PKSystem system)
|
||||
{
|
||||
return await conn.QueryAsync<ulong>("select uid from accounts where system = @Id", new { Id = system.Id });
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QueryAsync<ulong>("select uid from accounts where system = @Id", new { Id = system.Id });
|
||||
}
|
||||
}
|
||||
|
||||
public class MemberStore {
|
||||
private IDbConnection conn;
|
||||
private DbConnectionFactory _conn;
|
||||
|
||||
public MemberStore(IDbConnection conn) {
|
||||
this.conn = conn;
|
||||
public MemberStore(DbConnectionFactory conn) {
|
||||
this._conn = conn;
|
||||
}
|
||||
|
||||
public async Task<PKMember> Create(PKSystem system, string name) {
|
||||
// TODO: handle collision
|
||||
var hid = Utils.GenerateHid();
|
||||
return await conn.QuerySingleAsync<PKMember>("insert into members (hid, system, name) values (@Hid, @SystemId, @Name) returning *", new {
|
||||
Hid = hid,
|
||||
SystemID = system.Id,
|
||||
Name = name
|
||||
});
|
||||
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QuerySingleAsync<PKMember>("insert into members (hid, system, name) values (@Hid, @SystemId, @Name) returning *", new {
|
||||
Hid = hid,
|
||||
SystemID = system.Id,
|
||||
Name = name
|
||||
});
|
||||
}
|
||||
|
||||
public async Task<PKMember> GetByHid(string hid) {
|
||||
return await conn.QuerySingleOrDefaultAsync<PKMember>("select * from members where hid = @Hid", new { Hid = hid.ToLower() });
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QuerySingleOrDefaultAsync<PKMember>("select * from members where hid = @Hid", new { Hid = hid.ToLower() });
|
||||
}
|
||||
|
||||
public async Task<PKMember> GetByName(PKSystem system, string name) {
|
||||
// QueryFirst, since members can (in rare cases) share names
|
||||
return await conn.QueryFirstOrDefaultAsync<PKMember>("select * from members where lower(name) = lower(@Name) and system = @SystemID", new { Name = name, SystemID = system.Id });
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QueryFirstOrDefaultAsync<PKMember>("select * from members where lower(name) = lower(@Name) and system = @SystemID", new { Name = name, SystemID = system.Id });
|
||||
}
|
||||
|
||||
public async Task<ICollection<PKMember>> GetUnproxyableMembers(PKSystem system) {
|
||||
@@ -96,20 +111,24 @@ namespace PluralKit {
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<PKMember>> GetBySystem(PKSystem system) {
|
||||
return await conn.QueryAsync<PKMember>("select * from members where system = @SystemID", new { SystemID = system.Id });
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QueryAsync<PKMember>("select * from members where system = @SystemID", new { SystemID = system.Id });
|
||||
}
|
||||
|
||||
public async Task Save(PKMember member) {
|
||||
await conn.ExecuteAsync("update members set name = @Name, description = @Description, color = @Color, avatar_url = @AvatarUrl, birthday = @Birthday, pronouns = @Pronouns, prefix = @Prefix, suffix = @Suffix where id = @Id", member);
|
||||
using (var conn = _conn.Obtain())
|
||||
await conn.ExecuteAsync("update members set name = @Name, description = @Description, color = @Color, avatar_url = @AvatarUrl, birthday = @Birthday, pronouns = @Pronouns, prefix = @Prefix, suffix = @Suffix where id = @Id", member);
|
||||
}
|
||||
|
||||
public async Task Delete(PKMember member) {
|
||||
await conn.ExecuteAsync("delete from members where id = @Id", member);
|
||||
using (var conn = _conn.Obtain())
|
||||
await conn.ExecuteAsync("delete from members where id = @Id", member);
|
||||
}
|
||||
|
||||
public async Task<int> MessageCount(PKMember member)
|
||||
{
|
||||
return await conn.QuerySingleAsync<int>("select count(*) from messages where member = @Id", member);
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QuerySingleAsync<int>("select count(*) from messages where member = @Id", member);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,59 +146,63 @@ namespace PluralKit {
|
||||
public PKSystem System;
|
||||
}
|
||||
|
||||
private IDbConnection _connection;
|
||||
private DbConnectionFactory _conn;
|
||||
|
||||
public MessageStore(IDbConnection connection) {
|
||||
this._connection = connection;
|
||||
public MessageStore(DbConnectionFactory conn) {
|
||||
this._conn = conn;
|
||||
}
|
||||
|
||||
public async Task Store(ulong senderId, ulong messageId, ulong channelId, PKMember member) {
|
||||
await _connection.ExecuteAsync("insert into messages(mid, channel, member, sender) values(@MessageId, @ChannelId, @MemberId, @SenderId)", new {
|
||||
MessageId = messageId,
|
||||
ChannelId = channelId,
|
||||
MemberId = member.Id,
|
||||
SenderId = senderId
|
||||
});
|
||||
using (var conn = _conn.Obtain())
|
||||
await conn.ExecuteAsync("insert into messages(mid, channel, member, sender) values(@MessageId, @ChannelId, @MemberId, @SenderId)", new {
|
||||
MessageId = messageId,
|
||||
ChannelId = channelId,
|
||||
MemberId = member.Id,
|
||||
SenderId = senderId
|
||||
});
|
||||
}
|
||||
|
||||
public async Task<StoredMessage> Get(ulong id)
|
||||
{
|
||||
return (await _connection.QueryAsync<PKMessage, PKMember, PKSystem, StoredMessage>("select messages.*, members.*, systems.* from messages, members, systems where mid = @Id and messages.member = members.id and systems.id = members.system", (msg, member, system) => new StoredMessage
|
||||
{
|
||||
Message = msg,
|
||||
System = system,
|
||||
Member = member
|
||||
}, new { Id = id })).FirstOrDefault();
|
||||
using (var conn = _conn.Obtain())
|
||||
return (await conn.QueryAsync<PKMessage, PKMember, PKSystem, StoredMessage>("select messages.*, members.*, systems.* from messages, members, systems where mid = @Id and messages.member = members.id and systems.id = members.system", (msg, member, system) => new StoredMessage
|
||||
{
|
||||
Message = msg,
|
||||
System = system,
|
||||
Member = member
|
||||
}, new { Id = id })).FirstOrDefault();
|
||||
}
|
||||
|
||||
public async Task Delete(ulong id) {
|
||||
await _connection.ExecuteAsync("delete from messages where mid = @Id", new { Id = id });
|
||||
using (var conn = _conn.Obtain())
|
||||
await conn.ExecuteAsync("delete from messages where mid = @Id", new { Id = id });
|
||||
}
|
||||
}
|
||||
|
||||
public class SwitchStore
|
||||
{
|
||||
private IDbConnection _connection;
|
||||
private DbConnectionFactory _conn;
|
||||
|
||||
public SwitchStore(IDbConnection connection)
|
||||
public SwitchStore(DbConnectionFactory conn)
|
||||
{
|
||||
_connection = connection;
|
||||
_conn = conn;
|
||||
}
|
||||
|
||||
public async Task RegisterSwitch(PKSystem system, IEnumerable<PKMember> members)
|
||||
{
|
||||
// Use a transaction here since we're doing multiple executed commands in one
|
||||
using (var tx = _connection.BeginTransaction())
|
||||
using (var conn = _conn.Obtain())
|
||||
using (var tx = conn.BeginTransaction())
|
||||
{
|
||||
// First, we insert the switch itself
|
||||
var sw = await _connection.QuerySingleAsync<PKSwitch>("insert into switches(system) values (@System) returning *",
|
||||
var sw = await conn.QuerySingleAsync<PKSwitch>("insert into switches(system) values (@System) returning *",
|
||||
new {System = system.Id});
|
||||
|
||||
// Then we insert each member in the switch in the switch_members table
|
||||
// TODO: can we parallelize this or send it in bulk somehow?
|
||||
foreach (var member in members)
|
||||
{
|
||||
await _connection.ExecuteAsync(
|
||||
await conn.ExecuteAsync(
|
||||
"insert into switch_members(switch, member) values(@Switch, @Member)",
|
||||
new {Switch = sw.Id, Member = member.Id});
|
||||
}
|
||||
@@ -193,33 +216,38 @@ namespace PluralKit {
|
||||
{
|
||||
// TODO: refactor the PKSwitch data structure to somehow include a hydrated member list
|
||||
// (maybe when we get caching in?)
|
||||
return await _connection.QueryAsync<PKSwitch>("select * from switches where system = @System order by timestamp desc limit @Count", new {System = system.Id, Count = count});
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QueryAsync<PKSwitch>("select * from switches where system = @System order by timestamp desc limit @Count", new {System = system.Id, Count = count});
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<int>> GetSwitchMemberIds(PKSwitch sw)
|
||||
{
|
||||
return await _connection.QueryAsync<int>("select member from switch_members where switch = @Switch",
|
||||
new {Switch = sw.Id});
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QueryAsync<int>("select member from switch_members where switch = @Switch",
|
||||
new {Switch = sw.Id});
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<PKMember>> GetSwitchMembers(PKSwitch sw)
|
||||
{
|
||||
return await _connection.QueryAsync<PKMember>(
|
||||
"select * from switch_members, members where switch_members.member = members.id and switch_members.switch = @Switch",
|
||||
new {Switch = sw.Id});
|
||||
using (var conn = _conn.Obtain())
|
||||
return await conn.QueryAsync<PKMember>(
|
||||
"select * from switch_members, members where switch_members.member = members.id and switch_members.switch = @Switch",
|
||||
new {Switch = sw.Id});
|
||||
}
|
||||
|
||||
public async Task<PKSwitch> GetLatestSwitch(PKSystem system) => (await GetSwitches(system, 1)).FirstOrDefault();
|
||||
|
||||
public async Task MoveSwitch(PKSwitch sw, Instant time)
|
||||
{
|
||||
await _connection.ExecuteAsync("update switches set timestamp = @Time where id = @Id",
|
||||
new {Time = time, Id = sw.Id});
|
||||
using (var conn = _conn.Obtain())
|
||||
await conn.ExecuteAsync("update switches set timestamp = @Time where id = @Id",
|
||||
new {Time = time, Id = sw.Id});
|
||||
}
|
||||
|
||||
public async Task DeleteSwitch(PKSwitch sw)
|
||||
{
|
||||
await _connection.ExecuteAsync("delete from switches where id = @Id", new {Id = sw.Id});
|
||||
using (var conn = _conn.Obtain())
|
||||
await conn.ExecuteAsync("delete from switches where id = @Id", new {Id = sw.Id});
|
||||
}
|
||||
|
||||
public struct SwitchListEntry
|
||||
@@ -242,11 +270,15 @@ namespace PluralKit {
|
||||
// query DB for all members involved in any of the switches above and collect into a dictionary for future use
|
||||
// this makes sure the return list has the same instances of PKMember throughout, which is important for the dictionary
|
||||
// key used in GetPerMemberSwitchDuration below
|
||||
var memberObjects = (await _connection.QueryAsync<PKMember>(
|
||||
"select distinct members.* from members, switch_members where switch_members.switch = any(@Switches) and switch_members.member = members.id", // lol postgres specific `= any()` syntax
|
||||
new {Switches = switchesInRange.Select(sw => sw.Id).ToList()}))
|
||||
.ToDictionary(m => m.Id);
|
||||
|
||||
Dictionary<int, PKMember> memberObjects;
|
||||
using (var conn = _conn.Obtain())
|
||||
{
|
||||
memberObjects = (await conn.QueryAsync<PKMember>(
|
||||
"select distinct members.* from members, switch_members where switch_members.switch = any(@Switches) and switch_members.member = members.id", // lol postgres specific `= any()` syntax
|
||||
new {Switches = switchesInRange.Select(sw => sw.Id).ToList()}))
|
||||
.ToDictionary(m => m.Id);
|
||||
}
|
||||
|
||||
|
||||
// we create the entry objects
|
||||
var outList = new List<SwitchListEntry>();
|
||||
|
||||
@@ -333,4 +333,19 @@ namespace PluralKit
|
||||
return (T) value;
|
||||
}
|
||||
}
|
||||
|
||||
public class DbConnectionFactory
|
||||
{
|
||||
private string _connectionString;
|
||||
|
||||
public DbConnectionFactory(string connectionString)
|
||||
{
|
||||
_connectionString = connectionString;
|
||||
}
|
||||
|
||||
public IDbConnection Obtain()
|
||||
{
|
||||
return new NpgsqlConnection(_connectionString);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user