Skip to content

feat(server): improve checkAlbumAccess query performance #22467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mertalev merged 4 commits into from
Oct 6, 2025
Merged

feat(server): improve checkAlbumAccess query performance #22467

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fff7b22
Fix slow SQL query in checkAlbumAccess caused by the array overlap op…
skatsubo Sep 28, 2025
bea95ea
Update access.repository.sql
skatsubo Sep 28, 2025
c3a70a1
Rewrite the query to pass assetIds once as a single array parameter
skatsubo Oct 1, 2025
75ce5d9
Merge branch 'main' into fix/slow-query-check-album-access
skatsubo Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions server/src/queries/access.repository.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,13 @@ from
left join "user" on "user"."id" = "albumUsers"."usersId"
and "user"."deletedAt" is null
where
array["asset"."id", "asset"."livePhotoVideoId"] && array[$1]::uuid[]
(
"asset"."id" in ($1)
or "asset"."livePhotoVideoId" in ($2)
)
and (
"album"."ownerId" = $2
or "user"."id" = $3
"album"."ownerId" = $3
or "user"."id" = $4
)
and "album"."deletedAt" is null

Expand Down
6 changes: 1 addition & 5 deletions server/src/repositories/access.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,7 @@ class AssetAccess {
.leftJoin('album_user as albumUsers', 'albumUsers.albumsId', 'album.id')
.leftJoin('user', (join) => join.onRef('user.id', '=', 'albumUsers.usersId').on('user.deletedAt', 'is', null))
.select(['asset.id', 'asset.livePhotoVideoId'])
.where(
sql`array["asset"."id", "asset"."livePhotoVideoId"]`,
'&&',
sql`array[${sql.join([...assetIds])}]::uuid[] `,
)
.where((eb) => eb.or([eb('asset.id', 'in', [...assetIds]), eb('asset.livePhotoVideoId', 'in', [...assetIds])]))
Comment thread
mertalev marked this conversation as resolved.
Outdated
Comment thread
mertalev marked this conversation as resolved.
Outdated
.where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('user.id', '=', userId)]))
.where('album.deletedAt', 'is', null)
.execute()
Expand Down
Loading