[PM-13843] Optimize collectioncipher readbyuserid (#4916)

* Optimise stored procedure Collectioncipher_ReadByUserId * Optimise stored procedure Collectioncipher_ReadByUserId * Optimise stored procedure Collectioncipher_ReadByUserId
bitwarden · Oct 18, 2024 · 27760bd · 27760bd
1 parent 91409a4
commit 27760bd
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 11 deletions.
diff --git a/src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByUserId.sql
@@ -4,6 +4,21 @@ AS
 BEGIN
  SET NOCOUNT ON
 
+ SELECT 
+ CC.*
+ FROM
+ [dbo].[CollectionCipher] CC
+ INNER JOIN
+ [dbo].[Collection] S ON S.[Id] = CC.[CollectionId]
+ INNER JOIN
+ [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = S.[OrganizationId] AND OU.[UserId] = @UserId
+ INNER JOIN
+ [dbo].[CollectionUser] CU ON CU.[CollectionId] = S.[Id] AND CU.[OrganizationUserId] = OU.[Id]
+ WHERE
+ OU.[Status] = 2
+
+ UNION ALL
+
  SELECT
  CC.*
  FROM
@@ -12,18 +27,13 @@ BEGIN
  [dbo].[Collection] S ON S.[Id] = CC.[CollectionId]
  INNER JOIN
  [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = S.[OrganizationId] AND OU.[UserId] = @UserId
+ INNER JOIN
+ [dbo].[GroupUser] GU ON GU.[OrganizationUserId] = OU.[Id]
+ INNER JOIN
+ [dbo].[CollectionGroup] CG ON CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
  LEFT JOIN
  [dbo].[CollectionUser] CU ON CU.[CollectionId] = S.[Id] AND CU.[OrganizationUserId] = OU.[Id]
- LEFT JOIN
- [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND GU.[OrganizationUserId] = OU.[Id]
- LEFT JOIN
- [dbo].[Group] G ON G.[Id] = GU.[GroupId]
- LEFT JOIN
- [dbo].[CollectionGroup] CG ON CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
  WHERE
- OU.[Status] = 2 -- Confirmed
- AND (
- CU.[CollectionId] IS NOT NULL
- OR CG.[CollectionId] IS NOT NULL
- )
+ OU.[Status] = 2
+ AND CU.[CollectionId] IS NULL
 END
diff --git a/util/Migrator/DbScripts/2024-10-18-00_CollectionCipher_ReadByUserId.sql b/util/Migrator/DbScripts/2024-10-18-00_CollectionCipher_ReadByUserId.sql
@@ -0,0 +1,39 @@
+CREATE OR ALTER PROCEDURE [dbo].[CollectionCipher_ReadByUserId]
+ @UserId UNIQUEIDENTIFIER
+AS
+BEGIN
+ SET NOCOUNT ON
+
+ SELECT
+ CC.*
+ FROM
+ [dbo].[CollectionCipher] CC
+ INNER JOIN
+ [dbo].[Collection] S ON S.[Id] = CC.[CollectionId]
+ INNER JOIN
+ [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = S.[OrganizationId] AND OU.[UserId] = @UserId
+ INNER JOIN
+ [dbo].[CollectionUser] CU ON CU.[CollectionId] = S.[Id] AND CU.[OrganizationUserId] = OU.[Id]
+ WHERE
+ OU.[Status] = 2
+
+ UNION ALL
+
+ SELECT 
+ CC.*
+ FROM
+ [dbo].[CollectionCipher] CC
+ INNER JOIN
+ [dbo].[Collection] S ON S.[Id] = CC.[CollectionId]
+ INNER JOIN
+ [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = S.[OrganizationId] AND OU.[UserId] = @UserId
+ INNER JOIN
+ [dbo].[GroupUser] GU ON GU.[OrganizationUserId] = OU.[Id]
+ INNER JOIN
+ [dbo].[CollectionGroup] CG ON CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
+ LEFT JOIN
+ [dbo].[CollectionUser] CU ON CU.[CollectionId] = S.[Id] AND CU.[OrganizationUserId] = OU.[Id]
+ WHERE
+ OU.[Status] = 2
+ AND CU.[CollectionId] IS NULL
+END