From cec22ad10daf7abef2f27f846e4022d5a35faccf Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Wed, 20 Feb 2019 14:26:49 +0100
Subject: Simplify db code

---
 .../Data/SqliteUserRepository.cs                   | 96 +++++++++-------------
 1 file changed, 39 insertions(+), 57 deletions(-)

(limited to 'Emby.Server.Implementations/Data/SqliteUserRepository.cs')

diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index 5957b2903..785452ad3 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -60,7 +60,7 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
-        private void TryMigrateToLocalUsersTable(ManagedConnection connection)
+        private void TryMigrateToLocalUsersTable(SQLiteDatabaseConnection connection)
         {
             try
             {
@@ -119,31 +119,28 @@ namespace Emby.Server.Implementations.Data
 
             var serialized = _jsonSerializer.SerializeToBytes(user);
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                connection.RunInTransaction(db =>
                 {
-                    connection.RunInTransaction(db =>
+                    using (var statement = db.PrepareStatement("insert into LocalUsersv2 (guid, data) values (@guid, @data)"))
                     {
-                        using (var statement = db.PrepareStatement("insert into LocalUsersv2 (guid, data) values (@guid, @data)"))
-                        {
-                            statement.TryBind("@guid", user.Id.ToGuidBlob());
-                            statement.TryBind("@data", serialized);
+                        statement.TryBind("@guid", user.Id.ToGuidBlob());
+                        statement.TryBind("@data", serialized);
 
-                            statement.MoveNext();
-                        }
+                        statement.MoveNext();
+                    }
 
-                        var createdUser = GetUser(user.Id, false);
+                    var createdUser = GetUser(user.Id, connection);
 
-                        if (createdUser == null)
-                        {
-                            throw new ApplicationException("created user should never be null");
-                        }
+                    if (createdUser == null)
+                    {
+                        throw new ApplicationException("created user should never be null");
+                    }
 
-                        user.InternalId = createdUser.InternalId;
+                    user.InternalId = createdUser.InternalId;
 
-                    }, TransactionMode);
-                }
+                }, TransactionMode);
             }
         }
 
@@ -156,39 +153,30 @@ namespace Emby.Server.Implementations.Data
 
             var serialized = _jsonSerializer.SerializeToBytes(user);
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                connection.RunInTransaction(db =>
                 {
-                    connection.RunInTransaction(db =>
+                    using (var statement = db.PrepareStatement("update LocalUsersv2 set data=@data where Id=@InternalId"))
                     {
-                        using (var statement = db.PrepareStatement("update LocalUsersv2 set data=@data where Id=@InternalId"))
-                        {
-                            statement.TryBind("@InternalId", user.InternalId);
-                            statement.TryBind("@data", serialized);
-                            statement.MoveNext();
-                        }
+                        statement.TryBind("@InternalId", user.InternalId);
+                        statement.TryBind("@data", serialized);
+                        statement.MoveNext();
+                    }
 
-                    }, TransactionMode);
-                }
+                }, TransactionMode);
             }
         }
 
-        private User GetUser(Guid guid, bool openLock)
+        private User GetUser(Guid guid, SQLiteDatabaseConnection connection)
         {
-            using (openLock ? WriteLock.Read() : null)
+            using (var statement = connection.PrepareStatement("select id,guid,data from LocalUsersv2 where guid=@guid"))
             {
-                using (var connection = CreateConnection(true))
-                {
-                    using (var statement = connection.PrepareStatement("select id,guid,data from LocalUsersv2 where guid=@guid"))
-                    {
-                        statement.TryBind("@guid", guid);
+                statement.TryBind("@guid", guid);
 
-                        foreach (var row in statement.ExecuteQuery())
-                        {
-                            return GetUser(row);
-                        }
-                    }
+                foreach (var row in statement.ExecuteQuery())
+                {
+                    return GetUser(row);
                 }
             }
 
@@ -218,14 +206,11 @@ namespace Emby.Server.Implementations.Data
         {
             var list = new List<User>();
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                foreach (var row in connection.Query("select id,guid,data from LocalUsersv2"))
                 {
-                    foreach (var row in connection.Query("select id,guid,data from LocalUsersv2"))
-                    {
-                        list.Add(GetUser(row));
-                    }
+                    list.Add(GetUser(row));
                 }
             }
 
@@ -245,19 +230,16 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException(nameof(user));
             }
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                connection.RunInTransaction(db =>
                 {
-                    connection.RunInTransaction(db =>
+                    using (var statement = db.PrepareStatement("delete from LocalUsersv2 where Id=@id"))
                     {
-                        using (var statement = db.PrepareStatement("delete from LocalUsersv2 where Id=@id"))
-                        {
-                            statement.TryBind("@id", user.InternalId);
-                            statement.MoveNext();
-                        }
-                    }, TransactionMode);
-                }
+                        statement.TryBind("@id", user.InternalId);
+                        statement.MoveNext();
+                    }
+                }, TransactionMode);
             }
         }
     }
-- 
cgit v1.2.3


From c30ba14c1f9701638bbb47e81d3e7027cb778135 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Tue, 26 Feb 2019 18:30:13 +0100
Subject: Use a connection pool instead of creating new connections

---
 .../Activity/ActivityRepository.cs                 |  11 +-
 .../Data/BaseSqliteRepository.cs                   | 114 ++++++++++-----------
 .../Data/ManagedConnection.cs                      |  87 ++++++++++++++++
 .../Data/SqliteDisplayPreferencesRepository.cs     |  11 +-
 .../Data/SqliteItemRepository.cs                   |  47 +++++----
 .../Data/SqliteUserDataRepository.cs               |  11 +-
 .../Data/SqliteUserRepository.cs                   |  15 +--
 .../Security/AuthenticationRepository.cs           |  17 +--
 8 files changed, 199 insertions(+), 114 deletions(-)
 create mode 100644 Emby.Server.Implementations/Data/ManagedConnection.cs

(limited to 'Emby.Server.Implementations/Data/SqliteUserRepository.cs')

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 495d96977..a38cb38d7 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -43,7 +43,8 @@ namespace Emby.Server.Implementations.Activity
 
         private void InitializeInternal()
         {
-            using (var connection = CreateConnection())
+            CreateConnections().GetAwaiter().GetResult();
+            using (var connection = GetConnection())
             {
                 RunDefaultInitialization(connection);
 
@@ -57,7 +58,7 @@ namespace Emby.Server.Implementations.Activity
             }
         }
 
-        private void TryMigrate(SQLiteDatabaseConnection connection)
+        private void TryMigrate(ManagedConnection connection)
         {
             try
             {
@@ -85,7 +86,7 @@ namespace Emby.Server.Implementations.Activity
                 throw new ArgumentNullException(nameof(entry));
             }
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -123,7 +124,7 @@ namespace Emby.Server.Implementations.Activity
                 throw new ArgumentNullException(nameof(entry));
             }
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -157,7 +158,7 @@ namespace Emby.Server.Implementations.Activity
 
         public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
         {
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 var commandText = BaseActivitySelectText;
                 var whereClauses = new List<string>();
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 29edddb3a..6a19ea373 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -27,98 +28,93 @@ namespace Emby.Server.Implementations.Data
 
         internal static int ThreadSafeMode { get; set; }
 
+        protected virtual ConnectionFlags DefaultConnectionFlags => ConnectionFlags.SharedCached | ConnectionFlags.FullMutex;
+
+        private readonly SemaphoreSlim WriteLock = new SemaphoreSlim(1, 1);
+
+        private SQLiteDatabaseConnection WriteConnection;
+
+        private readonly BlockingCollection<SQLiteDatabaseConnection> ReadConnectionPool = new BlockingCollection<SQLiteDatabaseConnection>();
+
         static BaseSqliteRepository()
         {
             ThreadSafeMode = raw.sqlite3_threadsafe();
         }
 
-        private static bool _versionLogged;
-
         private string _defaultWal;
 
-        protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false)
+        protected async Task CreateConnections()
         {
-            if (!_versionLogged)
-            {
-                _versionLogged = true;
-                Logger.LogInformation("Sqlite version: " + SQLite3.Version);
-                Logger.LogInformation("Sqlite compiler options: " + string.Join(",", SQLite3.CompilerOptions));
-            }
-
-            ConnectionFlags connectionFlags;
-
-            if (isReadOnly)
-            {
-                //Logger.LogInformation("Opening read connection");
-                //connectionFlags = ConnectionFlags.Create;
-                connectionFlags = ConnectionFlags.ReadOnly;
-            }
-            else
-            {
-                //Logger.LogInformation("Opening write connection");
-                connectionFlags = ConnectionFlags.Create;
-                connectionFlags |= ConnectionFlags.ReadWrite;
-            }
-
-            connectionFlags |= ConnectionFlags.SharedCached;
-            connectionFlags |= ConnectionFlags.FullMutex;
-
-            var db = SQLite3.Open(DbFilePath, connectionFlags, null);
+            await WriteLock.WaitAsync().ConfigureAwait(false);
 
             try
             {
-                if (string.IsNullOrWhiteSpace(_defaultWal))
+                if (WriteConnection == null)
                 {
-                    _defaultWal = db.Query("PRAGMA journal_mode").SelectScalarString().First();
-
-                    Logger.LogInformation("Default journal_mode for {0} is {1}", DbFilePath, _defaultWal);
+                    WriteConnection = SQLite3.Open(
+                                                DbFilePath,
+                                                DefaultConnectionFlags | ConnectionFlags.Create | ConnectionFlags.ReadWrite,
+                                                null);
                 }
 
-                var queries = new List<string>
+                if (string.IsNullOrWhiteSpace(_defaultWal))
                 {
-                    //"PRAGMA cache size=-10000"
-                    //"PRAGMA read_uncommitted = true",
-                    //"PRAGMA synchronous=Normal"
-                };
+                    _defaultWal = WriteConnection.Query("PRAGMA journal_mode").SelectScalarString().First();
 
-                if (CacheSize.HasValue)
-                {
-                    queries.Add("PRAGMA cache_size=" + CacheSize.Value.ToString(CultureInfo.InvariantCulture));
+                    Logger.LogInformation("Default journal_mode for {0} is {1}", DbFilePath, _defaultWal);
                 }
 
                 if (EnableTempStoreMemory)
                 {
-                    queries.Add("PRAGMA temp_store = memory");
+                    WriteConnection.Execute("PRAGMA temp_store = memory");
                 }
                 else
                 {
-                    queries.Add("PRAGMA temp_store = file");
-                }
-
-                foreach (var query in queries)
-                {
-                    db.Execute(query);
+                    WriteConnection.Execute("PRAGMA temp_store = file");
                 }
             }
             catch
             {
-                using (db)
-                {
-
-                }
 
                 throw;
             }
+            finally
+            {
+                WriteLock.Release();
+            }
 
-            return db;
+            // Add one reading connection for each thread
+            int threads = System.Environment.ProcessorCount;
+            for (int i = 0; i <= threads; i++)
+            {
+                ReadConnectionPool.Add(SQLite3.Open(DbFilePath, DefaultConnectionFlags | ConnectionFlags.ReadOnly, null));
+            }
         }
 
-        public IStatement PrepareStatement(SQLiteDatabaseConnection connection, string sql)
+        protected ManagedConnection GetConnection(bool isReadOnly = false)
+        {
+            if (isReadOnly)
+            {
+                return new ManagedConnection(ReadConnectionPool.Take(), ReadConnectionPool);
+            }
+            else
+            {
+                if (WriteConnection == null)
+                {
+                    throw new InvalidOperationException("Can't access the write connection at this time.");
+                }
+
+                WriteLock.Wait();
+                return new ManagedConnection(WriteConnection, WriteLock);
+            }
+        }
+
+        public IStatement PrepareStatement(ManagedConnection connection, string sql)
         {
             return connection.PrepareStatement(sql);
         }
 
-        public IStatement PrepareStatementSafe(SQLiteDatabaseConnection connection, string sql)
+        public IStatement PrepareStatementSafe(ManagedConnection connection, string sql)
         {
             return connection.PrepareStatement(sql);
         }
@@ -143,7 +139,7 @@ namespace Emby.Server.Implementations.Data
             return sql.Select(connection.PrepareStatement).ToList();
         }
 
-        protected bool TableExists(SQLiteDatabaseConnection connection, string name)
+        protected bool TableExists(ManagedConnection connection, string name)
         {
             return connection.RunInTransaction(db =>
             {
@@ -163,7 +159,7 @@ namespace Emby.Server.Implementations.Data
             }, ReadTransactionMode);
         }
 
-        protected void RunDefaultInitialization(SQLiteDatabaseConnection db)
+        protected void RunDefaultInitialization(ManagedConnection db)
         {
             var queries = new List<string>
             {
@@ -192,9 +188,7 @@ namespace Emby.Server.Implementations.Data
             Logger.LogInformation("PRAGMA synchronous=" + db.Query("PRAGMA synchronous").SelectScalarString().First());
         }
 
-        protected virtual bool EnableTempStoreMemory => false;
-
-        protected virtual int? CacheSize => null;
+        protected virtual bool EnableTempStoreMemory => true;
 
         private bool _disposed;
         protected void CheckDisposed()
diff --git a/Emby.Server.Implementations/Data/ManagedConnection.cs b/Emby.Server.Implementations/Data/ManagedConnection.cs
new file mode 100644
index 000000000..71b934a9b
--- /dev/null
+++ b/Emby.Server.Implementations/Data/ManagedConnection.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading;
+using SQLitePCL.pretty;
+
+namespace Emby.Server.Implementations.Data
+{
+    public class ManagedConnection : IDisposable
+    {
+        private SQLiteDatabaseConnection _db;
+        private SemaphoreSlim _writeLock;
+        private BlockingCollection<SQLiteDatabaseConnection> _readConPool;
+        private bool _disposed = false;
+
+        public ManagedConnection(SQLiteDatabaseConnection db, SemaphoreSlim writeLock)
+        {
+            _db = db;
+            _writeLock = writeLock;
+        }
+
+        public ManagedConnection(SQLiteDatabaseConnection db, BlockingCollection<SQLiteDatabaseConnection> queue)
+        {
+            _db = db;
+            _readConPool = queue;
+        }
+
+        public IStatement PrepareStatement(string sql)
+        {
+            return _db.PrepareStatement(sql);
+        }
+
+        public IEnumerable<IStatement> PrepareAll(string sql)
+        {
+            return _db.PrepareAll(sql);
+        }
+
+        public void ExecuteAll(string sql)
+        {
+            _db.ExecuteAll(sql);
+        }
+
+        public void Execute(string sql, params object[] values)
+        {
+            _db.Execute(sql, values);
+        }
+
+        public void RunQueries(string[] sql)
+        {
+            _db.RunQueries(sql);
+        }
+
+        public void RunInTransaction(Action<IDatabaseConnection> action, TransactionMode mode)
+        {
+            _db.RunInTransaction(action, mode);
+        }
+
+        public T RunInTransaction<T>(Func<IDatabaseConnection, T> action, TransactionMode mode)
+        {
+            return _db.RunInTransaction(action, mode);
+        }
+
+        public IEnumerable<IReadOnlyList<IResultSetValue>> Query(string sql)
+        {
+            return _db.Query(sql);
+        }
+
+        public IEnumerable<IReadOnlyList<IResultSetValue>> Query(string sql, params object[] values)
+        {
+            return _db.Query(sql, values);
+        }
+
+        public void Dispose()
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            _writeLock?.Release();
+            _readConPool?.Add(_db);
+
+            _db = null; // Don't dispose it
+            _disposed = true;
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 86a7c1551..d620f3962 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -61,7 +61,8 @@ namespace Emby.Server.Implementations.Data
         /// <returns>Task.</returns>
         private void InitializeInternal()
         {
-            using (var connection = CreateConnection())
+            CreateConnections().GetAwaiter().GetResult();
+            using (var connection = GetConnection())
             {
                 RunDefaultInitialization(connection);
 
@@ -98,7 +99,7 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -139,7 +140,7 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -168,7 +169,7 @@ namespace Emby.Server.Implementations.Data
 
             var guidId = displayPreferencesId.GetMD5();
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where id = @id and userId=@userId and client=@client"))
                 {
@@ -199,7 +200,7 @@ namespace Emby.Server.Implementations.Data
         {
             var list = new List<DisplayPreferences>();
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where userId=@userId"))
                 {
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index baa5b713a..e96b6ce3a 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -92,8 +92,6 @@ namespace Emby.Server.Implementations.Data
 
         private const string ChaptersTableName = "Chapters2";
 
-        protected override int? CacheSize => 20000;
-
         protected override bool EnableTempStoreMemory => true;
 
         /// <summary>
@@ -101,7 +99,8 @@ namespace Emby.Server.Implementations.Data
         /// </summary>
         public void Initialize(SqliteUserDataRepository userDataRepo, IUserManager userManager)
         {
-            using (var connection = CreateConnection())
+            CreateConnections().GetAwaiter().GetResult();
+            using (var connection = GetConnection())
             {
                 RunDefaultInitialization(connection);
 
@@ -551,7 +550,7 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -602,7 +601,7 @@ namespace Emby.Server.Implementations.Data
                 tuples.Add((item, ancestorIds, topParent, userdataKey, inheritedTags));
             }
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -1186,7 +1185,7 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 using (var statement = PrepareStatementSafe(connection, "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"))
                 {
@@ -1899,7 +1898,7 @@ namespace Emby.Server.Implementations.Data
         {
             CheckDisposed();
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 var list = new List<ChapterInfo>();
 
@@ -1928,7 +1927,7 @@ namespace Emby.Server.Implementations.Data
         {
             CheckDisposed();
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 using (var statement = PrepareStatementSafe(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex"))
                 {
@@ -1997,7 +1996,7 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException(nameof(chapters));
             }
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -2533,7 +2532,7 @@ namespace Emby.Server.Implementations.Data
                 commandText += " where " + string.Join(" AND ", whereClauses);
             }
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 using (var statement = PrepareStatementSafe(connection, commandText))
                 {
@@ -2602,7 +2601,7 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 var list = new List<BaseItem>();
 
@@ -2820,7 +2819,7 @@ namespace Emby.Server.Implementations.Data
                 statementTexts.Add(commandText);
             }
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 return connection.RunInTransaction(db =>
                 {
@@ -3052,7 +3051,7 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 var list = new List<Guid>();
 
@@ -3119,7 +3118,7 @@ namespace Emby.Server.Implementations.Data
             }
 
             var list = new List<Tuple<Guid, string>>();
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 using (var statement = PrepareStatementSafe(connection, commandText))
                 {
@@ -3231,7 +3230,7 @@ namespace Emby.Server.Implementations.Data
                 statementTexts.Add(commandText);
             }
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 return connection.RunInTransaction(db =>
                 {
@@ -4862,7 +4861,7 @@ namespace Emby.Server.Implementations.Data
 
         private void UpdateInheritedTags(CancellationToken cancellationToken)
         {
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -4925,7 +4924,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
             CheckDisposed();
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -4982,7 +4981,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
             commandText += " order by ListOrder";
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 var list = new List<string>();
                 using (var statement = PrepareStatementSafe(connection, commandText))
@@ -5019,7 +5018,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
             commandText += " order by ListOrder";
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 var list = new List<PersonInfo>();
 
@@ -5245,7 +5244,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
             commandText += " Group By CleanValue";
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 var list = new List<string>();
 
@@ -5431,7 +5430,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
                 statementTexts.Add(countText);
             }
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 return connection.RunInTransaction(db =>
                 {
@@ -5698,7 +5697,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
             CheckDisposed();
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -5815,7 +5814,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
             cmdText += " order by StreamIndex ASC";
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 var list = new List<MediaStream>();
 
@@ -5859,7 +5858,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index f544dfac4..9dc31d597 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -34,7 +34,8 @@ namespace Emby.Server.Implementations.Data
         /// <returns>Task.</returns>
         public void Initialize(IUserManager userManager)
         {
-            using (var connection = CreateConnection())
+            CreateConnections().GetAwaiter().GetResult();
+            using (var connection = GetConnection())
             {
                 var userDatasTableExists = TableExists(connection, "UserDatas");
                 var userDataTableExists = TableExists(connection, "userdata");
@@ -172,7 +173,7 @@ namespace Emby.Server.Implementations.Data
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -240,7 +241,7 @@ namespace Emby.Server.Implementations.Data
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -275,7 +276,7 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException(nameof(key));
             }
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from UserDatas where key =@Key and userId=@UserId"))
                 {
@@ -321,7 +322,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<UserItemData>();
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from UserDatas where userId=@UserId"))
                 {
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index 785452ad3..ef8ae60b3 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -40,7 +40,8 @@ namespace Emby.Server.Implementations.Data
         /// <returns>Task.</returns>
         public void Initialize()
         {
-            using (var connection = CreateConnection())
+            CreateConnections().GetAwaiter().GetResult();
+            using (var connection = GetConnection())
             {
                 RunDefaultInitialization(connection);
 
@@ -60,7 +61,7 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
-        private void TryMigrateToLocalUsersTable(SQLiteDatabaseConnection connection)
+        private void TryMigrateToLocalUsersTable(ManagedConnection connection)
         {
             try
             {
@@ -119,7 +120,7 @@ namespace Emby.Server.Implementations.Data
 
             var serialized = _jsonSerializer.SerializeToBytes(user);
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -153,7 +154,7 @@ namespace Emby.Server.Implementations.Data
 
             var serialized = _jsonSerializer.SerializeToBytes(user);
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -168,7 +169,7 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
-        private User GetUser(Guid guid, SQLiteDatabaseConnection connection)
+        private User GetUser(Guid guid, ManagedConnection connection)
         {
             using (var statement = connection.PrepareStatement("select id,guid,data from LocalUsersv2 where guid=@guid"))
             {
@@ -206,7 +207,7 @@ namespace Emby.Server.Implementations.Data
         {
             var list = new List<User>();
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 foreach (var row in connection.Query("select id,guid,data from LocalUsersv2"))
                 {
@@ -230,7 +231,7 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException(nameof(user));
             }
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index abc23239e..dfcd6af0d 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -23,7 +23,8 @@ namespace Emby.Server.Implementations.Security
 
         public void Initialize()
         {
-            using (var connection = CreateConnection())
+            CreateConnections().GetAwaiter().GetResult();
+            using (var connection = GetConnection())
             {
                 RunDefaultInitialization(connection);
 
@@ -48,7 +49,7 @@ namespace Emby.Server.Implementations.Security
             }
         }
 
-        private void TryMigrate(SQLiteDatabaseConnection connection, bool tableNewlyCreated)
+        private void TryMigrate(ManagedConnection connection, bool tableNewlyCreated)
         {
             try
             {
@@ -87,7 +88,7 @@ namespace Emby.Server.Implementations.Security
                 throw new ArgumentNullException(nameof(info));
             }
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -119,7 +120,7 @@ namespace Emby.Server.Implementations.Security
                 throw new ArgumentNullException(nameof(info));
             }
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -151,7 +152,7 @@ namespace Emby.Server.Implementations.Security
                 throw new ArgumentNullException(nameof(info));
             }
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
@@ -248,7 +249,7 @@ namespace Emby.Server.Implementations.Security
 
             var list = new List<AuthenticationInfo>();
 
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 return connection.RunInTransaction(db =>
                 {
@@ -346,7 +347,7 @@ namespace Emby.Server.Implementations.Security
 
         public DeviceOptions GetDeviceOptions(string deviceId)
         {
-            using (var connection = CreateConnection(true))
+            using (var connection = GetConnection(true))
             {
                 return connection.RunInTransaction(db =>
                 {
@@ -378,7 +379,7 @@ namespace Emby.Server.Implementations.Security
                 throw new ArgumentNullException(nameof(options));
             }
 
-            using (var connection = CreateConnection())
+            using (var connection = GetConnection())
             {
                 connection.RunInTransaction(db =>
                 {
-- 
cgit v1.2.3


From 27c29bbb4c75d5fc5c9111c5552c37a1f137dd58 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Mon, 11 Mar 2019 22:33:27 +0100
Subject: Back to a single connection

---
 .../Activity/ActivityRepository.cs                 |  1 -
 .../Data/BaseSqliteRepository.cs                   | 80 ++++++----------------
 .../Data/ManagedConnection.cs                      | 13 +---
 .../Data/SqliteDisplayPreferencesRepository.cs     |  1 -
 .../Data/SqliteItemRepository.cs                   |  1 -
 .../Data/SqliteUserDataRepository.cs               |  1 -
 .../Data/SqliteUserRepository.cs                   |  4 +-
 .../Security/AuthenticationRepository.cs           |  1 -
 .../ScheduledTasksWebSocketListener.cs             |  1 -
 .../Session/SessionInfoWebSocketListener.cs        |  1 -
 10 files changed, 23 insertions(+), 81 deletions(-)

(limited to 'Emby.Server.Implementations/Data/SqliteUserRepository.cs')

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index a38cb38d7..63931e134 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -43,7 +43,6 @@ namespace Emby.Server.Implementations.Activity
 
         private void InitializeInternal()
         {
-            CreateConnections().GetAwaiter().GetResult();
             using (var connection = GetConnection())
             {
                 RunDefaultInitialization(connection);
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index db63f68d0..33a0b7ddf 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using SQLitePCL;
 using SQLitePCL.pretty;
@@ -33,8 +31,6 @@ namespace Emby.Server.Implementations.Data
 
         private SQLiteDatabaseConnection WriteConnection;
 
-        private readonly BlockingCollection<SQLiteDatabaseConnection> ReadConnectionPool = new BlockingCollection<SQLiteDatabaseConnection>();
-
         static BaseSqliteRepository()
         {
             ThreadSafeMode = raw.sqlite3_threadsafe();
@@ -43,70 +39,37 @@ namespace Emby.Server.Implementations.Data
 
         private string _defaultWal;
 
-        protected async Task CreateConnections()
+        protected ManagedConnection GetConnection(bool isReadOnly = false)
         {
-            await WriteLock.WaitAsync().ConfigureAwait(false);
-
-            try
+            WriteLock.Wait();
+            if (WriteConnection != null)
             {
-                if (WriteConnection == null)
-                {
-                    WriteConnection = SQLite3.Open(
-                                                DbFilePath,
-                                                DefaultConnectionFlags | ConnectionFlags.Create | ConnectionFlags.ReadWrite,
-                                                null);
-                }
+                return new ManagedConnection(WriteConnection, WriteLock);
+            }
 
-                if (string.IsNullOrWhiteSpace(_defaultWal))
-                {
-                    _defaultWal = WriteConnection.Query("PRAGMA journal_mode").SelectScalarString().First();
+            WriteConnection = SQLite3.Open(
+                DbFilePath,
+                DefaultConnectionFlags | ConnectionFlags.Create | ConnectionFlags.ReadWrite,
+                null);
 
-                    Logger.LogInformation("Default journal_mode for {0} is {1}", DbFilePath, _defaultWal);
-                }
 
-                if (EnableTempStoreMemory)
-                {
-                    WriteConnection.Execute("PRAGMA temp_store = memory");
-                }
-                else
-                {
-                    WriteConnection.Execute("PRAGMA temp_store = file");
-                }
-            }
-            catch
+            if (string.IsNullOrWhiteSpace(_defaultWal))
             {
+                _defaultWal = WriteConnection.Query("PRAGMA journal_mode").SelectScalarString().First();
 
-                throw;
-            }
-            finally
-            {
-                WriteLock.Release();
+                Logger.LogInformation("Default journal_mode for {0} is {1}", DbFilePath, _defaultWal);
             }
 
-            // Add one reading connection for each thread
-            int threads = System.Environment.ProcessorCount;
-            for (int i = 0; i <= threads; i++)
-            {
-                ReadConnectionPool.Add(SQLite3.Open(DbFilePath, DefaultConnectionFlags | ConnectionFlags.ReadOnly, null));
-            }
-        }
-
-        protected ManagedConnection GetConnection(bool isReadOnly = false)
-        {
-            if (isReadOnly)
+            if (EnableTempStoreMemory)
             {
-                return new ManagedConnection(ReadConnectionPool.Take(), ReadConnectionPool);
+                WriteConnection.Execute("PRAGMA temp_store = memory");
             }
             else
             {
-                if (WriteConnection == null)
-                {
-                    throw new InvalidOperationException("Can't access the write connection at this time.");
-                }
-
-                WriteLock.Wait();
-                return new ManagedConnection(WriteConnection, WriteLock);
+                WriteConnection.Execute("PRAGMA temp_store = file");
             }
+
+            return new ManagedConnection(WriteConnection, WriteLock);
         }
 
         public IStatement PrepareStatement(ManagedConnection connection, string sql)
@@ -217,14 +180,11 @@ namespace Emby.Server.Implementations.Data
                     WriteLock.Release();
                 }
 
-                foreach (var i in ReadConnectionPool)
-                {
-                    i.Dispose();
-                }
-
-                ReadConnectionPool.Dispose();
+                WriteLock.Dispose();
             }
 
+            WriteConnection = null;
+
             _disposed = true;
         }
 
diff --git a/Emby.Server.Implementations/Data/ManagedConnection.cs b/Emby.Server.Implementations/Data/ManagedConnection.cs
index 71b934a9b..4c3424410 100644
--- a/Emby.Server.Implementations/Data/ManagedConnection.cs
+++ b/Emby.Server.Implementations/Data/ManagedConnection.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
 using SQLitePCL.pretty;
@@ -9,8 +8,7 @@ namespace Emby.Server.Implementations.Data
     public class ManagedConnection : IDisposable
     {
         private SQLiteDatabaseConnection _db;
-        private SemaphoreSlim _writeLock;
-        private BlockingCollection<SQLiteDatabaseConnection> _readConPool;
+        private readonly SemaphoreSlim _writeLock;
         private bool _disposed = false;
 
         public ManagedConnection(SQLiteDatabaseConnection db, SemaphoreSlim writeLock)
@@ -19,12 +17,6 @@ namespace Emby.Server.Implementations.Data
             _writeLock = writeLock;
         }
 
-        public ManagedConnection(SQLiteDatabaseConnection db, BlockingCollection<SQLiteDatabaseConnection> queue)
-        {
-            _db = db;
-            _readConPool = queue;
-        }
-
         public IStatement PrepareStatement(string sql)
         {
             return _db.PrepareStatement(sql);
@@ -77,8 +69,7 @@ namespace Emby.Server.Implementations.Data
                 return;
             }
 
-            _writeLock?.Release();
-            _readConPool?.Add(_db);
+            _writeLock.Release();
 
             _db = null; // Don't dispose it
             _disposed = true;
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index d620f3962..7f8df7626 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -61,7 +61,6 @@ namespace Emby.Server.Implementations.Data
         /// <returns>Task.</returns>
         private void InitializeInternal()
         {
-            CreateConnections().GetAwaiter().GetResult();
             using (var connection = GetConnection())
             {
                 RunDefaultInitialization(connection);
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index a2f490c4a..9e96d7745 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -99,7 +99,6 @@ namespace Emby.Server.Implementations.Data
         /// </summary>
         public void Initialize(SqliteUserDataRepository userDataRepo, IUserManager userManager)
         {
-            CreateConnections().GetAwaiter().GetResult();
             using (var connection = GetConnection())
             {
                 RunDefaultInitialization(connection);
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 9dc31d597..355755014 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -34,7 +34,6 @@ namespace Emby.Server.Implementations.Data
         /// <returns>Task.</returns>
         public void Initialize(IUserManager userManager)
         {
-            CreateConnections().GetAwaiter().GetResult();
             using (var connection = GetConnection())
             {
                 var userDatasTableExists = TableExists(connection, "UserDatas");
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index ef8ae60b3..e79b3d601 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -40,7 +40,6 @@ namespace Emby.Server.Implementations.Data
         /// <returns>Task.</returns>
         public void Initialize()
         {
-            CreateConnections().GetAwaiter().GetResult();
             using (var connection = GetConnection())
             {
                 RunDefaultInitialization(connection);
@@ -90,8 +89,7 @@ namespace Emby.Server.Implementations.Data
                 user.Password = null;
                 var serialized = _jsonSerializer.SerializeToBytes(user);
 
-                using (WriteLock.Write())
-                using (var connection = CreateConnection())
+                using (var connection = GetConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index dfcd6af0d..efe56c081 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -23,7 +23,6 @@ namespace Emby.Server.Implementations.Security
 
         public void Initialize()
         {
-            CreateConnections().GetAwaiter().GetResult();
             using (var connection = GetConnection())
             {
                 RunDefaultInitialization(connection);
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
index d24a18743..d9530ffb7 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Events;
diff --git a/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs b/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
index b79e9f84b..f1a6622fb 100644
--- a/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
+++ b/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
-- 
cgit v1.2.3


From edfd2d0cd959020cdcd2196320850d28ae10094d Mon Sep 17 00:00:00 2001
From: Bond_009 <Bond.009@outlook.com>
Date: Wed, 3 Apr 2019 14:22:17 +0200
Subject: Fix startup

---
 Emby.Server.Implementations/ApplicationHost.cs     | 11 +++++----
 .../Data/SqliteUserRepository.cs                   | 27 ++++++++++------------
 2 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'Emby.Server.Implementations/Data/SqliteUserRepository.cs')

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 62cc6ec47..3aa2dbf9a 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -754,10 +754,6 @@ namespace Emby.Server.Implementations
             UserDataManager = new UserDataManager(LoggerFactory, ServerConfigurationManager, () => UserManager);
             serviceCollection.AddSingleton(UserDataManager);
 
-            UserRepository = GetUserRepository();
-            // This is only needed for disposal purposes. If removing this, make sure to have the manager handle disposing it
-            serviceCollection.AddSingleton(UserRepository);
-
             var displayPreferencesRepo = new SqliteDisplayPreferencesRepository(LoggerFactory, JsonSerializer, ApplicationPaths, FileSystemManager);
             serviceCollection.AddSingleton<IDisplayPreferencesRepository>(displayPreferencesRepo);
 
@@ -767,6 +763,8 @@ namespace Emby.Server.Implementations
             AuthenticationRepository = GetAuthenticationRepository();
             serviceCollection.AddSingleton(AuthenticationRepository);
 
+            UserRepository = GetUserRepository();
+
             UserManager = new UserManager(LoggerFactory, ServerConfigurationManager, UserRepository, XmlSerializer, NetworkManager, () => ImageProcessor, () => DtoService, this, JsonSerializer, FileSystemManager);
             serviceCollection.AddSingleton(UserManager);
 
@@ -807,7 +805,6 @@ namespace Emby.Server.Implementations
             serviceCollection.AddSingleton(TVSeriesManager);
 
             DeviceManager = new DeviceManager(AuthenticationRepository, JsonSerializer, LibraryManager, LocalizationManager, UserManager, FileSystemManager, LibraryMonitor, ServerConfigurationManager);
-
             serviceCollection.AddSingleton(DeviceManager);
 
             MediaSourceManager = new MediaSourceManager(ItemRepository, ApplicationPaths, LocalizationManager, UserManager, LibraryManager, LoggerFactory, JsonSerializer, FileSystemManager, UserDataManager, () => MediaEncoder);
@@ -1893,8 +1890,12 @@ namespace Emby.Server.Implementations
                         Logger.LogError(ex, "Error disposing {Type}", part.GetType().Name);
                     }
                 }
+
+                UserRepository.Dispose();
             }
 
+            UserRepository = null;
+
             _disposed = true;
         }
     }
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index e79b3d601..a0c6d2903 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -56,7 +56,7 @@ namespace Emby.Server.Implementations.Data
                     TryMigrateToLocalUsersTable(connection);
                 }
 
-                RemoveEmptyPasswordHashes();
+                RemoveEmptyPasswordHashes(connection);
             }
         }
 
@@ -75,10 +75,12 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
-        private void RemoveEmptyPasswordHashes()
+        private void RemoveEmptyPasswordHashes(ManagedConnection connection)
         {
-            foreach (var user in RetrieveAllUsers())
+            foreach (var row in connection.Query("select id,guid,data from LocalUsersv2"))
             {
+                var user = GetUser(row);
+
                 // If the user password is the sha1 hash of the empty string, remove it
                 if (!string.Equals(user.Password, "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709", StringComparison.Ordinal)
                     && !string.Equals(user.Password, "$SHA1$DA39A3EE5E6B4B0D3255BFEF95601890AFD80709", StringComparison.Ordinal))
@@ -89,21 +91,16 @@ namespace Emby.Server.Implementations.Data
                 user.Password = null;
                 var serialized = _jsonSerializer.SerializeToBytes(user);
 
-                using (var connection = GetConnection())
+                connection.RunInTransaction(db =>
                 {
-                    connection.RunInTransaction(db =>
+                    using (var statement = db.PrepareStatement("update LocalUsersv2 set data=@data where Id=@InternalId"))
                     {
-                        using (var statement = db.PrepareStatement("update LocalUsersv2 set data=@data where Id=@InternalId"))
-                        {
-                            statement.TryBind("@InternalId", user.InternalId);
-                            statement.TryBind("@data", serialized);
-                            statement.MoveNext();
-                        }
-
-                    }, TransactionMode);
-                }
+                        statement.TryBind("@InternalId", user.InternalId);
+                        statement.TryBind("@data", serialized);
+                        statement.MoveNext();
+                    }
+                }, TransactionMode);
             }
-
         }
 
         /// <summary>
-- 
cgit v1.2.3


From 7898af4cebe58bc11d120552594098041fff56fb Mon Sep 17 00:00:00 2001
From: Bond_009 <Bond.009@outlook.com>
Date: Wed, 3 Apr 2019 17:34:54 +0200
Subject: Reworked PRAGMA statements use

---
 .../Activity/ActivityRepository.cs                 |  2 -
 .../Data/BaseSqliteRepository.cs                   | 90 +++++++++++-----------
 .../Data/SqliteDisplayPreferencesRepository.cs     |  2 -
 .../Data/SqliteItemRepository.cs                   |  4 +-
 .../Data/SqliteUserDataRepository.cs               |  2 -
 .../Data/SqliteUserRepository.cs                   |  2 -
 .../Security/AuthenticationRepository.cs           |  2 -
 7 files changed, 45 insertions(+), 59 deletions(-)

(limited to 'Emby.Server.Implementations/Data/SqliteUserRepository.cs')

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index f8a1b32af..de46ab965 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -45,8 +45,6 @@ namespace Emby.Server.Implementations.Activity
         {
             using (var connection = GetConnection())
             {
-                RunDefaultInitialization(connection);
-
                 connection.RunQueries(new[]
                 {
                     "create table if not exists ActivityLog (Id INTEGER PRIMARY KEY, Name TEXT NOT NULL, Overview TEXT, ShortOverview TEXT, Type TEXT NOT NULL, ItemId TEXT, UserId TEXT, DateCreated DATETIME NOT NULL, LogSeverity TEXT NOT NULL)",
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index c5af156bb..4da6665c2 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -9,27 +9,37 @@ namespace Emby.Server.Implementations.Data
 {
     public abstract class BaseSqliteRepository : IDisposable
     {
-        protected string DbFilePath { get; set; }
-
-        protected ILogger Logger { get; }
+        private bool _disposed = false;
 
         protected BaseSqliteRepository(ILogger logger)
         {
             Logger = logger;
         }
 
+        protected string DbFilePath { get; set; }
+
+        protected ILogger Logger { get; }
+
+        protected virtual ConnectionFlags DefaultConnectionFlags => ConnectionFlags.NoMutex;
+
         protected TransactionMode TransactionMode => TransactionMode.Deferred;
 
         protected TransactionMode ReadTransactionMode => TransactionMode.Deferred;
 
-        protected virtual ConnectionFlags DefaultConnectionFlags => ConnectionFlags.NoMutex;
+        protected virtual int? CacheSize => null;
+
+        protected virtual string JournalMode => "WAL";
+
+        protected virtual int? PageSize => null;
+
+        protected virtual TempStoreMode TempStore => TempStoreMode.Default;
+
+        protected virtual SynchronousMode? Synchronous => null;
 
         protected SemaphoreSlim WriteLock = new SemaphoreSlim(1, 1);
 
         protected SQLiteDatabaseConnection WriteConnection;
 
-        private string _defaultWal;
-
         protected ManagedConnection GetConnection(bool _ = false)
         {
             WriteLock.Wait();
@@ -43,23 +53,28 @@ namespace Emby.Server.Implementations.Data
                 DefaultConnectionFlags | ConnectionFlags.Create | ConnectionFlags.ReadWrite,
                 null);
 
-
-            if (string.IsNullOrWhiteSpace(_defaultWal))
+            if (CacheSize.HasValue)
             {
-                _defaultWal = WriteConnection.Query("PRAGMA journal_mode").SelectScalarString().First();
+                WriteConnection.Execute("PRAGMA cache_size=" + (int)CacheSize.Value);
+            }
 
-                Logger.LogInformation("Default journal_mode for {0} is {1}", DbFilePath, _defaultWal);
+            if (!string.IsNullOrWhiteSpace(JournalMode))
+            {
+                WriteConnection.Execute("PRAGMA journal_mode=" + JournalMode);
             }
 
-            if (EnableTempStoreMemory)
+            if (Synchronous.HasValue)
             {
-                WriteConnection.Execute("PRAGMA temp_store = memory");
+                WriteConnection.Execute("PRAGMA synchronous=" + (int)Synchronous.Value);
             }
-            else
+
+            if (PageSize.HasValue)
             {
-                WriteConnection.Execute("PRAGMA temp_store = file");
+                WriteConnection.Execute("PRAGMA page_size=" + (int)PageSize.Value);
             }
 
+            WriteConnection.Execute("PRAGMA temp_store=" + (int)TempStore);
+
             return new ManagedConnection(WriteConnection, WriteLock);
         }
 
@@ -92,38 +107,6 @@ namespace Emby.Server.Implementations.Data
             }, ReadTransactionMode);
         }
 
-        protected void RunDefaultInitialization(ManagedConnection db)
-        {
-            var queries = new List<string>
-            {
-                "PRAGMA journal_mode=WAL",
-                "PRAGMA page_size=4096",
-                "PRAGMA synchronous=Normal"
-            };
-
-            if (EnableTempStoreMemory)
-            {
-                queries.AddRange(new List<string>
-                {
-                    "pragma default_temp_store = memory",
-                    "pragma temp_store = memory"
-                });
-            }
-            else
-            {
-                queries.AddRange(new List<string>
-                {
-                    "pragma temp_store = file"
-                });
-            }
-
-            db.ExecuteAll(string.Join(";", queries));
-            Logger.LogInformation("PRAGMA synchronous=" + db.Query("PRAGMA synchronous").SelectScalarString().First());
-        }
-
-        protected virtual bool EnableTempStoreMemory => true;
-
-        private bool _disposed;
         protected void CheckDisposed()
         {
             if (_disposed)
@@ -199,4 +182,19 @@ namespace Emby.Server.Implementations.Data
             connection.Execute("alter table " + table + " add column " + columnName + " " + type + " NULL");
         }
     }
+
+    public enum SynchronousMode
+    {
+        Off = 0,
+        Normal = 1,
+        Full = 2,
+        Extra = 3
+    }
+
+    public enum TempStoreMode
+    {
+        Default = 0,
+        File = 1,
+        Memory = 2
+    }
 }
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 1d44b0b29..01ef9851d 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -63,8 +63,6 @@ namespace Emby.Server.Implementations.Data
         {
             using (var connection = GetConnection())
             {
-                RunDefaultInitialization(connection);
-
                 string[] queries = {
 
                     "create table if not exists userdisplaypreferences (id GUID NOT NULL, userId GUID NOT NULL, client text NOT NULL, data BLOB NOT NULL)",
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 5dc104347..8a56e16bb 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -92,7 +92,7 @@ namespace Emby.Server.Implementations.Data
 
         private const string ChaptersTableName = "Chapters2";
 
-        protected override bool EnableTempStoreMemory => true;
+        protected override TempStoreMode TempStore => TempStoreMode.Memory;
 
         /// <summary>
         /// Opens the connection to the database
@@ -101,8 +101,6 @@ namespace Emby.Server.Implementations.Data
         {
             using (var connection = GetConnection())
             {
-                RunDefaultInitialization(connection);
-
                 const string createMediaStreamsTableCommand
                     = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, TimeBase TEXT NULL, CodecTimeBase TEXT NULL, ColorPrimaries TEXT NULL, ColorSpace TEXT NULL, ColorTransfer TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))";
 
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 0580203c5..4035bb99d 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -128,8 +128,6 @@ namespace Emby.Server.Implementations.Data
             return list;
         }
 
-        protected override bool EnableTempStoreMemory => true;
-
         /// <summary>
         /// Saves the user data.
         /// </summary>
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index a0c6d2903..cd364e7f4 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -42,8 +42,6 @@ namespace Emby.Server.Implementations.Data
         {
             using (var connection = GetConnection())
             {
-                RunDefaultInitialization(connection);
-
                 var localUsersTableExists = TableExists(connection, "LocalUsersv2");
 
                 connection.RunQueries(new[] {
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index c8ecd7e6e..545e11bf9 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -25,8 +25,6 @@ namespace Emby.Server.Implementations.Security
         {
             using (var connection = GetConnection())
             {
-                RunDefaultInitialization(connection);
-
                 var tableNewlyCreated = !TableExists(connection, "Tokens");
 
                 string[] queries = {
-- 
cgit v1.2.3


From d961278b3dcab57910b260115cd45d9831e6443e Mon Sep 17 00:00:00 2001
From: Bond_009 <Bond.009@outlook.com>
Date: Wed, 3 Apr 2019 18:15:04 +0200
Subject: Reduce amount of raw sql

---
 .../Data/SqliteUserRepository.cs                   | 23 ++++++------
 Emby.Server.Implementations/Library/UserManager.cs | 42 +++++++++++-----------
 2 files changed, 34 insertions(+), 31 deletions(-)

(limited to 'Emby.Server.Implementations/Data/SqliteUserRepository.cs')

diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index cd364e7f4..de2354eef 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -75,10 +75,8 @@ namespace Emby.Server.Implementations.Data
 
         private void RemoveEmptyPasswordHashes(ManagedConnection connection)
         {
-            foreach (var row in connection.Query("select id,guid,data from LocalUsersv2"))
+            foreach (var user in RetrieveAllUsers(connection))
             {
-                var user = GetUser(row);
-
                 // If the user password is the sha1 hash of the empty string, remove it
                 if (!string.Equals(user.Password, "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709", StringComparison.Ordinal)
                     && !string.Equals(user.Password, "$SHA1$DA39A3EE5E6B4B0D3255BFEF95601890AFD80709", StringComparison.Ordinal))
@@ -198,17 +196,22 @@ namespace Emby.Server.Implementations.Data
         /// <returns>IEnumerable{User}.</returns>
         public List<User> RetrieveAllUsers()
         {
-            var list = new List<User>();
-
             using (var connection = GetConnection(true))
             {
-                foreach (var row in connection.Query("select id,guid,data from LocalUsersv2"))
-                {
-                    list.Add(GetUser(row));
-                }
+                return new List<User>(RetrieveAllUsers(connection));
             }
+        }
 
-            return list;
+        /// <summary>
+        /// Retrieve all users from the database
+        /// </summary>
+        /// <returns>IEnumerable{User}.</returns>
+        private IEnumerable<User> RetrieveAllUsers(ManagedConnection connection)
+        {
+            foreach (var row in connection.Query("select id,guid,data from LocalUsersv2"))
+            {
+                yield return GetUser(row);
+            }
         }
 
         /// <summary>
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index ff375e590..1701ced42 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -222,9 +222,8 @@ namespace Emby.Server.Implementations.Library
 
         public void Initialize()
         {
-            _users = LoadUsers();
-
-            var users = Users.ToList();
+            var users = LoadUsers();
+            _users = users.ToArray();
 
             // If there are no local users with admin rights, make them all admins
             if (!users.Any(i => i.Policy.IsAdministrator))
@@ -555,35 +554,36 @@ namespace Emby.Server.Implementations.Library
         /// Loads the users from the repository
         /// </summary>
         /// <returns>IEnumerable{User}.</returns>
-        private User[] LoadUsers()
+        private List<User> LoadUsers()
         {
             var users = UserRepository.RetrieveAllUsers();
 
             // There always has to be at least one user.
-            if (users.Count == 0)
+            if (users.Count != 0)
             {
-                var defaultName = Environment.UserName;
-                if (string.IsNullOrWhiteSpace(defaultName))
-                {
-                    defaultName = "MyJellyfinUser";
-                }
-                var name = MakeValidUsername(defaultName);
+                return users;
+            }
 
-                var user = InstantiateNewUser(name);
+            var defaultName = Environment.UserName;
+            if (string.IsNullOrWhiteSpace(defaultName))
+            {
+                defaultName = "MyJellyfinUser";
+            }
 
-                user.DateLastSaved = DateTime.UtcNow;
+            var name = MakeValidUsername(defaultName);
 
-                UserRepository.CreateUser(user);
+            var user = InstantiateNewUser(name);
+
+            user.DateLastSaved = DateTime.UtcNow;
 
-                users.Add(user);
+            UserRepository.CreateUser(user);
 
-                user.Policy.IsAdministrator = true;
-                user.Policy.EnableContentDeletion = true;
-                user.Policy.EnableRemoteControlOfOtherUsers = true;
-                UpdateUserPolicy(user, user.Policy, false);
-            }
+            user.Policy.IsAdministrator = true;
+            user.Policy.EnableContentDeletion = true;
+            user.Policy.EnableRemoteControlOfOtherUsers = true;
+            UpdateUserPolicy(user, user.Policy, false);
 
-            return users.ToArray();
+            return new List<User> { user };
         }
 
         public UserDto GetUserDto(User user, string remoteEndPoint = null)
-- 
cgit v1.2.3


From 2fdf7f1098a1de41d7459b66620f82b79f27c4b8 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Wed, 14 Aug 2019 20:35:36 +0200
Subject: Properly dispose DisplayPreferencesRepository

---
 Emby.Server.Implementations/ApplicationHost.cs      | 21 +++++++++++++++++----
 .../Data/SqliteDisplayPreferencesRepository.cs      |  4 ++--
 .../Data/SqliteUserRepository.cs                    |  4 ++--
 3 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'Emby.Server.Implementations/Data/SqliteUserRepository.cs')

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 38e61605a..966abfc41 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -123,6 +123,8 @@ namespace Emby.Server.Implementations
     {
         private SqliteUserRepository _userRepository;
 
+        private SqliteDisplayPreferencesRepository _displayPreferencesRepository;
+
         /// <summary>
         /// Gets a value indicating whether this instance can self restart.
         /// </summary>
@@ -757,8 +759,12 @@ namespace Emby.Server.Implementations
             UserDataManager = new UserDataManager(LoggerFactory, ServerConfigurationManager, () => UserManager);
             serviceCollection.AddSingleton(UserDataManager);
 
-            var displayPreferencesRepo = new SqliteDisplayPreferencesRepository(LoggerFactory, JsonSerializer, ApplicationPaths, FileSystemManager);
-            serviceCollection.AddSingleton<IDisplayPreferencesRepository>(displayPreferencesRepo);
+            _displayPreferencesRepository = new SqliteDisplayPreferencesRepository(
+                LoggerFactory.CreateLogger<SqliteDisplayPreferencesRepository>(),
+                JsonSerializer,
+                ApplicationPaths,
+                FileSystemManager);
+            serviceCollection.AddSingleton<IDisplayPreferencesRepository>(_displayPreferencesRepository);
 
             ItemRepository = new SqliteItemRepository(ServerConfigurationManager, this, JsonSerializer, LoggerFactory, LocalizationManager);
             serviceCollection.AddSingleton<IItemRepository>(ItemRepository);
@@ -884,7 +890,7 @@ namespace Emby.Server.Implementations
 
             serviceCollection.AddSingleton(typeof(IResourceFileManager), typeof(ResourceFileManager));
 
-            displayPreferencesRepo.Initialize();
+            _displayPreferencesRepository.Initialize();
 
             var userDataRepo = new SqliteUserDataRepository(LoggerFactory, ApplicationPaths);
 
@@ -964,7 +970,10 @@ namespace Emby.Server.Implementations
         /// <returns><see cref="Task{SqliteUserRepository}" />.</returns>
         private SqliteUserRepository GetUserRepository()
         {
-            var repo = new SqliteUserRepository(LoggerFactory, ApplicationPaths, JsonSerializer);
+            var repo = new SqliteUserRepository(
+                LoggerFactory.CreateLogger<SqliteUserRepository>(),
+                ApplicationPaths,
+                JsonSerializer);
 
             repo.Initialize();
 
@@ -1911,8 +1920,12 @@ namespace Emby.Server.Implementations
                 }
 
                 _userRepository?.Dispose();
+                _displayPreferencesRepository.Dispose();
             }
 
+            _userRepository = null;
+            _displayPreferencesRepository = null;
+
             _disposed = true;
         }
     }
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 87096e72f..77f5d9479 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -21,8 +21,8 @@ namespace Emby.Server.Implementations.Data
     {
         private readonly IFileSystem _fileSystem;
 
-        public SqliteDisplayPreferencesRepository(ILoggerFactory loggerFactory, IJsonSerializer jsonSerializer, IApplicationPaths appPaths, IFileSystem fileSystem)
-            : base(loggerFactory.CreateLogger(nameof(SqliteDisplayPreferencesRepository)))
+        public SqliteDisplayPreferencesRepository(ILogger<SqliteDisplayPreferencesRepository> logger, IJsonSerializer jsonSerializer, IApplicationPaths appPaths, IFileSystem fileSystem)
+            : base(logger)
         {
             _jsonSerializer = jsonSerializer;
             _fileSystem = fileSystem;
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index de2354eef..d6d250fb3 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -18,10 +18,10 @@ namespace Emby.Server.Implementations.Data
         private readonly IJsonSerializer _jsonSerializer;
 
         public SqliteUserRepository(
-            ILoggerFactory loggerFactory,
+            ILogger<SqliteUserRepository> logger,
             IServerApplicationPaths appPaths,
             IJsonSerializer jsonSerializer)
-            : base(loggerFactory.CreateLogger(nameof(SqliteUserRepository)))
+            : base(logger)
         {
             _jsonSerializer = jsonSerializer;
 
-- 
cgit v1.2.3


From 3fd489d1cb85d654b4b32d2ffd901832a38adbe9 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Mon, 19 Aug 2019 17:03:21 +0200
Subject: Upgrade SQLitePCL to v2

---
 .../Data/SqliteDisplayPreferencesRepository.cs            |  8 +-------
 Emby.Server.Implementations/Data/SqliteExtensions.cs      |  7 ++-----
 Emby.Server.Implementations/Data/SqliteUserRepository.cs  | 15 +++++----------
 .../Emby.Server.Implementations.csproj                    |  2 +-
 Jellyfin.Server/Jellyfin.Server.csproj                    |  2 +-
 5 files changed, 10 insertions(+), 24 deletions(-)

(limited to 'Emby.Server.Implementations/Data/SqliteUserRepository.cs')

diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 77f5d9479..b1c17b92e 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -215,13 +215,7 @@ namespace Emby.Server.Implementations.Data
         }
 
         private DisplayPreferences Get(IReadOnlyList<IResultSetValue> row)
-        {
-            using (var stream = new MemoryStream(row[0].ToBlob()))
-            {
-                stream.Position = 0;
-                return _jsonSerializer.DeserializeFromStream<DisplayPreferences>(stream);
-            }
-        }
+            => _jsonSerializer.DeserializeFromString<DisplayPreferences>(row.GetString(0));
 
         public void SaveDisplayPreferences(DisplayPreferences displayPreferences, string userId, string client, CancellationToken cancellationToken)
         {
diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs
index c0f27b25a..0fb2c10fd 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -18,10 +18,6 @@ namespace Emby.Server.Implementations.Data
 
             connection.RunInTransaction(conn =>
             {
-                //foreach (var query in queries)
-                //{
-                //    conn.Execute(query);
-                //}
                 conn.ExecuteAll(string.Join(";", queries));
             });
         }
@@ -38,7 +34,8 @@ namespace Emby.Server.Implementations.Data
 
         public static Guid ReadGuidFromBlob(this IResultSetValue result)
         {
-            return new Guid(result.ToBlob());
+            // TODO: Remove ToArray when upgrading to netstandard2.1
+            return new Guid(result.ToBlob().ToArray());
         }
 
         public static string ToDateTimeParamValue(this DateTime dateValue)
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index d6d250fb3..11629b389 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -35,9 +35,8 @@ namespace Emby.Server.Implementations.Data
         public string Name => "SQLite";
 
         /// <summary>
-        /// Opens the connection to the database
+        /// Opens the connection to the database.
         /// </summary>
-        /// <returns>Task.</returns>
         public void Initialize()
         {
             using (var connection = GetConnection())
@@ -180,14 +179,10 @@ namespace Emby.Server.Implementations.Data
             var id = row[0].ToInt64();
             var guid = row[1].ReadGuidFromBlob();
 
-            using (var stream = new MemoryStream(row[2].ToBlob()))
-            {
-                stream.Position = 0;
-                var user = _jsonSerializer.DeserializeFromStream<User>(stream);
-                user.InternalId = id;
-                user.Id = guid;
-                return user;
-            }
+            var user = _jsonSerializer.DeserializeFromString<User>(row.GetString(2));
+            user.InternalId = id;
+            user.Id = guid;
+            return user;
         }
 
         /// <summary>
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index c78d96d4a..b48193c58 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -34,7 +34,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="ServiceStack.Text.Core" Version="5.6.0" />
     <PackageReference Include="sharpcompress" Version="0.23.0" />
-    <PackageReference Include="SQLitePCL.pretty.netstandard" Version="1.0.0" />
+    <PackageReference Include="SQLitePCL.pretty.netstandard" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index ec7c026e5..e87283477 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -43,7 +43,7 @@
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="SkiaSharp" Version="1.68.0" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="1.1.14" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.0" />
     <PackageReference Include="SQLitePCLRaw.provider.sqlite3.netstandard11" Version="1.1.14" />
   </ItemGroup>
 
-- 
cgit v1.2.3