Przeglądaj źródła

Merge pull request #7411 from jellyfin/revert-7240-add-readonly-connection

Cody Robibero 3 lat temu
rodzic
commit
1dcd537ea2

+ 0 - 8
Emby.Server.Implementations/Data/BaseSqliteRepository.cs

@@ -98,16 +98,8 @@ namespace Emby.Server.Implementations.Data
         /// <value>The write connection.</value>
         protected SQLiteDatabaseConnection WriteConnection { get; set; }
 
-        protected SQLiteDatabaseConnection ReadConnection { get; set; }
-
         protected ManagedConnection GetConnection(bool readOnly = false)
         {
-            if (readOnly)
-            {
-                ReadConnection ??= SQLite3.Open(DbFilePath, ConnectionFlags.ReadOnly, null);
-                return new ManagedConnection(ReadConnection, null);
-            }
-
             WriteLock.Wait();
             if (WriteConnection != null)
             {

+ 4 - 4
Emby.Server.Implementations/Data/ManagedConnection.cs

@@ -9,13 +9,13 @@ namespace Emby.Server.Implementations.Data
 {
     public sealed class ManagedConnection : IDisposable
     {
-        private readonly SemaphoreSlim? _writeLock;
+        private readonly SemaphoreSlim _writeLock;
 
         private SQLiteDatabaseConnection? _db;
 
-        private bool _disposed;
+        private bool _disposed = false;
 
-        public ManagedConnection(SQLiteDatabaseConnection db, SemaphoreSlim? writeLock)
+        public ManagedConnection(SQLiteDatabaseConnection db, SemaphoreSlim writeLock)
         {
             _db = db;
             _writeLock = writeLock;
@@ -73,7 +73,7 @@ namespace Emby.Server.Implementations.Data
                 return;
             }
 
-            _writeLock?.Release();
+            _writeLock.Release();
 
             _db = null; // Don't dispose it
             _disposed = true;