Merge pull request #732 from erikdarlingdata/dev

Narrow plan cache lookups with statement offsets

Author: erikdarlingdata

sp_HealthParser/sp_HealthParser.sql

@@ -6161,6 +6161,8 @@ AND   ca.utc_timestamp < @end_date';
                     deqs.statement_end_offset
                 ) AS deps
                 WHERE deqs.sql_handle = ap.sql_handle
+                AND   deqs.statement_start_offset = ap.stmtstart
+                AND   deqs.statement_end_offset = ap.stmtend
             ) AS c
         ) AS ap
         WHERE ap.query_plan IS NOT NULL

sp_HumanEvents/sp_HumanEvents.sql

@@ -3482,6 +3482,8 @@ BEGIN
                 deqs.statement_end_offset
             ) AS deps
             WHERE deqs.sql_handle = ap.sql_handle
+            AND   deqs.statement_start_offset = ap.stmtstart
+            AND   deqs.statement_end_offset = ap.stmtend
             AND   deps.dbid IN (ap.database_id, ap.currentdbid)
         ) AS c
     ) AS ap

sp_HumanEvents/sp_HumanEventsBlockViewer.sql

@@ -1814,6 +1814,8 @@ BEGIN
                 deqs.statement_end_offset
             ) AS deps
             WHERE deqs.sql_handle = ap.sql_handle
+            AND   deqs.statement_start_offset = ap.stmtstart
+            AND   deqs.statement_end_offset = ap.stmtend
         ) AS c
     ) AS ap
     WHERE ap.query_plan IS NOT NULL
@@ -2858,6 +2860,8 @@ BEGIN
                 deqs.statement_end_offset
             ) AS deps
             WHERE deqs.sql_handle = ap.sql_handle
+            AND   deqs.statement_start_offset = ap.stmtstart
+            AND   deqs.statement_end_offset = ap.stmtend
             AND   deps.dbid IN (ap.database_id, ap.currentdbid)
         ) AS c
     ) AS ap

sp_IndexCleanup/sp_IndexCleanup.sql

@@ -2311,7 +2311,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             nvarchar(MAX),
             N'.sys.dm_db_partition_stats ps
         WHERE ps.object_id = i.object_id
-        AND   ps.index_id = 1
+        AND   ps.index_id IN (0, 1)
         AND   ps.row_count >= @min_rows
     )'
         );
@@ -4524,8 +4524,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             CASE
                 WHEN ia.action = N'MAKE UNIQUE'
                 THEN N'CREATE UNIQUE '
-                WHEN ia.action = N'MERGE INCLUDES'
-                THEN N'CREATE '
+                WHEN ia.is_unique = 1
+                THEN N'CREATE UNIQUE '
                 ELSE N'CREATE '
             END +
             N'INDEX ' +