@@ -482,7 +482,7 @@ and @log_to_table to be 0.', 11, 0) WITH NOWAIT;
482482 RETURN ;
483483END
484484
485- IF @is_system_health = 1
485+ IF @is_system_health = 1
486486AND @target_type IS NULL
487487BEGIN
488488 RAISERROR (' No @target_type specified, using the '' event_file'' for system_health.' , 0 , 1 ) WITH NOWAIT ;
@@ -942,7 +942,8 @@ BEGIN
942942 JOIN sys .dm_xe_session_targets AS t
943943 ON s .address = t .event_session_address
944944 WHERE s .name = @session_name
945- ORDER BY t .target_name
945+ ORDER BY
946+ t .target_name
946947 OPTION (RECOMPILE );
947948 END ;
948949
@@ -955,7 +956,8 @@ BEGIN
955956 JOIN sys .dm_xe_database_session_targets AS t
956957 ON s .address = t .event_session_address
957958 WHERE s .name = @session_name
958- ORDER BY t .target_name
959+ ORDER BY
960+ t .target_name
959961 OPTION (RECOMPILE );
960962 END ;
961963END ;
@@ -1908,7 +1910,7 @@ SELECT
19081910 currentdbname = bd .value (' (process/@currentdbname)[1]' , ' nvarchar(256)' ),
19091911 currentdbid = bd .value (' (process/@currentdb)[1]' , ' integer' ),
19101912 blocking_level = 0 ,
1911- sort_order = CAST ( ' ' AS varchar (400 )),
1913+ sort_order = CONVERT ( varchar (400 ), ' ' ),
19121914 activity = CASE WHEN oa .c .exist(' //blocked-process-report/blocked-process' ) = 1 THEN ' blocked' END ,
19131915 blocked_process_report = c .query (' .' )
19141916INTO #blocked
@@ -1946,17 +1948,17 @@ ADD blocking_desc AS
19461948 ISNULL
19471949 (
19481950 ' (' +
1949- CAST (blocking_spid AS varchar (10 )) +
1951+ CONVERT ( varchar (10 ), blocking_spid ) +
19501952 ' :' +
1951- CAST (blocking_ecid AS varchar (10 )) +
1953+ CONVERT ( varchar (10 ), blocking_ecid ) +
19521954 ' )' ,
19531955 ' unresolved process'
19541956 ) PERSISTED ,
19551957 blocked_desc AS
19561958 ' (' +
1957- CAST (blocked_spid AS varchar (10 )) +
1959+ CONVERT ( varchar (10 ), blocked_spid ) +
19581960 ' :' +
1959- CAST (blocked_ecid AS varchar (10 )) +
1961+ CONVERT ( varchar (10 ), blocked_ecid ) +
19601962 ' )' PERSISTED ;
19611963
19621964IF @debug = 1
@@ -2028,7 +2030,7 @@ SELECT
20282030 currentdbname = bg .value (' (process/@currentdbname)[1]' , ' nvarchar(128)' ),
20292031 currentdbid = bg .value (' (process/@currentdb)[1]' , ' integer' ),
20302032 blocking_level = 0 ,
2031- sort_order = CAST ( ' ' AS varchar (400 )),
2033+ sort_order = CONVERT ( varchar (400 ), ' ' ),
20322034 activity = CASE WHEN oa .c .exist(' //blocked-process-report/blocking-process' ) = 1 THEN ' blocking' END ,
20332035 blocked_process_report = c .query (' .' )
20342036INTO #blocking
@@ -2066,17 +2068,17 @@ ADD blocking_desc AS
20662068 ISNULL
20672069 (
20682070 ' (' +
2069- CAST (blocking_spid AS varchar (10 )) +
2071+ CONVERT ( varchar (10 ), blocking_spid ) +
20702072 ' :' +
2071- CAST (blocking_ecid AS varchar (10 )) +
2073+ CONVERT ( varchar (10 ), blocking_ecid ) +
20722074 ' )' ,
20732075 ' unresolved process'
20742076 ) PERSISTED ,
20752077 blocked_desc AS
20762078 ' (' +
2077- CAST (blocked_spid AS varchar (10 )) +
2079+ CONVERT ( varchar (10 ), blocked_spid ) +
20782080 ' :' +
2079- CAST (blocked_ecid AS varchar (10 )) +
2081+ CONVERT ( varchar (10 ), blocked_ecid ) +
20802082 ' )' PERSISTED ;
20812083
20822084IF @debug = 1
@@ -2114,11 +2116,12 @@ WITH
21142116 blocked_desc,
21152117 level = 0 ,
21162118 sort_order =
2117- CAST
2119+ CONVERT
21182120 (
2121+ varchar (400 ),
21192122 blocking_desc +
21202123 ' </* ' +
2121- blocked_desc AS varchar ( 400 )
2124+ blocked_desc
21222125 )
21232126 FROM #blocking AS b
21242127 WHERE NOT EXISTS
@@ -2138,13 +2141,14 @@ WITH
21382141 bg .blocked_desc ,
21392142 h .level + 1 ,
21402143 sort_order =
2141- CAST
2144+ CONVERT
21422145 (
2146+ varchar (400 ),
21432147 h .sort_order +
21442148 ' ' +
21452149 bg .blocking_desc +
21462150 ' </* ' +
2147- bg .blocked_desc AS varchar ( 400 )
2151+ bg .blocked_desc
21482152 )
21492153 FROM hierarchy AS h
21502154 JOIN #blocking AS bg
@@ -2847,7 +2851,6 @@ BEGIN
28472851
28482852 IF @debug = 1
28492853 BEGIN
2850- RAISERROR (' Actual date range: %s to %s, Event count: %I64d' , 0 , 1 , @actual_start_date, @actual_end_date, @actual_event_count) WITH NOWAIT ;
28512854 RAISERROR (' Inserting #block_findings, check_id -1' , 0 , 1 ) WITH NOWAIT ;
28522855 END ;
28532856
0 commit comments