refactor cipher queries by user. tuned indexing.

2025-07-13 05:38:25 -05:00 · 2018-04-24 12:48:43 -04:00
parent ac4f789782
commit 165ee97d2f
16 changed files with 321 additions and 175 deletions
--- a/src/Sql/Sql.sqlproj
+++ b/src/Sql/Sql.sqlproj
@ -181,9 +181,7 @@
    <Build Include="dbo\Stored Procedures\OrganizationUser_UpdateWithCollections.sql" />
    <Build Include="dbo\Stored Procedures\Cipher_ReadByOrganizationId.sql" />
    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByTypeUserId.sql" />
    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserIdHasCollection.sql" />
    <Build Include="dbo\Stored Procedures\Collection_Create.sql" />
    <Build Include="dbo\Stored Procedures\Collection_DeleteById.sql" />
    <Build Include="dbo\Stored Procedures\Collection_ReadById.sql" />
@ -226,5 +224,6 @@
    <Build Include="dbo\Stored Procedures\User_Search.sql" />
    <Build Include="dbo\Stored Procedures\Organization_Search.sql" />
    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationIdEmail.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadWithoutOrganizationsByUserId.sql" />
  </ItemGroup>
 </Project>
--- a/src/Sql/dbo/Functions/CipherDetails.sql
+++ b/src/Sql/dbo/Functions/CipherDetails.sql
@ -10,18 +10,20 @@ SELECT
    C.[Attachments],
    C.[CreationDate],
    C.[RevisionDate],
-    CASE WHEN
-        @UserId IS NULL
-        OR C.[Favorites] IS NULL
-        OR JSON_VALUE(C.[Favorites], CONCAT('$."', @UserId, '"')) IS NULL
-    THEN 0
-    ELSE 1
+    CASE
+        WHEN
+            @UserId IS NULL
+            OR C.[Favorites] IS NULL
+            OR JSON_VALUE(C.[Favorites], CONCAT('$."', @UserId, '"')) IS NULL
+        THEN 0
+        ELSE 1
    END [Favorite],
-    CASE WHEN
-        @UserId IS NULL
-        OR C.[Folders] IS NULL
-    THEN NULL
-    ELSE TRY_CONVERT(UNIQUEIDENTIFIER, JSON_VALUE(C.[Folders], CONCAT('$."', @UserId, '"')))
+    CASE
+        WHEN
+            @UserId IS NULL
+            OR C.[Folders] IS NULL
+        THEN NULL
+        ELSE TRY_CONVERT(UNIQUEIDENTIFIER, JSON_VALUE(C.[Folders], CONCAT('$."', @UserId, '"')))
    END [FolderId]
 FROM
    [dbo].[Cipher] C
--- a/src/Sql/dbo/Functions/UserCipherDetails.sql
+++ b/src/Sql/dbo/Functions/UserCipherDetails.sql
@ -1,42 +1,62 @@
 CREATE FUNCTION [dbo].[UserCipherDetails](@UserId UNIQUEIDENTIFIER)
 RETURNS TABLE
 AS RETURN
+WITH [CTE] AS (
+    SELECT
+        [Id],
+        [OrganizationId],
+        [AccessAll]
+    FROM
+        [OrganizationUser]
+    WHERE
+        [UserId] = @UserId
+        AND [Status] = 2 -- Confirmed
+)
 SELECT
    C.*,
-    CASE 
-        WHEN C.[UserId] IS NOT NULL OR OU.[AccessAll] = 1 OR CU.[ReadOnly] = 0 OR G.[AccessAll] = 1 OR CG.[ReadOnly] = 0 THEN 1
+    CASE
+        WHEN
+            OU.[AccessAll] = 1
+            OR CU.[ReadOnly] = 0
+            OR G.[AccessAll] = 1
+            OR CG.[ReadOnly] = 0
+        THEN 1
        ELSE 0
    END [Edit],
-    CASE 
-        WHEN C.[UserId] IS NULL AND O.[UseTotp] = 1 THEN 1
+    CASE
+        WHEN O.[UseTotp] = 1
+        THEN 1
        ELSE 0
    END [OrganizationUseTotp]
 FROM
    [dbo].[CipherDetails](@UserId) C
+INNER JOIN
+    [CTE] OU ON C.[UserId] IS NULL AND C.[OrganizationId] IN (SELECT [OrganizationId] FROM [CTE])
+INNER JOIN
+    [dbo].[Organization] O ON O.[Id] = OU.OrganizationId AND O.[Id] = C.[OrganizationId] AND O.[Enabled] = 1
 LEFT JOIN
-    [dbo].[Organization] O ON C.[UserId] IS NULL AND O.[Id] = C.[OrganizationId]
-LEFT JOIN
-    [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-LEFT JOIN
-    [dbo].[CollectionCipher] CC ON C.[UserId] IS NULL AND OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
+    [dbo].[CollectionCipher] CC ON OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
 LEFT JOIN
    [dbo].[CollectionUser] CU ON CU.[CollectionId] = CC.[CollectionId] AND CU.[OrganizationUserId] = OU.[Id]
 LEFT JOIN
-    [dbo].[GroupUser] GU ON C.[UserId] IS NULL AND CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
+    [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
 LEFT JOIN
    [dbo].[Group] G ON G.[Id] = GU.[GroupId]
 LEFT JOIN
    [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
 WHERE
-    C.[UserId] = @UserId
-    OR (
-        C.[UserId] IS NULL
-        AND OU.[Status] = 2 -- 2 = Confirmed
-        AND O.[Enabled] = 1
-        AND (
-            OU.[AccessAll] = 1
-            OR CU.[CollectionId] IS NOT NULL
-            OR G.[AccessAll] = 1
-            OR CG.[CollectionId] IS NOT NULL
-        )
-    )
+    OU.[AccessAll] = 1
+    OR CU.[CollectionId] IS NOT NULL
+    OR G.[AccessAll] = 1
+    OR CG.[CollectionId] IS NOT NULL
+
+UNION ALL
+
+SELECT
+    *,
+    1 [Edit],
+    0 [OrganizationUseTotp]
+FROM
+    [dbo].[CipherDetails](@UserId)
+WHERE
+    [UserId] = @UserId
--- a/Procedures/CipherDetails_ReadByTypeUserId.sql
+++ b/Procedures/CipherDetails_ReadByTypeUserId.sql
@ -1,14 +0,0 @@
-CREATE PROCEDURE [dbo].[CipherDetails_ReadByTypeUserId]
-    @Type TINYINT,
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[UserCipherDetails](@UserId)
-    WHERE
-        [Type] = @Type
-END
--- a/Procedures/CipherDetails_ReadByUserIdHasCollection.sql
+++ b/Procedures/CipherDetails_ReadByUserIdHasCollection.sql
@ -1,42 +0,0 @@
-CREATE PROCEDURE [dbo].[CipherDetails_ReadByUserIdHasCollection]
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        C.*,
-        CASE 
-            WHEN C.[UserId] IS NOT NULL OR OU.[AccessAll] = 1 OR CU.[ReadOnly] = 0 OR G.[AccessAll] = 1 OR CG.[ReadOnly] = 0 THEN 1
-            ELSE 0
-        END [Edit],
-        CASE 
-            WHEN C.[UserId] IS NULL AND O.[UseTotp] = 1 THEN 1
-            ELSE 0
-        END [OrganizationUseTotp]
-    FROM
-        [dbo].[CipherDetails](@UserId) C
-    INNER JOIN
-        [dbo].[Organization] O ON C.[UserId] IS NULL AND O.[Id] = C.[OrganizationId]
-    INNER JOIN
-        [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-    LEFT JOIN
-        [dbo].[CollectionCipher] CC ON C.[UserId] IS NULL AND OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
-    LEFT JOIN
-        [dbo].[CollectionUser] CU ON CU.[CollectionId] = CC.[CollectionId] AND CU.[OrganizationUserId] = OU.[Id]
-    LEFT JOIN
-        [dbo].[GroupUser] GU ON C.[UserId] IS NULL AND CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-    LEFT JOIN
-        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-    LEFT JOIN
-        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
-    WHERE
-        OU.[Status] = 2 -- 2 = Confirmed
-        AND O.[Enabled] = 1
-        AND (
-            OU.[AccessAll] = 1
-            OR CU.[CollectionId] IS NOT NULL
-            OR G.[AccessAll] = 1
-            OR CG.[CollectionId] IS NOT NULL
-        )
-END
--- a/Procedures/CipherDetails_ReadWithoutOrganizationsByUserId.sql
+++ b/Procedures/CipherDetails_ReadWithoutOrganizationsByUserId.sql
@ -0,0 +1,14 @@
+CREATE PROCEDURE [dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]
+    @UserId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    SELECT
+        1 [Edit],
+        0 [OrganizationUseTotp]
+    FROM
+        [dbo].[CipherDetails](@UserId)
+    WHERE
+        [UserId] = @UserId
+END
--- a/Procedures/Cipher_ReadByOrganizationId.sql
+++ b/Procedures/Cipher_ReadByOrganizationId.sql
@ -9,5 +9,6 @@ BEGIN
    FROM
        [dbo].[CipherView]
    WHERE
-        [OrganizationId] = @OrganizationId
+        [UserId] IS NULL
+        AND [OrganizationId] = @OrganizationId
 END
--- a/src/Sql/dbo/Tables/Cipher.sql
+++ b/src/Sql/dbo/Tables/Cipher.sql
@ -16,12 +16,7 @@


 GO
-CREATE NONCLUSTERED INDEX [IX_Cipher_OrganizationId_Type]
-    ON [dbo].[Cipher]([OrganizationId] ASC, [Type] ASC) WHERE ([OrganizationId] IS NOT NULL);
-
-
-GO
-CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_Type_IncludeAll]
-    ON [dbo].[Cipher]([UserId] ASC, [Type] ASC)
-    INCLUDE ([OrganizationId], [Data], [Favorites], [Folders], [Attachments], [CreationDate], [RevisionDate]);
+CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_OrganizationId_IncludeAll]
+    ON [dbo].[Cipher]([UserId] ASC, [OrganizationId] ASC)
+    INCLUDE ([Type], [Data], [Favorites], [Folders], [Attachments], [CreationDate], [RevisionDate]);

--- a/src/Sql/dbo/Tables/GroupUser.sql
+++ b/src/Sql/dbo/Tables/GroupUser.sql
@ -6,3 +6,10 @@
    CONSTRAINT [FK_GroupUser_OrganizationUser] FOREIGN KEY ([OrganizationUserId]) REFERENCES [dbo].[OrganizationUser] ([Id])
 );

+
+GO
+CREATE NONCLUSTERED INDEX [IX_GroupUser_OrganizationUserId]
+    ON [dbo].[GroupUser]([OrganizationUserId] ASC);
+
+
+
--- a/src/Sql/dbo/Tables/Organization.sql
+++ b/src/Sql/dbo/Tables/Organization.sql
@ -33,3 +33,9 @@
    CONSTRAINT [PK_Organization] PRIMARY KEY CLUSTERED ([Id] ASC)
 );

+
+GO
+CREATE NONCLUSTERED INDEX [IX_Organization_Enabled]
+    ON [dbo].[Organization]([Id] ASC, [Enabled] ASC)
+    INCLUDE ([UseTotp]);
+