Buff/Debuff Database call Optimization

Author: FallenDev

Server.Configurations/ZolianPlayers/PlayersDatabaseBuild.sql

@@ -32,10 +32,10 @@ DROP PROCEDURE IF EXISTS [dbo].[SelectBanked]
 DROP PROCEDURE IF EXISTS [dbo].[SelectEquipped]
 DROP PROCEDURE IF EXISTS [dbo].[SelectInventory]
 DROP PROCEDURE IF EXISTS [dbo].[SelectDiscoveredMaps]
-DROP PROCEDURE IF EXISTS [dbo].[SelectDeBuffsCheck]
 DROP PROCEDURE IF EXISTS [dbo].[SelectDeBuffs]
-DROP PROCEDURE IF EXISTS [dbo].[SelectBuffsCheck]
 DROP PROCEDURE IF EXISTS [dbo].[SelectBuffs]
+DROP PROCEDURE IF EXISTS [dbo].[PlayerDeBuffSync]
+DROP PROCEDURE IF EXISTS [dbo].[PlayerBuffSync]
 DROP PROCEDURE IF EXISTS [dbo].[PlayerSecurity]
 DROP PROCEDURE IF EXISTS [dbo].[PlayerSaveSpells]
 DROP PROCEDURE IF EXISTS [dbo].[PlayerSaveSkills]
@@ -46,16 +46,12 @@ DROP PROCEDURE IF EXISTS [dbo].[PlayerCreation]
 DROP PROCEDURE IF EXISTS [dbo].[AccountLockoutCount]
 DROP PROCEDURE IF EXISTS [dbo].[PasswordSave]
 DROP PROCEDURE IF EXISTS [dbo].[InsertQuests]
-DROP PROCEDURE IF EXISTS [dbo].[InsertDeBuff]
-DROP PROCEDURE IF EXISTS [dbo].[InsertBuff]
 DROP PROCEDURE IF EXISTS [dbo].[IgnoredSave]
 DROP PROCEDURE IF EXISTS [dbo].[FoundMap]
-DROP PROCEDURE IF EXISTS [dbo].[DeBuffSave]
 DROP PROCEDURE IF EXISTS [dbo].[CheckIfPlayerSerialExists]
 DROP PROCEDURE IF EXISTS [dbo].[CheckIfPlayerHashExists]
 DROP PROCEDURE IF EXISTS [dbo].[CheckIfPlayerExists]
 DROP PROCEDURE IF EXISTS [dbo].[LoadItemsToCache]
-DROP PROCEDURE IF EXISTS [dbo].[BuffSave]
 DROP PROCEDURE IF EXISTS [dbo].[AddLegendMark]
 DROP PROCEDURE IF EXISTS [dbo].[ItemUpsert]
 DROP PROCEDURE IF EXISTS [dbo].[ItemMassDelete]
@@ -198,15 +194,13 @@ CREATE TABLE PlayersDiscoveredMaps
 
 CREATE TABLE PlayersBuffs
 (
-	[BuffId] INT NOT NULL PRIMARY KEY, 
 	[Serial] BIGINT FOREIGN KEY REFERENCES Players(Serial),
 	[Name] VARCHAR(30) NULL,
 	[TimeLeft] INT NOT NULL DEFAULT 0
 )
 
 CREATE TABLE PlayersDebuffs
 (
-	[DebuffId] INT NOT NULL PRIMARY KEY,
 	[Serial] BIGINT FOREIGN KEY REFERENCES Players(Serial),
 	[Name] VARCHAR(30) NULL,
 	[TimeLeft] INT NOT NULL DEFAULT 0
@@ -747,26 +741,6 @@ BEGIN
 END
 GO
 
--- BuffSave
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-CREATE PROCEDURE [dbo].[BuffSave]
-    @Buffs dbo.BuffType READONLY
-AS
-BEGIN
-    SET NOCOUNT ON;
-
-    UPDATE target
-    SET    target.[Name] = source.[Name],
-           target.[TimeLeft] = source.[TimeLeft]
-    FROM [ZolianPlayers].[dbo].[PlayersBuffs] AS target
-    INNER JOIN @Buffs AS source
-    ON target.Serial = source.Serial AND target.Name = source.Name;
-END
-GO
-
 -- LoadItemsToCache
 SET ANSI_NULLS ON
 GO
@@ -820,26 +794,6 @@ BEGIN
 END
 GO
 
--- DeBuffSave
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-CREATE PROCEDURE [dbo].[DeBuffSave]
-    @Debuffs dbo.DebuffType READONLY
-AS
-BEGIN
-    SET NOCOUNT ON;
-
-    UPDATE target
-    SET    target.[Name] = source.[Name],
-           target.[TimeLeft] = source.[TimeLeft]
-    FROM [ZolianPlayers].[dbo].[PlayersDebuffs] AS target
-    INNER JOIN @Debuffs AS source
-    ON target.Serial = source.Serial AND target.Name = source.Name;
-END
-GO
-
 -- FoundMap
 SET ANSI_NULLS ON
 GO
@@ -870,36 +824,6 @@ BEGIN
 END
 GO
 
--- InsertBuff
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-CREATE PROCEDURE [dbo].[InsertBuff]
-@BuffId INT, @Serial BIGINT, @Name VARCHAR(30), @TimeLeft INT
-AS
-BEGIN
-    SET NOCOUNT ON;
-    INSERT  INTO [ZolianPlayers].[dbo].[PlayersBuffs] ([BuffId], [Serial], [Name], [TimeLeft])
-    VALUES	(@BuffId, @Serial, @Name, @TimeLeft);
-END
-GO
-
--- InsertDeBuff
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-CREATE PROCEDURE [dbo].[InsertDeBuff]
-@DebuffId INT, @Serial BIGINT, @Name VARCHAR(30), @TimeLeft INT
-AS
-BEGIN
-    SET NOCOUNT ON;
-    INSERT  INTO [ZolianPlayers].[dbo].[PlayersDeBuffs] ([DebuffId], [Serial], [Name], [TimeLeft])
-    VALUES	(@DebuffId, @Serial, @Name, @TimeLeft);
-END
-GO
-
 -- InsertQuests
 SET ANSI_NULLS ON
 GO
@@ -1343,55 +1267,109 @@ BEGIN
 END
 GO
 
--- SelectBuffs
+-- PlayerBuffSync
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE PROCEDURE [dbo].[SelectBuffs] @Serial BIGINT
+CREATE OR ALTER PROCEDURE dbo.PlayerBuffSync
+(
+    @Serial BIGINT,
+    @Buffs  dbo.BuffType READONLY
+)
 AS
 BEGIN
-	SET NOCOUNT ON;
-	SELECT * FROM ZolianPlayers.dbo.PlayersBuffs WHERE Serial = @Serial
-END
+    SET NOCOUNT ON;
+    SET XACT_ABORT ON;
+
+    ;WITH SourceRows AS
+    (
+        SELECT
+            @Serial AS Serial,
+            b.[Name],
+            b.TimeLeft
+        FROM @Buffs b
+        WHERE b.Serial = @Serial
+    )
+    MERGE dbo.PlayersBuffs WITH (HOLDLOCK) AS t
+    USING SourceRows AS s
+        ON  t.Serial = s.Serial
+        AND t.[Name] = s.[Name]
+    WHEN MATCHED THEN
+        UPDATE SET
+            t.TimeLeft = s.TimeLeft
+    WHEN NOT MATCHED BY TARGET THEN
+        INSERT (Serial, [Name], TimeLeft)
+        VALUES (s.Serial, s.[Name], s.TimeLeft)
+    WHEN NOT MATCHED BY SOURCE
+         AND t.Serial = @Serial
+    THEN DELETE;
+END;
 GO
 
--- SelectBuffsCheck
+-- PlayerDeBuffSync
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE PROCEDURE [dbo].[SelectBuffsCheck] @Serial BIGINT, @Name VARCHAR(30)
+CREATE OR ALTER PROCEDURE dbo.PlayerDeBuffSync
+(
+    @Serial BIGINT,
+    @Debuffs  dbo.DebuffType READONLY
+)
 AS
 BEGIN
-	SET NOCOUNT ON;
-	SELECT * FROM ZolianPlayers.dbo.PlayersBuffs WHERE Serial = @Serial AND Name = @Name
-END
+    SET NOCOUNT ON;
+    SET XACT_ABORT ON;
+
+    ;WITH SourceRows AS
+    (
+        SELECT
+            @Serial AS Serial,
+            b.[Name],
+            b.TimeLeft
+        FROM @Debuffs b
+        WHERE b.Serial = @Serial
+    )
+    MERGE dbo.PlayersDebuffs WITH (HOLDLOCK) AS t
+    USING SourceRows AS s
+        ON  t.Serial = s.Serial
+        AND t.[Name] = s.[Name]
+    WHEN MATCHED THEN
+        UPDATE SET
+            t.TimeLeft = s.TimeLeft
+    WHEN NOT MATCHED BY TARGET THEN
+        INSERT (Serial, [Name], TimeLeft)
+        VALUES (s.Serial, s.[Name], s.TimeLeft)
+    WHEN NOT MATCHED BY SOURCE
+         AND t.Serial = @Serial
+    THEN DELETE;
+END;
 GO
 
--- SelectDeBuffs
+-- SelectBuffs
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE PROCEDURE [dbo].[SelectDeBuffs] @Serial BIGINT
+CREATE PROCEDURE [dbo].[SelectBuffs] @Serial BIGINT
 AS
 BEGIN
 	SET NOCOUNT ON;
-	SELECT * FROM ZolianPlayers.dbo.PlayersDebuffs WHERE Serial = @Serial
+	SELECT * FROM ZolianPlayers.dbo.PlayersBuffs WHERE Serial = @Serial
 END
 GO
 
--- SelectDeBuffsCheck
+-- SelectDeBuffs
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE PROCEDURE [dbo].[SelectDeBuffsCheck] @Serial BIGINT, @Name VARCHAR(30)
+CREATE PROCEDURE [dbo].[SelectDeBuffs] @Serial BIGINT
 AS
 BEGIN
 	SET NOCOUNT ON;
-	SELECT * FROM ZolianPlayers.dbo.PlayersDebuffs WHERE Serial = @Serial AND Name = @Name
+	SELECT * FROM ZolianPlayers.dbo.PlayersDebuffs WHERE Serial = @Serial
 END
 GO
 

Zolian.Server.Base/Database/AislingStorage.cs

@@ -398,8 +398,8 @@ private async Task PlayerSaveRoutine(Aisling player, CancellationToken ct)
             await ExecTvpAsync(conn, tx, "ItemUpsert", "@Items", "dbo.ItemType", iDt, ct).ConfigureAwait(false);
             await ExecTvpAsync(conn, tx, "PlayerSaveSkills", "@Skills", "dbo.SkillType", skillDt, ct).ConfigureAwait(false);
             await ExecTvpAsync(conn, tx, "PlayerSaveSpells", "@Spells", "dbo.SpellType", spellDt, ct).ConfigureAwait(false);
-            await ExecTvpAsync(conn, tx, "BuffSave", "@Buffs", "dbo.BuffType", buffDt, ct).ConfigureAwait(false);
-            await ExecTvpAsync(conn, tx, "DeBuffSave", "@Debuffs", "dbo.DebuffType", debuffDt, ct).ConfigureAwait(false);
+            await ExecTvpAsync(conn, tx, "PlayerBuffSync", "@Buffs", "dbo.BuffType", buffDt, ct, new SqlParameter("@Serial", SqlDbType.BigInt) { Value = (long)player.Serial }).ConfigureAwait(false);
+            await ExecTvpAsync(conn, tx, "PlayerDeBuffSync", "@Debuffs", "dbo.DebuffType", debuffDt, ct, new SqlParameter("@Serial", SqlDbType.BigInt) { Value = (long)player.Serial }).ConfigureAwait(false);
 
             await tx.CommitAsync(ct).ConfigureAwait(false);
 
@@ -414,15 +414,26 @@ private async Task PlayerSaveRoutine(Aisling player, CancellationToken ct)
         }
     }
 
-    private static async Task ExecTvpAsync(SqlConnection conn, SqlTransaction tx, string procName,
-        string paramName, string typeName, DataTable tvp, CancellationToken ct)
+    private static async Task ExecTvpAsync(SqlConnection conn, SqlTransaction tx, string procName, string tvpParamName,
+        string typeName, DataTable tvp, CancellationToken ct, params SqlParameter[] extraParams)
     {
         await using var cmd = new SqlCommand(procName, conn, tx)
         {
             CommandType = CommandType.StoredProcedure
         };
 
-        var p = cmd.Parameters.AddWithValue(paramName, tvp);
+        // Add scalar/extra parameters first
+        if (extraParams is { Length: > 0 })
+        {
+            foreach (var ep in extraParams)
+            {
+                if (ep is null) continue;
+                cmd.Parameters.Add(ep);
+            }
+        }
+
+        // Add TVP parameter
+        var p = cmd.Parameters.AddWithValue(tvpParamName, tvp);
         p.SqlDbType = SqlDbType.Structured;
         p.TypeName = typeName;