Moved userdata to user manager to resolve concurrency issues. must delete userdata and displaypreferences db files.

5 files changed, 139 insertions, 63 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 0c1d2ddf8..a57eb8eaa 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -861,6 +861,7 @@ namespace MediaBrowser.Server.Implementations.Library
                     var userComparer = (IUserBaseItemComparer)Activator.CreateInstance(comparer.GetType());
 
                     userComparer.User = user;
+                    userComparer.UserManager = _userManager;
 
                     return userComparer;
                 }
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index b17f2955e..ca3c1fe7c 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -1,5 +1,4 @@
-using System.Collections.Concurrent;
-using MediaBrowser.Common.Events;
+using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
@@ -9,6 +8,7 @@ using MediaBrowser.Model.Connectivity;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
@@ -104,6 +104,8 @@ namespace MediaBrowser.Server.Implementations.Library
         /// </summary>
         private readonly ConcurrentDictionary<string, Task<DisplayPreferences>> _displayPreferences = new ConcurrentDictionary<string, Task<DisplayPreferences>>();
 
+        private readonly ConcurrentDictionary<string, Task<UserItemData>> _userData = new ConcurrentDictionary<string, Task<UserItemData>>();
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="UserManager" /> class.
         /// </summary>
@@ -200,14 +202,15 @@ namespace MediaBrowser.Server.Implementations.Library
         public async Task SaveDisplayPreferences(Guid userId, Guid displayPreferencesId, DisplayPreferences displayPreferences, CancellationToken cancellationToken)
         {
             var key = userId + displayPreferencesId.ToString();
-            var newValue = Task.FromResult(displayPreferences);
-
+           
             try
             {
                 await Kernel.Instance.DisplayPreferencesRepository.SaveDisplayPreferences(userId, displayPreferencesId,
                                                                                         displayPreferences,
                                                                                         cancellationToken).ConfigureAwait(false);
 
+                var newValue = Task.FromResult(displayPreferences);
+
                 // Once it succeeds, put it into the dictionary to make it available to everyone else
                 _displayPreferences.AddOrUpdate(key, newValue, delegate { return newValue; });
             }
@@ -651,10 +654,10 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (positionTicks.HasValue)
             {
-                var data = item.GetUserData(user, true);
+                var data = await GetUserData(user.Id, item.UserDataId).ConfigureAwait(false);
 
                 UpdatePlayState(item, data, positionTicks.Value, false);
-                await SaveUserDataForItem(user, item, data).ConfigureAwait(false);
+                await SaveUserData(user.Id, item.UserDataId, data, CancellationToken.None).ConfigureAwait(false);
             }
 
             EventHelper.QueueEventIfNotNull(PlaybackProgress, this, new PlaybackProgressEventArgs
@@ -689,7 +692,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
             RemoveNowPlayingItemId(user, clientType, deviceId, deviceName, item);
 
-            var data = item.GetUserData(user, true);
+            var data = await GetUserData(user.Id, item.UserDataId).ConfigureAwait(false);
 
             if (positionTicks.HasValue)
             {
@@ -702,7 +705,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 data.Played = true;
             }
 
-            await SaveUserDataForItem(user, item, data).ConfigureAwait(false);
+            await SaveUserData(user.Id, item.UserDataId, data, CancellationToken.None).ConfigureAwait(false);
 
             EventHelper.QueueEventIfNotNull(PlaybackStopped, this, new PlaybackProgressEventArgs
             {
@@ -763,16 +766,57 @@ namespace MediaBrowser.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Saves user data for an item
+        /// Saves display preferences for an item
         /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="item">The item.</param>
-        /// <param name="data">The data.</param>
-        public Task SaveUserDataForItem(User user, BaseItem item, UserItemData data)
+        /// <param name="userId">The user id.</param>
+        /// <param name="userDataId">The user data id.</param>
+        /// <param name="userData">The user data.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        public async Task SaveUserData(Guid userId, Guid userDataId, UserItemData userData, CancellationToken cancellationToken)
+        {
+            var key = userId + userDataId.ToString();
+            try
+            {
+                await Kernel.Instance.UserDataRepository.SaveUserData(userId, userDataId, userData, cancellationToken).ConfigureAwait(false);
+
+                var newValue = Task.FromResult(userData);
+
+                // Once it succeeds, put it into the dictionary to make it available to everyone else
+                _userData.AddOrUpdate(key, newValue, delegate { return newValue; });
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error saving user data", ex);
+
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Gets the display preferences.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <param name="userDataId">The user data id.</param>
+        /// <returns>Task{DisplayPreferences}.</returns>
+        public Task<UserItemData> GetUserData(Guid userId, Guid userDataId)
+        {
+            var key = userId + userDataId.ToString();
+
+            return _userData.GetOrAdd(key, keyName => RetrieveUserData(userId, userDataId));
+        }
+
+        /// <summary>
+        /// Retrieves the display preferences.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <param name="userDataId">The user data id.</param>
+        /// <returns>DisplayPreferences.</returns>
+        private async Task<UserItemData> RetrieveUserData(Guid userId, Guid userDataId)
         {
-            item.AddOrUpdateUserData(user, data);
+            var userdata = await Kernel.Instance.UserDataRepository.GetUserData(userId, userDataId).ConfigureAwait(false);
 
-            return Kernel.UserDataRepository.SaveUserData(item, CancellationToken.None);
+            return userdata ?? new UserItemData();
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs b/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
index c37b6b4a4..905d5413a 100644
--- a/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 using System;
@@ -17,6 +18,12 @@ namespace MediaBrowser.Server.Implementations.Sorting
         public User User { get; set; }
 
         /// <summary>
+        /// Gets or sets the user manager.
+        /// </summary>
+        /// <value>The user manager.</value>
+        public IUserManager UserManager { get; set; }
+
+        /// <summary>
         /// Compares the specified x.
         /// </summary>
         /// <param name="x">The x.</param>
@@ -34,7 +41,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
         /// <returns>DateTime.</returns>
         private DateTime GetDate(BaseItem x)
         {
-            var userdata = x.GetUserData(User, false);
+            var userdata = UserManager.GetUserData(User.Id, x.UserDataId).Result;
 
             if (userdata != null && userdata.LastPlayedDate.HasValue)
             {
diff --git a/MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs b/MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs
index 9cd5281c3..82e76e78d 100644
--- a/MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 
@@ -33,7 +34,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
         /// <returns>DateTime.</returns>
         private int GetValue(BaseItem x)
         {
-            var userdata = x.GetUserData(User, false);
+            var userdata = UserManager.GetUserData(User.Id, x.UserDataId).Result;
 
             return userdata == null ? 0 : userdata.PlayCount;
         }
@@ -46,5 +47,11 @@ namespace MediaBrowser.Server.Implementations.Sorting
         {
             get { return ItemSortBy.PlayCount; }
         }
+
+        /// <summary>
+        /// Gets or sets the user manager.
+        /// </summary>
+        /// <value>The user manager.</value>
+        public IUserManager UserManager { get; set; }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs
index dafdce798..f3dede889 100644
--- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs
@@ -79,8 +79,8 @@ namespace MediaBrowser.Server.Implementations.Sqlite
 
             string[] queries = {
 
-                                "create table if not exists user_data (item_id GUID, user_id GUID, data BLOB)",
-                                "create unique index if not exists idx_user_data on user_data (item_id, user_id)",
+                                "create table if not exists userdata (id GUID, userId GUID, data BLOB)",
+                                "create unique index if not exists userdataindex on userdata (id, userId)",
                                 "create table if not exists schema_version (table_name primary key, version)",
                                 //pragmas
                                 "pragma temp_store = memory"
@@ -90,84 +90,101 @@ namespace MediaBrowser.Server.Implementations.Sqlite
         }
 
         /// <summary>
-        /// Save the user specific data associated with an item in the repo
+        /// Saves the user data.
         /// </summary>
-        /// <param name="item">The item.</param>
+        /// <param name="userId">The user id.</param>
+        /// <param name="userDataId">The user data id.</param>
+        /// <param name="userData">The user data.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
-        public Task SaveUserData(BaseItem item, CancellationToken cancellationToken)
+        /// <exception cref="System.ArgumentNullException">
+        /// userData
+        /// or
+        /// cancellationToken
+        /// or
+        /// userId
+        /// or
+        /// userDataId
+        /// </exception>
+        public Task SaveUserData(Guid userId, Guid userDataId, UserItemData userData, CancellationToken cancellationToken)
         {
-            if (item == null)
+            if (userData == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException("userData");
             }
-
             if (cancellationToken == null)
             {
                 throw new ArgumentNullException("cancellationToken");
             }
-            
+            if (userId == Guid.Empty)
+            {
+                throw new ArgumentNullException("userId");
+            }
+            if (userDataId == Guid.Empty)
+            {
+                throw new ArgumentNullException("userDataId");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
             return Task.Run(() =>
             {
+                var serialized = _protobufSerializer.SerializeToBytes(userData);
+
                 cancellationToken.ThrowIfCancellationRequested();
 
                 var cmd = connection.CreateCommand();
-
-                cmd.CommandText = "delete from user_data where item_id = @guid";
-                cmd.AddParam("@guid", item.UserDataId);
-
+                cmd.CommandText = "replace into userdata (id, userId, data) values (@1, @2, @3)";
+                cmd.AddParam("@1", userDataId);
+                cmd.AddParam("@2", userId);
+                cmd.AddParam("@3", serialized);
                 QueueCommand(cmd);
-
-                if (item.UserData != null)
-                {
-                    foreach (var data in item.UserData)
-                    {
-                        cmd = connection.CreateCommand();
-                        cmd.CommandText = "insert into user_data (item_id, user_id, data) values (@1, @2, @3)";
-                        cmd.AddParam("@1", item.UserDataId);
-                        cmd.AddParam("@2", data.UserId);
-
-                        cmd.AddParam("@3", _protobufSerializer.SerializeToBytes(data));
-
-                        QueueCommand(cmd);
-                    }
-                }
             });
         }
 
         /// <summary>
-        /// Gets user data for an item
+        /// Gets the user data.
         /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>IEnumerable{UserItemData}.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
-        public IEnumerable<UserItemData> RetrieveUserData(BaseItem item)
+        /// <param name="userId">The user id.</param>
+        /// <param name="userDataId">The user data id.</param>
+        /// <returns>Task{UserItemData}.</returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// userId
+        /// or
+        /// userDataId
+        /// </exception>
+        public async Task<UserItemData> GetUserData(Guid userId, Guid userDataId)
         {
-            if (item == null)
+            if (userId == Guid.Empty)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException("userId");
+            }
+            if (userDataId == Guid.Empty)
+            {
+                throw new ArgumentNullException("userDataId");
             }
 
             var cmd = connection.CreateCommand();
-            cmd.CommandText = "select data from user_data where item_id = @guid";
-            var guidParam = cmd.Parameters.Add("@guid", DbType.Guid);
-            guidParam.Value = item.UserDataId;
+            cmd.CommandText = "select data from userdata where id = @id and userId=@userId";
+
+            var idParam = cmd.Parameters.Add("@id", DbType.Guid);
+            idParam.Value = userDataId;
 
-            using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+            var userIdParam = cmd.Parameters.Add("@userId", DbType.Guid);
+            userIdParam.Value = userId;
+
+            using (var reader = await cmd.ExecuteReaderAsync(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow).ConfigureAwait(false))
             {
-                while (reader.Read())
+                if (reader.Read())
                 {
                     using (var stream = GetStream(reader, 0))
                     {
-                        var data = _protobufSerializer.DeserializeFromStream<UserItemData>(stream);
-                        if (data != null)
-                        {
-                            yield return data;
-                        }
+                        return _protobufSerializer.DeserializeFromStream<UserItemData>(stream);
                     }
                 }
             }
+
+            return null;
         }
     }
 }