- @* Order per Joe #215 E11: Elapsed → CPU:Elapsed → DOP → CPU → Compile → Memory → Used → Optimization → CE Model → Cost *@
+ @* Order per Joe #215 E11: Elapsed → CPU:Elapsed → DOP → CPU → Compile → Memory → Used → CE Model → Optimization → Cost.
+ #613 moved CE Model above Optimization, the same order as the App's Runtime Summary. *@
@if (Stmt.QueryTime != null)
{
@@ -86,18 +87,18 @@
}
}
- @if (Stmt.OptimizationLevel != null)
+ @if (Stmt.CardinalityEstimationModel > 0)
{
- Optimization
- @Stmt.OptimizationLevel
+ CE Model
+ @Stmt.CardinalityEstimationModel
}
- @if (Stmt.CardinalityEstimationModel > 0)
+ @if (Stmt.OptimizationLevel != null)
{
- CE Model
- @Stmt.CardinalityEstimationModel
+ Optimization
+ @Stmt.OptimizationLevel
}
diff --git a/tests/PlanViewer.Core.Tests/HtmlExporterTests.cs b/tests/PlanViewer.Core.Tests/HtmlExporterTests.cs
index f316bdb..b4734ac 100644
--- a/tests/PlanViewer.Core.Tests/HtmlExporterTests.cs
+++ b/tests/PlanViewer.Core.Tests/HtmlExporterTests.cs
@@ -115,6 +115,24 @@ public void Export_CraftedSeverityOnAnOperator_IsMappedToo()
Assert.Contains("
", html);
}
+ /// #613: the runtime card lists CE Model above Optimization, the same order as the App's Runtime Summary.
+ [Fact]
+ public void Export_RuntimeCard_ListsCeModelAboveOptimization()
+ {
+ var plan = PlanTestHelper.LoadAndAnalyze("key_lookup_plan.sqlplan");
+ foreach (var batch in plan.Batches)
+ foreach (var stmt in batch.Statements)
+ PlanLayoutEngine.Layout(stmt);
+
+ var result = ResultMapper.Map(plan, "key_lookup_plan.sqlplan");
+ var html = HtmlExporter.Export(result, TextFormatter.Format(result));
+
+ var ceModel = html.IndexOf("CE Model", StringComparison.Ordinal);
+ var optimization = html.IndexOf("Optimization", StringComparison.Ordinal);
+ Assert.True(ceModel >= 0, "no CE Model row");
+ Assert.True(optimization > ceModel, "Optimization is not below CE Model");
+ }
+
private static string ExportWithSeverity(string? severity, bool onOperator = false)
{
var warning = new WarningResult { Severity = severity!, Type = "demo", Message = "demo" };
diff --git a/tests/PlanViewer.Core.Tests/RuntimeSummaryEarlyAbortTests.cs b/tests/PlanViewer.Core.Tests/RuntimeSummaryEarlyAbortTests.cs
new file mode 100644
index 0000000..d9721de
--- /dev/null
+++ b/tests/PlanViewer.Core.Tests/RuntimeSummaryEarlyAbortTests.cs
@@ -0,0 +1,94 @@
+using System.IO;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using PlanViewer.App.Controls;
+
+namespace PlanViewer.Core.Tests;
+
+///
+/// #613: the early abort reason is part of the optimization result (StatementOptmEarlyAbortReason
+/// only exists for a FULL optimization), so the Runtime Summary shows it as a detail of the
+/// Optimization row: on the next row, with its label indented and its value in the same column.
+/// CE model moved up above Optimization, so Optimization and its reason end the list.
+///
+public class RuntimeSummaryEarlyAbortTests
+{
+ [Fact]
+ public void EarlyAbort_IsNestedUnderOptimization()
+ {
+ HeadlessUi.Run(() =>
+ {
+ var viewer = LoadPlan(stripOptimizationLevel: false);
+ var window = new Window { Content = viewer, Width = 1400, Height = 900 };
+ window.Show();
+ window.UpdateLayout();
+
+ var grid = SummaryGrid(viewer);
+ var ceModel = Label(grid, "CE model");
+ var optimization = Label(grid, "Optimization");
+ var earlyAbort = Label(grid, "Early abort");
+
+ Assert.Equal(Grid.GetRow(ceModel) + 1, Grid.GetRow(optimization));
+ Assert.Equal(Grid.GetRow(optimization) + 1, Grid.GetRow(earlyAbort));
+ Assert.Equal(grid.RowDefinitions.Count - 1, Grid.GetRow(earlyAbort));
+ Assert.True(earlyAbort.Margin.Left > optimization.Margin.Left,
+ $"Early abort label is not indented: {earlyAbort.Margin.Left} vs {optimization.Margin.Left}");
+ Assert.Equal("GoodEnoughPlanFound", Value(grid, earlyAbort));
+ });
+ }
+
+ [Fact]
+ public void EarlyAbort_WithoutAnOptimizationRow_IsNotIndented()
+ {
+ HeadlessUi.Run(() =>
+ {
+ var viewer = LoadPlan(stripOptimizationLevel: true);
+ var window = new Window { Content = viewer, Width = 1400, Height = 900 };
+ window.Show();
+ window.UpdateLayout();
+
+ var grid = SummaryGrid(viewer);
+ Assert.DoesNotContain(grid.Children.OfType(), t => t.Text == "Optimization");
+
+ var earlyAbort = Label(grid, "Early abort");
+ var elapsed = Label(grid, "Elapsed");
+ Assert.Equal(elapsed.Margin.Left, earlyAbort.Margin.Left);
+ });
+ }
+
+ ///
+ /// key_lookup_plan.sqlplan is an actual plan with StatementOptmLevel="FULL" and
+ /// StatementOptmEarlyAbortReason="GoodEnoughPlanFound". Removing the level leaves a reason
+ /// with no row to nest under.
+ ///
+ private static PlanViewerControl LoadPlan(bool stripOptimizationLevel)
+ {
+ var path = Path.Combine("Plans", "key_lookup_plan.sqlplan");
+ Assert.True(File.Exists(path), $"Test plan not found: {path}");
+ var xml = File.ReadAllText(path).Replace("encoding=\"utf-16\"", "encoding=\"utf-8\"");
+
+ const string level = "StatementOptmLevel=\"FULL\"";
+ Assert.Contains(level, xml);
+ Assert.Contains("StatementOptmEarlyAbortReason=\"GoodEnoughPlanFound\"", xml);
+ if (stripOptimizationLevel)
+ xml = xml.Replace(level, "");
+
+ var viewer = new PlanViewerControl();
+ Assert.True(viewer.LoadPlan(xml, "key_lookup_plan.sqlplan"), $"Plan failed to load: {viewer.LastLoadError}");
+ return viewer;
+ }
+
+ private static Grid SummaryGrid(PlanViewerControl viewer)
+ {
+ var panel = viewer.GetLogicalDescendants().OfType().First(p => p.Name == "RuntimeSummaryContent");
+ return (Grid)panel.Children.Single();
+ }
+
+ private static TextBlock Label(Grid grid, string label)
+ => grid.Children.OfType().Single(t => Grid.GetColumn(t) == 0 && t.Text == label);
+
+ private static string Value(Grid grid, TextBlock label)
+ => grid.Children.OfType()
+ .Single(t => Grid.GetColumn(t) == 1 && Grid.GetRow(t) == Grid.GetRow(label)).Text ?? "";
+}