wait profiles added for GroupBy displays

Author: rferraton

src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs

@@ -1,11 +1,10 @@
 using System;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
@@ -302,6 +301,89 @@ private async System.Threading.Tasks.Task FetchGroupedPlansAsync(
         SelectToggleButton.Content = "Select All";
         UpdateStatusText();
         UpdateBarRatios();
+
+        // Fetch per-plan wait stats for leaf rows, then consolidate upward
+        if (_waitStatsSupported && _waitStatsEnabled && _slicerStartUtc.HasValue && _slicerEndUtc.HasValue)
+            _ = FetchGroupedWaitStatsAsync(_slicerStartUtc.Value, _slicerEndUtc.Value, ct);
+    }
+
+    /// <summary>
+    /// Fetches per-plan wait stats for all real plan IDs found in the grouped hierarchy,
+    /// assigns them to leaf rows, then consolidates upward to intermediate and root rows.
+    /// </summary>
+    private async System.Threading.Tasks.Task FetchGroupedWaitStatsAsync(
+        DateTime startUtc, DateTime endUtc, CancellationToken ct)
+    {
+        try
+        {
+            // Collect all real plan IDs from rows that have a real PlanId
+            var allPlanIds = _rows
+                .Where(r => r.PlanId > 0)
+                .Select(r => r.PlanId)
+                .Distinct()
+                .ToList();
+
+            if (allPlanIds.Count == 0) return;
+
+            var planWaits = await QueryStoreService.FetchPlanWaitStatsAsync(
+                _connectionString, startUtc, endUtc, allPlanIds, ct);
+            if (ct.IsCancellationRequested) return;
+
+            // Build lookup: plan_id → list of WaitCategoryTotal
+            var byPlan = planWaits
+                .GroupBy(x => x.PlanId)
+                .ToDictionary(g => g.Key, g => g.Select(x => x.Wait).ToList());
+
+            // 1. Assign raw waits + profiles to rows with a real PlanId
+            foreach (var row in _rows)
+            {
+                if (row.PlanId > 0 && byPlan.TryGetValue(row.PlanId, out var waits))
+                {
+                    row.RawWaitCategories = waits;
+                    row.WaitProfile = QueryStoreService.BuildWaitProfile(waits);
+                }
+            }
+
+            // 2. Consolidate upward through the hierarchy
+            foreach (var root in _groupedRootRows)
+                ConsolidateWaitProfileUpward(root);
+
+            UpdateWaitBarMode();
+        }
+        catch (OperationCanceledException) { }
+        catch (Exception) { }
+    }
+
+    /// <summary>
+    /// Recursively consolidates wait profiles from children into their parent.
+    /// For each parent: merges all children's RawWaitCategories by summing WaitRatio
+    /// per category, then builds a new WaitProfile from the merged totals.
+    /// </summary>
+    private static void ConsolidateWaitProfileUpward(QueryStoreRow parent)
+    {
+        if (parent.Children.Count == 0) return;
+
+        // Recurse first so children are consolidated before we merge them
+        foreach (var child in parent.Children)
+            ConsolidateWaitProfileUpward(child);
+
+        // Merge all children's raw wait categories by summing WaitRatio per category
+        var merged = parent.Children
+            .SelectMany(c => c.RawWaitCategories)
+            .GroupBy(w => new { w.WaitCategory, w.WaitCategoryDesc })
+            .Select(g => new WaitCategoryTotal
+            {
+                WaitCategory = g.Key.WaitCategory,
+                WaitCategoryDesc = g.Key.WaitCategoryDesc,
+                WaitRatio = g.Sum(w => w.WaitRatio),
+            })
+            .ToList();
+
+        if (merged.Count > 0)
+        {
+            parent.RawWaitCategories = merged;
+            parent.WaitProfile = QueryStoreService.BuildWaitProfile(merged);
+        }
     }
 
     /// <summary>Maps an orderBy metric string to a Func that extracts the sort value from a QueryStoreRow.</summary>
@@ -810,7 +892,10 @@ private async System.Threading.Tasks.Task FetchWaitStatsAsync(
         DateTime startUtc, DateTime endUtc, CancellationToken ct)
     {
         await FetchGlobalWaitStatsOnlyAsync(startUtc, endUtc, ct);
-        await FetchPerPlanWaitStatsAsync(startUtc, endUtc, ct);
+        if (_groupByMode != QueryStoreGroupBy.None)
+            await FetchGroupedWaitStatsAsync(startUtc, endUtc, ct);
+        else
+            await FetchPerPlanWaitStatsAsync(startUtc, endUtc, ct);
     }
 
     private void OnWaitCategoryClicked(object? sender, string category)
@@ -1460,88 +1545,91 @@ private static IComparable GetSortKey(string columnTag, QueryStoreRow r) =>
         };
 }
 
-public class QueryStoreRow : INotifyPropertyChanged
-{
-    private bool _isSelected = false;
-
-    // Bar ratios [0..1] per column
-    private double _execsRatio;
-    private double _totalCpuRatio;
-    private double _avgCpuRatio;
-    private double _totalDurRatio;
-    private double _avgDurRatio;
-    private double _totalReadsRatio;
-    private double _avgReadsRatio;
-    private double _totalWritesRatio;
-    private double _avgWritesRatio;
-    private double _totalPhysReadsRatio;
-    private double _avgPhysReadsRatio;
-    private double _totalMemRatio;
-    private double _avgMemRatio;
-
-    // IsSortedColumn flags
-    private bool _isSorted_Executions;
-    private bool _isSorted_TotalCpu;
-    private bool _isSorted_AvgCpu;
-    private bool _isSorted_TotalDuration;
-    private bool _isSorted_AvgDuration;
-    private bool _isSorted_TotalReads;
-    private bool _isSorted_AvgReads;
-    private bool _isSorted_TotalWrites;
-    private bool _isSorted_AvgWrites;
-    private bool _isSorted_TotalPhysReads;
-    private bool _isSorted_AvgPhysReads;
-    private bool _isSorted_TotalMemory;
-    private bool _isSorted_AvgMemory;
-
-    // Wait stats
-    private WaitProfile? _waitProfile;
-    private string? _waitHighlightCategory;
-
-    // Hierarchy support
-    private bool _isExpanded;
-    private int _indentLevel;
-
-    /// <summary>Standard constructor for flat (ungrouped) rows.</summary>
-    public QueryStoreRow(QueryStorePlan plan)
-    {
-        Plan = plan;
-    }
-
-    /// <summary>Constructor for grouped parent/intermediate rows (aggregated, no single plan).</summary>
-    public QueryStoreRow(QueryStorePlan syntheticPlan, int indentLevel, string groupLabel, List<QueryStoreRow> children)
-    {
-        Plan = syntheticPlan;
-        _indentLevel = indentLevel;
-        GroupLabel = groupLabel;
-        Children = children;
-    }
-
-    public QueryStorePlan Plan { get; }
-
-    // ── Hierarchy properties ───────────────────────────────────────────────
-
-    /// <summary>Indentation level: 0 = top group, 1 = intermediate, 2 = leaf.</summary>
-    public int IndentLevel
-    {
-        get => _indentLevel;
-        set { _indentLevel = value; OnPropertyChanged(); }
-    }
-
-    /// <summary>Label shown for grouped rows (e.g. "0x1A2B3C" or "dbo.MyProc").</summary>
-    public string GroupLabel { get; set; } = "";
-
-    /// <summary>Direct children of this group row.</summary>
-    public List<QueryStoreRow> Children { get; set; } = new();
-
-    public bool HasChildren => Children.Count > 0;
-
-    public bool IsExpanded
-    {
-        get => _isExpanded;
-        set { _isExpanded = value; OnPropertyChanged(); OnPropertyChanged(nameof(ExpandChevron)); }
-    }
-
+public class QueryStoreRow : INotifyPropertyChanged
+{
+    private bool _isSelected = false;
+
+    // Bar ratios [0..1] per column
+    private double _execsRatio;
+    private double _totalCpuRatio;
+    private double _avgCpuRatio;
+    private double _totalDurRatio;
+    private double _avgDurRatio;
+    private double _totalReadsRatio;
+    private double _avgReadsRatio;
+    private double _totalWritesRatio;
+    private double _avgWritesRatio;
+    private double _totalPhysReadsRatio;
+    private double _avgPhysReadsRatio;
+    private double _totalMemRatio;
+    private double _avgMemRatio;
+
+    // IsSortedColumn flags
+    private bool _isSorted_Executions;
+    private bool _isSorted_TotalCpu;
+    private bool _isSorted_AvgCpu;
+    private bool _isSorted_TotalDuration;
+    private bool _isSorted_AvgDuration;
+    private bool _isSorted_TotalReads;
+    private bool _isSorted_AvgReads;
+    private bool _isSorted_TotalWrites;
+    private bool _isSorted_AvgWrites;
+    private bool _isSorted_TotalPhysReads;
+    private bool _isSorted_AvgPhysReads;
+    private bool _isSorted_TotalMemory;
+    private bool _isSorted_AvgMemory;
+
+    // Wait stats
+    private WaitProfile? _waitProfile;
+    private string? _waitHighlightCategory;
+
+    /// <summary>Raw wait category totals for this row. Used for upward consolidation in grouped mode.</summary>
+    public List<WaitCategoryTotal> RawWaitCategories { get; set; } = new();
+
+    // Hierarchy support
+    private bool _isExpanded;
+    private int _indentLevel;
+
+    /// <summary>Standard constructor for flat (ungrouped) rows.</summary>
+    public QueryStoreRow(QueryStorePlan plan)
+    {
+        Plan = plan;
+    }
+
+    /// <summary>Constructor for grouped parent/intermediate rows (aggregated, no single plan).</summary>
+    public QueryStoreRow(QueryStorePlan syntheticPlan, int indentLevel, string groupLabel, List<QueryStoreRow> children)
+    {
+        Plan = syntheticPlan;
+        _indentLevel = indentLevel;
+        GroupLabel = groupLabel;
+        Children = children;
+    }
+
+    public QueryStorePlan Plan { get; }
+
+    // ── Hierarchy properties ───────────────────────────────────────────────
+
+    /// <summary>Indentation level: 0 = top group, 1 = intermediate, 2 = leaf.</summary>
+    public int IndentLevel
+    {
+        get => _indentLevel;
+        set { _indentLevel = value; OnPropertyChanged(); }
+    }
+
+    /// <summary>Label shown for grouped rows (e.g. "0x1A2B3C" or "dbo.MyProc").</summary>
+    public string GroupLabel { get; set; } = "";
+
+    /// <summary>Direct children of this group row.</summary>
+    public List<QueryStoreRow> Children { get; set; } = new();
+
+    public bool HasChildren => Children.Count > 0;
+
+    public bool IsExpanded
+    {
+        get => _isExpanded;
+        set { _isExpanded = value; OnPropertyChanged(); OnPropertyChanged(nameof(ExpandChevron)); }
+    }
+
     public string ExpandChevron => HasChildren ? (IsExpanded ? "▾" : "▸") : "";
 
     /// <summary>Left margin that increases with indent level to visually show hierarchy.</summary>
@@ -1553,10 +1641,10 @@ public bool IsExpanded
     /// <summary>Bold for top-level groups, normal for children.</summary>
     public Avalonia.Media.FontWeight GroupFontWeight => IndentLevel == 0 ? Avalonia.Media.FontWeight.Bold : Avalonia.Media.FontWeight.Normal;
 
-    public bool IsSelected
-    {
-        get => _isSelected;
-        set { _isSelected = value; OnPropertyChanged(); }
+    public bool IsSelected
+    {
+        get => _isSelected;
+        set { _isSelected = value; OnPropertyChanged(); }
     }
 
     // ── Bar ratio properties ───────────────────────────────────────────────