mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-11-20 23:03:15 +00:00
Key the user data cache by user Id instead of InternalId
A new user gets the next InternalId, which is the number of the newest user once that user is deleted. The user data cache was keyed by InternalId and is not cleared on delete, so item lists showed the new user the deleted user's resume position, play count and played state. Fixes #18698 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
2953ed632c
commit
1a6a5479b6
2 changed files with 35 additions and 6 deletions
|
|
@ -93,7 +93,7 @@ namespace Emby.Server.Implementations.Library
|
|||
|
||||
transaction.Commit();
|
||||
|
||||
var userId = user.InternalId;
|
||||
var userId = user.Id;
|
||||
var cacheKey = GetCacheKey(userId, item.Id);
|
||||
_cache.AddOrUpdate(cacheKey, userData);
|
||||
item.UserData = dbContext.UserData.Where(e => e.ItemId == item.Id).AsNoTracking().ToArray(); // rehydrate the cached userdata
|
||||
|
|
@ -201,7 +201,7 @@ namespace Emby.Server.Implementations.Library
|
|||
|
||||
foreach (var item in items)
|
||||
{
|
||||
var cacheKey = GetCacheKey(user.InternalId, item.Id);
|
||||
var cacheKey = GetCacheKey(user.Id, item.Id);
|
||||
if (_cache.TryGet(cacheKey, out var cachedData))
|
||||
{
|
||||
result[item.Id] = cachedData;
|
||||
|
|
@ -252,7 +252,7 @@ namespace Emby.Server.Implementations.Library
|
|||
}
|
||||
|
||||
result[item.Id] = userData;
|
||||
var cacheKey = GetCacheKey(user.InternalId, item.Id);
|
||||
var cacheKey = GetCacheKey(user.Id, item.Id);
|
||||
_cache.AddOrUpdate(cacheKey, userData);
|
||||
}
|
||||
|
||||
|
|
@ -360,9 +360,10 @@ namespace Emby.Server.Implementations.Library
|
|||
/// Gets the internal key.
|
||||
/// </summary>
|
||||
/// <returns>System.String.</returns>
|
||||
private static string GetCacheKey(long internalUserId, Guid itemId)
|
||||
private static string GetCacheKey(Guid userId, Guid itemId)
|
||||
{
|
||||
return internalUserId.ToString(CultureInfo.InvariantCulture) + "-" + itemId.ToString("N", CultureInfo.InvariantCulture);
|
||||
// Keyed by the user's Guid: a new user can get the InternalId of a deleted one.
|
||||
return userId.ToString("N", CultureInfo.InvariantCulture) + "-" + itemId.ToString("N", CultureInfo.InvariantCulture);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
|
|
@ -553,7 +554,7 @@ namespace Emby.Server.Implementations.Library
|
|||
|
||||
dbContext.SaveChanges();
|
||||
|
||||
var cacheKey = GetCacheKey(user.InternalId, item.Id);
|
||||
var cacheKey = GetCacheKey(user.Id, item.Id);
|
||||
if (_cache.TryGet(cacheKey, out var cached))
|
||||
{
|
||||
cached.AudioStreamIndex = null;
|
||||
|
|
|
|||
|
|
@ -210,6 +210,34 @@ public sealed class UserDataManagerTests : IDisposable
|
|||
Assert.Equal(333, result[retiredItem.Id].PlaybackPositionTicks);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GetUserDataBatch_UserReusingInternalIdOfDeletedUser_DoesNotGetItsCachedData()
|
||||
{
|
||||
// a new user gets the next InternalId, so it takes the number of the newest user once that one is deleted
|
||||
_user.InternalId = 2;
|
||||
var newUser = new User("new user", "auth-provider", "reset-provider")
|
||||
{
|
||||
Id = Guid.NewGuid(),
|
||||
InternalId = 2
|
||||
};
|
||||
|
||||
var item = CreateAudioBook();
|
||||
item.UserData = new List<UserData>
|
||||
{
|
||||
CreateUserDataRow(item, item.GetUserDataKeys()[0], 222)
|
||||
};
|
||||
|
||||
// caches _user's data for the item
|
||||
Assert.Equal(222, _userDataManager.GetUserDataBatch([item], _user)[item.Id].PlaybackPositionTicks);
|
||||
|
||||
// deleting _user removes its rows
|
||||
item.UserData = new List<UserData>();
|
||||
|
||||
var userData = _userDataManager.GetUserDataBatch([item], newUser)[item.Id];
|
||||
|
||||
Assert.Equal(0, userData.PlaybackPositionTicks);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SaveUserData_RowUnderRetiredKey_IsKeptInAgreement()
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue