mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 03:48:06 +02:00
Properly dispose
This commit is contained in:
parent
c30ba14c1f
commit
e5248cfaa2
1 changed files with 30 additions and 23 deletions
|
@ -1,7 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
@ -28,7 +27,7 @@ namespace Emby.Server.Implementations.Data
|
||||||
|
|
||||||
internal static int ThreadSafeMode { get; set; }
|
internal static int ThreadSafeMode { get; set; }
|
||||||
|
|
||||||
protected virtual ConnectionFlags DefaultConnectionFlags => ConnectionFlags.SharedCached | ConnectionFlags.FullMutex;
|
protected virtual ConnectionFlags DefaultConnectionFlags => ConnectionFlags.SharedCached | ConnectionFlags.NoMutex;
|
||||||
|
|
||||||
private readonly SemaphoreSlim WriteLock = new SemaphoreSlim(1, 1);
|
private readonly SemaphoreSlim WriteLock = new SemaphoreSlim(1, 1);
|
||||||
|
|
||||||
|
@ -39,6 +38,7 @@ namespace Emby.Server.Implementations.Data
|
||||||
static BaseSqliteRepository()
|
static BaseSqliteRepository()
|
||||||
{
|
{
|
||||||
ThreadSafeMode = raw.sqlite3_threadsafe();
|
ThreadSafeMode = raw.sqlite3_threadsafe();
|
||||||
|
raw.sqlite3_enable_shared_cache(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
private string _defaultWal;
|
private string _defaultWal;
|
||||||
|
@ -55,6 +55,7 @@ namespace Emby.Server.Implementations.Data
|
||||||
DbFilePath,
|
DbFilePath,
|
||||||
DefaultConnectionFlags | ConnectionFlags.Create | ConnectionFlags.ReadWrite,
|
DefaultConnectionFlags | ConnectionFlags.Create | ConnectionFlags.ReadWrite,
|
||||||
null);
|
null);
|
||||||
|
SQLiteDatabaseConnectionBuilder.InMemory.
|
||||||
}
|
}
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(_defaultWal))
|
if (string.IsNullOrWhiteSpace(_defaultWal))
|
||||||
|
@ -110,34 +111,22 @@ namespace Emby.Server.Implementations.Data
|
||||||
}
|
}
|
||||||
|
|
||||||
public IStatement PrepareStatement(ManagedConnection connection, string sql)
|
public IStatement PrepareStatement(ManagedConnection connection, string sql)
|
||||||
{
|
=> connection.PrepareStatement(sql);
|
||||||
return connection.PrepareStatement(sql);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IStatement PrepareStatementSafe(ManagedConnection connection, string sql)
|
public IStatement PrepareStatementSafe(ManagedConnection connection, string sql)
|
||||||
{
|
=> connection.PrepareStatement(sql);
|
||||||
return connection.PrepareStatement(sql);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IStatement PrepareStatement(IDatabaseConnection connection, string sql)
|
public IStatement PrepareStatement(IDatabaseConnection connection, string sql)
|
||||||
{
|
=> connection.PrepareStatement(sql);
|
||||||
return connection.PrepareStatement(sql);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IStatement PrepareStatementSafe(IDatabaseConnection connection, string sql)
|
public IStatement PrepareStatementSafe(IDatabaseConnection connection, string sql)
|
||||||
{
|
=> connection.PrepareStatement(sql);
|
||||||
return connection.PrepareStatement(sql);
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<IStatement> PrepareAll(IDatabaseConnection connection, IEnumerable<string> sql)
|
public IEnumerable<IStatement> PrepareAll(IDatabaseConnection connection, IEnumerable<string> sql)
|
||||||
{
|
=> PrepareAllSafe(connection, sql);
|
||||||
return PrepareAllSafe(connection, sql);
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<IStatement> PrepareAllSafe(IDatabaseConnection connection, IEnumerable<string> sql)
|
public IEnumerable<IStatement> PrepareAllSafe(IDatabaseConnection connection, IEnumerable<string> sql)
|
||||||
{
|
=> sql.Select(connection.PrepareStatement);
|
||||||
return sql.Select(connection.PrepareStatement).ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected bool TableExists(ManagedConnection connection, string name)
|
protected bool TableExists(ManagedConnection connection, string name)
|
||||||
{
|
{
|
||||||
|
@ -201,7 +190,6 @@ namespace Emby.Server.Implementations.Data
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
|
||||||
Dispose(true);
|
Dispose(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -218,6 +206,25 @@ namespace Emby.Server.Implementations.Data
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (dispose)
|
||||||
|
{
|
||||||
|
WriteLock.Wait();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
WriteConnection.Dispose();
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
WriteLock.Release();
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var i in ReadConnectionPool)
|
||||||
|
{
|
||||||
|
i.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
ReadConnectionPool.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
_disposed = true;
|
_disposed = true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue