Merge pull request erikdarlingdata#903 from erikdarlingdata/sync/parallelism-columnstore-icons-from-ps

Sync columnstore + Parallelism subtype icons from PerformanceStudio

Author: erikdarlingdata

Dashboard/Resources/PlanIcons/parallelism_distribute_streams.png

@@ -175,8 +175,44 @@ public static class PlanIconMapper
         ["Language Construct Catch All"] = "language_construct_catch_all",
     };
 
-    public static string GetIconName(string physicalOp)
+    public static string GetIconName(string physicalOp, string? storageType = null, string? logicalOp = null)
     {
+        // Parallelism subtypes: PhysicalOp="Parallelism" + LogicalOp identifies which.
+        if (string.Equals(physicalOp, "Parallelism", StringComparison.Ordinal) && logicalOp != null)
+        {
+            switch (logicalOp)
+            {
+                case "Repartition Streams": return "parallelism_repartition_streams";
+                case "Distribute Streams":  return "parallelism_distribute_streams";
+                case "Gather Streams":      return "parallelism_gather_streams";
+            }
+        }
+
+        // Columnstore scans surface as PhysicalOp="Clustered Index Scan" / "Index Scan"
+        // with Storage="ColumnStore" on the Object element. Route to the columnstore icon.
+        if (string.Equals(storageType, "ColumnStore", StringComparison.OrdinalIgnoreCase))
+        {
+            switch (physicalOp)
+            {
+                case "Clustered Index Scan":
+                case "Index Scan":
+                case "Columnstore Index Scan":
+                    return "columnstore_index_scan";
+                case "Clustered Index Delete":
+                case "Index Delete":
+                    return "columnstore_index_delete";
+                case "Clustered Index Insert":
+                case "Index Insert":
+                    return "columnstore_index_insert";
+                case "Clustered Index Update":
+                case "Index Update":
+                    return "columnstore_index_update";
+                case "Clustered Index Merge":
+                case "Index Merge":
+                    return "columnstore_index_merge";
+            }
+        }
+
         if (IconMap.TryGetValue(physicalOp, out var iconName))
             return iconName;
 

Dashboard/Resources/PlanIcons/parallelism_gather_streams.png

@@ -665,8 +665,10 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             node.PhysicalOp = "Lazy " + node.PhysicalOp;
         }
 
-        // Map to icon
-        node.IconName = PlanIconMapper.GetIconName(node.PhysicalOp);
+        // Icon mapping is deferred until after StorageType and LogicalOp are
+        // parsed below, so columnstore scans (Clustered/Index Scan with
+        // Storage="ColumnStore") and Parallelism subtypes route to their
+        // specific icons.
 
         // Handle operator-specific element
         var physicalOpEl = GetOperatorElement(relOpEl);
@@ -1365,6 +1367,11 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             }
         }
 
+        // Map to icon — done here so columnstore scans (Clustered/Index Scan
+        // with Storage="ColumnStore") and Parallelism subtypes (which depend on
+        // LogicalOp) can be routed to their specific icons.
+        node.IconName = PlanIconMapper.GetIconName(node.PhysicalOp, node.StorageType, node.LogicalOp);
+
         // Recurse into child RelOps
         foreach (var childRelOp in FindChildRelOps(relOpEl))
         {

Dashboard/Resources/PlanIcons/parallelism_repartition_streams.png

@@ -175,8 +175,44 @@ public static class PlanIconMapper
         ["Language Construct Catch All"] = "language_construct_catch_all",
     };
 
-    public static string GetIconName(string physicalOp)
+    public static string GetIconName(string physicalOp, string? storageType = null, string? logicalOp = null)
     {
+        // Parallelism subtypes: PhysicalOp="Parallelism" + LogicalOp identifies which.
+        if (string.Equals(physicalOp, "Parallelism", StringComparison.Ordinal) && logicalOp != null)
+        {
+            switch (logicalOp)
+            {
+                case "Repartition Streams": return "parallelism_repartition_streams";
+                case "Distribute Streams":  return "parallelism_distribute_streams";
+                case "Gather Streams":      return "parallelism_gather_streams";
+            }
+        }
+
+        // Columnstore scans surface as PhysicalOp="Clustered Index Scan" / "Index Scan"
+        // with Storage="ColumnStore" on the Object element. Route to the columnstore icon.
+        if (string.Equals(storageType, "ColumnStore", StringComparison.OrdinalIgnoreCase))
+        {
+            switch (physicalOp)
+            {
+                case "Clustered Index Scan":
+                case "Index Scan":
+                case "Columnstore Index Scan":
+                    return "columnstore_index_scan";
+                case "Clustered Index Delete":
+                case "Index Delete":
+                    return "columnstore_index_delete";
+                case "Clustered Index Insert":
+                case "Index Insert":
+                    return "columnstore_index_insert";
+                case "Clustered Index Update":
+                case "Index Update":
+                    return "columnstore_index_update";
+                case "Clustered Index Merge":
+                case "Index Merge":
+                    return "columnstore_index_merge";
+            }
+        }
+
         if (IconMap.TryGetValue(physicalOp, out var iconName))
             return iconName;
 

Dashboard/Services/PlanIconMapper.cs

@@ -665,8 +665,10 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             node.PhysicalOp = "Lazy " + node.PhysicalOp;
         }
 
-        // Map to icon
-        node.IconName = PlanIconMapper.GetIconName(node.PhysicalOp);
+        // Icon mapping is deferred until after StorageType and LogicalOp are
+        // parsed below, so columnstore scans (Clustered/Index Scan with
+        // Storage="ColumnStore") and Parallelism subtypes route to their
+        // specific icons.
 
         // Handle operator-specific element
         var physicalOpEl = GetOperatorElement(relOpEl);
@@ -1365,6 +1367,11 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             }
         }
 
+        // Map to icon — done here so columnstore scans (Clustered/Index Scan
+        // with Storage="ColumnStore") and Parallelism subtypes (which depend on
+        // LogicalOp) can be routed to their specific icons.
+        node.IconName = PlanIconMapper.GetIconName(node.PhysicalOp, node.StorageType, node.LogicalOp);
+
         // Recurse into child RelOps
         foreach (var childRelOp in FindChildRelOps(relOpEl))
         {