Skip to content
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.

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

Closes #3545 #3546

Merged
merged 39 commits into from
Jun 30, 2024
Merged
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e9fad1a
Merge pull request #18 from BrentOzarULTD/dev
erikdarlingdata Oct 16, 2020
063a027
Merge pull request #19 from BrentOzarULTD/dev
erikdarlingdata Nov 13, 2020
af1419d
Merge pull request #20 from BrentOzarULTD/dev
erikdarlingdata Nov 17, 2020
e2b15db
Merge pull request #21 from BrentOzarULTD/dev
erikdarlingdata Dec 3, 2020
a571d5d
Merge pull request #22 from BrentOzarULTD/dev
erikdarlingdata Dec 14, 2020
3babb93
Merge pull request #23 from BrentOzarULTD/dev
erikdarlingdata Jan 19, 2021
7c0145a
Merge pull request #24 from BrentOzarULTD/dev
erikdarlingdata Jan 27, 2021
6e04264
Merge pull request #25 from BrentOzarULTD/dev
erikdarlingdata Feb 22, 2021
0034c4b
Merge pull request #26 from BrentOzarULTD/dev
erikdarlingdata Mar 18, 2021
aec853a
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Jun 7, 2021
3351b86
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Jul 7, 2021
2ceaf4c
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Jul 14, 2021
f0e6981
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Aug 1, 2021
fc3544d
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Sep 4, 2021
b0873fd
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Sep 11, 2021
8faf9c3
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Oct 9, 2021
b9f6253
Merge pull request #27 from BrentOzarULTD/dev
erikdarlingdata Oct 25, 2021
38fdb51
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Mar 21, 2022
c727280
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Jul 15, 2022
c870dae
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Nov 9, 2022
6b2c933
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Dec 19, 2022
21bdfab
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata May 17, 2023
da4d6f3
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Jun 28, 2023
d3a0cc1
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Jul 7, 2023
aea7771
Update sp_BlitzLock.sql
erikdarlingdata Jul 7, 2023
9675461
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Jul 15, 2023
19a03c3
Merge branch 'dev' of https://github.com/erikdarlingdata/SQL-Server-F…
erikdarlingdata Aug 16, 2023
2d78242
Merge branch 'dev' of https://github.com/erikdarlingdata/SQL-Server-F…
erikdarlingdata Sep 28, 2023
cb01d5a
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Oct 11, 2023
4512041
Update sp_BlitzLock.sql
erikdarlingdata Oct 11, 2023
b4569d3
Merge branch 'dev' of https://github.com/erikdarlingdata/SQL-Server-F…
erikdarlingdata Oct 11, 2023
37e7177
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Nov 19, 2023
da110dc
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Jan 5, 2024
4d344ad
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Jan 18, 2024
98aeebc
Update sp_BlitzLock.sql
erikdarlingdata Jan 18, 2024
47db6ca
Merge branch 'BrentOzarULTD:dev' into dev
erikdarlingdata Mar 28, 2024
7261672
Merge branch 'dev' of https://github.com/erikdarlingdata/SQL-Server-F…
erikdarlingdata May 28, 2024
126bb62
Merge branch 'dev' of https://github.com/erikdarlingdata/SQL-Server-F…
erikdarlingdata Jun 25, 2024
a3a444e
Update sp_BlitzLock.sql
erikdarlingdata Jun 25, 2024
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
48 changes: 28 additions & 20 deletions sp_BlitzLock.sql
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ ALTER PROCEDURE
@EventSessionName sysname = N'system_health',
@TargetSessionType sysname = NULL,
@VictimsOnly bit = 0,
@DeadlockType nvarchar(20) = NULL,
@Debug bit = 0,
@DeadlockType nvarchar(20) = NULL,
@Debug bit = 0,
@Help bit = 0,
@Version varchar(30) = NULL OUTPUT,
@VersionDate datetime = NULL OUTPUT,
Expand Down Expand Up @@ -709,18 +709,18 @@ BEGIN
END CATCH;
END;

IF @DeadlockType IS NOT NULL
BEGIN
SELECT
@DeadlockType =
CASE
WHEN LOWER(@DeadlockType) LIKE 'regular%'
THEN N'Regular Deadlock'
WHEN LOWER(@DeadlockType) LIKE N'parallel%'
THEN N'Parallel Deadlock'
ELSE NULL
END;
END;
IF @DeadlockType IS NOT NULL
BEGIN
SELECT
@DeadlockType =
CASE
WHEN LOWER(@DeadlockType) LIKE 'regular%'
THEN N'Regular Deadlock'
WHEN LOWER(@DeadlockType) LIKE N'parallel%'
THEN N'Parallel Deadlock'
ELSE NULL
END;
END;

/*If @TargetSessionType, we need to figure out if it's ring buffer or event file*/
/*Azure has differently named views, so we need to separate. Thanks, Azure.*/
Expand Down Expand Up @@ -3463,8 +3463,8 @@ BEGIN
AND (d.client_app = @AppName OR @AppName IS NULL)
AND (d.host_name = @HostName OR @HostName IS NULL)
AND (d.login_name = @LoginName OR @LoginName IS NULL)
AND (d.deadlock_type = @DeadlockType OR @DeadlockType IS NULL)
OPTION (RECOMPILE, LOOP JOIN, HASH JOIN);
AND (d.deadlock_type = @DeadlockType OR @DeadlockType IS NULL)
OPTION (RECOMPILE, LOOP JOIN, HASH JOIN);

UPDATE d
SET d.inputbuf =
Expand Down Expand Up @@ -3851,7 +3851,11 @@ BEGIN
deqs.max_reserved_threads,
deqs.min_used_threads,
deqs.max_used_threads,
deqs.total_rows
deqs.total_rows,
max_worker_time_ms =
deqs.max_worker_time / 1000.,
max_elapsed_time_ms =
deqs.max_elapsed_time / 1000.
INTO #dm_exec_query_stats
FROM sys.dm_exec_query_stats AS deqs
WHERE EXISTS
Expand Down Expand Up @@ -3883,8 +3887,10 @@ BEGIN
ap.executions_per_second,
ap.total_worker_time_ms,
ap.avg_worker_time_ms,
ap.max_worker_time_ms,
ap.total_elapsed_time_ms,
ap.avg_elapsed_time_ms,
ap.max_elapsed_time_ms,
ap.total_logical_reads_mb,
ap.total_physical_reads_mb,
ap.total_logical_writes_mb,
Expand Down Expand Up @@ -3927,7 +3933,9 @@ BEGIN
c.min_used_threads,
c.max_used_threads,
c.total_rows,
c.query_plan
c.query_plan,
c.max_worker_time_ms,
c.max_elapsed_time_ms
FROM #available_plans AS ap
OUTER APPLY
(
Expand Down Expand Up @@ -4078,8 +4086,8 @@ BEGIN
@TargetSessionType,
VictimsOnly =
@VictimsOnly,
DeadlockType =
@DeadlockType,
DeadlockType =
@DeadlockType,
Debug =
@Debug,
Help =
Expand Down