From ddb9fb275e946b53dd9faac9d65002b47833821b Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Fri, 20 Nov 2026 07:25:05 -0500 Subject: Backport pull request #18258 from jellyfin/release-12.z Look up descendants by parent instead of a correlated EXISTS Original-merge: e60484a1cef1ceca4aea7135396178139dc93132 Merged-by: crobibero Backported-by: Cody Robibero --- Emby.Server.Implementations/Library/Search/SqlSearchProvider.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Emby.Server.Implementations/Library') diff --git a/Emby.Server.Implementations/Library/Search/SqlSearchProvider.cs b/Emby.Server.Implementations/Library/Search/SqlSearchProvider.cs index a5ea02df51..dd96f75893 100644 --- a/Emby.Server.Implementations/Library/Search/SqlSearchProvider.cs +++ b/Emby.Server.Implementations/Library/Search/SqlSearchProvider.cs @@ -136,7 +136,7 @@ public class SqlSearchProvider : IInternalSearchProvider dbQuery = ApplyTypeFilter(dbQuery, query.IncludeItemTypes, query.ExcludeItemTypes); dbQuery = ApplyMediaTypeFilter(dbQuery, query.MediaTypes); - dbQuery = ApplyParentFilter(dbQuery, query.ParentId); + dbQuery = ApplyParentFilter(dbContext, dbQuery, query.ParentId); dbQuery = ApplyUserAccessFilter(dbContext, dbQuery, query); dbQuery = ExcludeVersionsOfMatchedPrimaries(dbQuery); @@ -205,6 +205,7 @@ public class SqlSearchProvider : IInternalSearchProvider } private static IQueryable ApplyParentFilter( + JellyfinDbContext context, IQueryable query, Guid? parentId) { @@ -214,7 +215,10 @@ public class SqlSearchProvider : IInternalSearchProvider } var pid = parentId.Value; - return query.Where(e => e.ParentId == pid || e.Parents!.Any(p => p.ParentItemId == pid)); + var descendantIds = context.AncestorIds + .Where(a => a.ParentItemId == pid) + .Select(a => a.ItemId); + return query.Where(e => e.ParentId == pid || descendantIds.Contains(e.Id)); } private static IQueryable ExcludeVersionsOfMatchedPrimaries(IQueryable query) -- cgit v1.2.3