github-mirrors/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-03-01 18:19:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(server): filter assets by people using a subquery instead of a cte (#15768)

Browse Source
This commit is contained in:
David Wolff
2025-01-31 16:06:45 +01:00
committed by GitHub
parent 098bab7c9b
commit 1b141d5ca9
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/repositories/asset.repository.ts
View File

@@ -8,7 +8,6 @@ import { Chunked, ChunkedArray, DummyValue, GenerateSql } from 'src/decorators';
import {
AssetEntity,
hasPeople,
hasPeopleCte,
searchAssetBuilder,
truncatedDate,
withAlbums,
@@ -576,7 +575,7 @@ export class AssetRepository implements IAssetRepository {
@GenerateSql({ params: [{ size: TimeBucketSize.MONTH }] })
async getTimeBuckets(options: TimeBucketOptions): Promise<TimeBucketItem[]> {
return (
((options.personId ? hasPeopleCte(this.db, [options.personId]) : this.db) as Kysely<DB>)
this.db
.with('assets', (qb) =>
qb
.selectFrom('assets')
@@ -589,11 +588,7 @@ export class AssetRepository implements IAssetRepository {
.innerJoin('albums_assets_assets', 'assets.id', 'albums_assets_assets.assetsId')
.where('albums_assets_assets.albumsId', '=', asUuid(options.albumId!)),
)
.$if(!!options.personId, (qb) =>
qb.innerJoin(sql.table('has_people').as('has_people'), (join) =>
join.onRef(sql`has_people."assetId"`, '=', 'assets.id'),
),
)
.$if(!!options.personId, (qb) => hasPeople(qb, [options.personId!]))
.$if(!!options.withStacked, (qb) =>
qb
.leftJoin('asset_stack', (join) =>
@@ -628,10 +623,12 @@ export class AssetRepository implements IAssetRepository {
@GenerateSql({ params: [DummyValue.TIME_BUCKET, { size: TimeBucketSize.MONTH, withStacked: true }] })
async getTimeBucket(timeBucket: string, options: TimeBucketOptions): Promise<AssetEntity[]> {
return hasPeople(this.db, options.personId ? [options.personId] : undefined)
return this.db
.selectFrom('assets')
.selectAll('assets')
.$call(withExif)
.$if(!!options.albumId, (qb) => withAlbums(qb, { albumId: options.albumId }))
.$if(!!options.personId, (qb) => hasPeople(qb, [options.personId!]))
.$if(!!options.userIds, (qb) => qb.where('assets.ownerId', '=', anyUuid(options.userIds!)))
.$if(options.isArchived !== undefined, (qb) => qb.where('assets.isArchived', '=', options.isArchived!))
.$if(options.isFavorite !== undefined, (qb) => qb.where('assets.isFavorite', '=', options.isFavorite!))