ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-17 01:25:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adding more top operations columns and fixing some column values (#1571)

Browse Source 
* Adding more rules for prop

* adding top operations to ep

* Reverting changes made to display cost

* Fixing comments

* Removing whitespace

* Fixing data size property

* Adding const keys, fixing to table data, adding more info

* Removing undeclared prop
This commit is contained in:
Aasim Khan
2022-07-11 14:05:20 -07:00
committed by GitHub
parent a6e9f1a6cf
commit e68124b4d5
6 changed files with 101 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ExecutionPlanGraphUtils.cs
View File

@@ -165,7 +165,24 @@ namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan
}
public static List<TopOperationsDataItem> ParseTopOperationsData(Node currentNode)
{
{
const string OBJECT_COLUMN_KEY = "Object";
const string ESTIMATED_ROWS_COLUMN_KEY = "EstimateRows";
const string ACTUAL_ROWS_COLUMN_KEY = "ActualRows";
const string AVERAGE_ROW_SIZE_COLUMN_KEY = "AvgRowSize";
const string ACTUAL_EXECUTIONS_COLUMN_KEY = "ActualExecutions";
const string ESTIMATED_EXECUTIONS_COLUMN_KEY = "EstimateExecutions";
const string ESTIMATED_CPU_COLUMN_KEY = "EstimateCPU";
const string ESTIMATED_IO_COLUMN_KEY = "EstimateIO";
const string PARALLEL_COLUMN_KEY = "Parallel";
const string ORDERED_COLUMN_KEY = "Ordered";
const string ACTUAL_REWINDS_COLUMN_KEY = "ActualRewinds";
const string ESTIMATED_REWINDS_COLUMN_KEY = "EstimateRewinds";
const string ACTUAL_REBINDS_COLUMN_KEY = "ActualRebinds";
const string ESTIMATED_REBINDS_COLUMN_KEY = "EstimateRebinds";
const string PARTITIONED_COLUMN_KEY = "Partitioned";
List<TopOperationsDataItem> result = new List<TopOperationsDataItem>();
result.Add(new TopOperationsDataItem
{
@@ -174,13 +191,13 @@ namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan
DisplayValue = currentNode.Operation.DisplayName
});
if (currentNode["Object"] != null)
if (currentNode[OBJECT_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.Object,
DataType = PropertyValueDataType.String,
DisplayValue = ((ExpandableObjectWrapper)currentNode["Object"]).DisplayName
DisplayValue = ((ExpandableObjectWrapper)currentNode[OBJECT_COLUMN_KEY]).DisplayName
});
}
@@ -188,7 +205,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan
{
ColumnName = SR.EstimatedCost,
DataType = PropertyValueDataType.Number,
DisplayValue = Math.Round(currentNode.Cost, 1)
DisplayValue = Math.Round(currentNode.RelativeCost * 100, 2)
});
result.Add(new TopOperationsDataItem
@@ -198,134 +215,165 @@ namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan
DisplayValue = Math.Round(currentNode.SubtreeCost, 1)
});
if (currentNode["ActualRows"] != null)
if (currentNode[ESTIMATED_ROWS_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.EstimatedRows,
DataType = PropertyValueDataType.Number,
DisplayValue = Math.Round((double)currentNode[ESTIMATED_ROWS_COLUMN_KEY])
});
}
if (currentNode[ACTUAL_ROWS_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.ActualRows,
DataType = PropertyValueDataType.Number,
DisplayValue = currentNode["ActualRows"]
DisplayValue = currentNode[ACTUAL_ROWS_COLUMN_KEY]
});
}
if (currentNode["AvgRowSize"] != null)
if (currentNode[AVERAGE_ROW_SIZE_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.EstimatedAverageRowSize,
ColumnName = SR.AverageRowSize,
DataType = PropertyValueDataType.Number,
DisplayValue = currentNode["AvgRowSize"]
DisplayValue = currentNode[AVERAGE_ROW_SIZE_COLUMN_KEY]
});
}
if (currentNode["ActualExecutions"] != null)
if (currentNode[ACTUAL_EXECUTIONS_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.ActualExecutions,
DataType = PropertyValueDataType.Number,
DisplayValue = currentNode["ActualExecutions"]
DisplayValue = currentNode[ACTUAL_EXECUTIONS_COLUMN_KEY]
});
}
if (currentNode["EstimateExecutions"] != null)
if (currentNode[ESTIMATED_EXECUTIONS_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.EstimatedExecutions,
DataType = PropertyValueDataType.Number,
DisplayValue = currentNode["EstimateExecutions"]
DisplayValue = currentNode[ESTIMATED_EXECUTIONS_COLUMN_KEY]
});
}
if (currentNode["EstimateCPU"] != null)
if (currentNode[ESTIMATED_CPU_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.EstimatedCpu,
DataType = PropertyValueDataType.Number,
DisplayValue = currentNode["EstimateCPU"]
DisplayValue = currentNode[ESTIMATED_CPU_COLUMN_KEY]
});
}
if (currentNode["EstimateIO"] != null)
if (currentNode[ESTIMATED_IO_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.EstimatedIO,
DataType = PropertyValueDataType.Number,
DisplayValue = currentNode["EstimateIO"]
DisplayValue = currentNode[ESTIMATED_IO_COLUMN_KEY]
});
}
if (currentNode["Parallel"] != null)
if (currentNode[ESTIMATED_ROWS_COLUMN_KEY] != null && currentNode[AVERAGE_ROW_SIZE_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.EstimatedDataSize,
DataType = PropertyValueDataType.Number,
DisplayValue = (double)currentNode[ESTIMATED_ROWS_COLUMN_KEY] * (double)currentNode[AVERAGE_ROW_SIZE_COLUMN_KEY]
});
}
if (currentNode[ACTUAL_ROWS_COLUMN_KEY] != null && currentNode[AVERAGE_ROW_SIZE_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.ActualDataSize,
DataType = PropertyValueDataType.Number,
DisplayValue = (double)(currentNode[ACTUAL_ROWS_COLUMN_KEY] as RunTimeCounters).MaxCounter * (double)currentNode[AVERAGE_ROW_SIZE_COLUMN_KEY]
});
}
if (currentNode[PARALLEL_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.Parallel,
DataType = PropertyValueDataType.Boolean,
DisplayValue = currentNode["Parallel"]
DisplayValue = currentNode[PARALLEL_COLUMN_KEY]
});
}
if (currentNode["Ordered"] != null)
if (currentNode[ORDERED_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.Ordered,
DataType = PropertyValueDataType.Boolean,
DisplayValue = currentNode["Ordered"]
DisplayValue = currentNode[ORDERED_COLUMN_KEY]
});
}
if (currentNode["ActualRewinds"] != null)
if (currentNode[ACTUAL_REWINDS_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.ActualRewinds,
DataType = PropertyValueDataType.Number,
DisplayValue = currentNode["ActualRewinds"]
DisplayValue = currentNode[ACTUAL_REWINDS_COLUMN_KEY]
});
}
if (currentNode["EstimateRewinds"] != null)
if (currentNode[ESTIMATED_REWINDS_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.EstimatedRewinds,
DataType = PropertyValueDataType.Number,
DisplayValue = currentNode["EstimateRewinds"]
DisplayValue = currentNode[ESTIMATED_REWINDS_COLUMN_KEY]
});
}
if (currentNode["ActualRebinds"] != null)
if (currentNode[ACTUAL_REBINDS_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.ActualRebinds,
DataType = PropertyValueDataType.Number,
DisplayValue = currentNode["ActualRebinds"]
DisplayValue = currentNode[ACTUAL_REBINDS_COLUMN_KEY]
});
}
if (currentNode["EstimateRebinds"] != null)
if (currentNode[ESTIMATED_REBINDS_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.EstimatedRebinds,
DataType = PropertyValueDataType.Number,
DisplayValue = currentNode["EstimateRebinds"]
DisplayValue = currentNode[ESTIMATED_REBINDS_COLUMN_KEY]
});
}
if (currentNode["Partitioned"] != null)
if (currentNode[PARTITIONED_COLUMN_KEY] != null)
{
result.Add(new TopOperationsDataItem
{
ColumnName = SR.Partitioned,
DataType = PropertyValueDataType.Boolean,
DisplayValue = currentNode["Partitioned"]
DisplayValue = currentNode[PARTITIONED_COLUMN_KEY]
});
}
return result;

8
src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Node.cs
View File

@@ -590,7 +590,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
if (!this.HasPDWCost || cost > 0)
{
if (roundCostForSmallGraph && this.graph != null && this.graph.NodeStmtMap.Count < 20)
if (roundCostForSmallGraph && this.graph != null && this.graph.NodeStmtMap.Count < Node.LargePlanNodeCount)
{
cost = Math.Round(cost);
}
@@ -732,6 +732,12 @@ namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
#endregion
#region Constants
public static readonly int LargePlanNodeCount = 20;
#endregion
public void AddChild(Node child)
{
Edge edge = new Edge(this, child);

6
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
View File

@@ -8565,11 +8565,11 @@ namespace Microsoft.SqlTools.ServiceLayer
}
}
public static string EstimatedAverageRowSize
public static string AverageRowSize
{
get
{
return Keys.GetString(Keys.EstimatedAverageRowSize);
return Keys.GetString(Keys.AverageRowSize);
}
}
@@ -13076,7 +13076,7 @@ namespace Microsoft.SqlTools.ServiceLayer
public const string EstimatedIO = "EstimatedIO";
public const string EstimatedAverageRowSize = "EstimatedAverageRowSize";
public const string AverageRowSize = "AverageRowSize";
public const string ActualDataSize = "ActualDataSize";

8
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
View File

@@ -4618,7 +4618,7 @@
Parameters: 0 - cost (double), 1 - percentage (int) </comment>
</data>
<data name="ActualOfEstimated" xml:space="preserve">
<value>{0} of
<value>{0} of
{1} ({2}%)</value>
<comment>.
Parameters: 0 - actual (string), 1 - estimated (string), 2 - percent (decimal) </comment>
@@ -4657,7 +4657,7 @@ The Query Processor estimates that implementing the following index could improv
<comment></comment>
</data>
<data name="EstimatedSubtree" xml:space="preserve">
<value>Estimated Subtree Cost %</value>
<value>Estimated Subtree Cost</value>
<comment></comment>
</data>
<data name="ActualRows" xml:space="preserve">
@@ -4684,8 +4684,8 @@ The Query Processor estimates that implementing the following index could improv
<value>Estimated IO Cost</value>
<comment></comment>
</data>
<data name="EstimatedAverageRowSize" xml:space="preserve">
<value>Estimated Average Row Size</value>
<data name="AverageRowSize" xml:space="preserve">
<value>Average Row Size</value>
<comment></comment>
</data>
<data name="ActualDataSize" xml:space="preserve">

4
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
View File

@@ -2240,14 +2240,14 @@ ParallelismOverlayTooltip = Parallel Execution
Operation = Operation
Object = Object
EstimatedCost = Estimated Cost %
EstimatedSubtree = Estimated Subtree Cost %
EstimatedSubtree = Estimated Subtree Cost
ActualRows = Actual Rows
EstimatedRows = Estimated Rows
ActualExecutions = Actual Executions
EstimatedExecutions = Estimated Executions
EstimatedCpu = Estimated CPU Cost
EstimatedIO = Estimated IO Cost
EstimatedAverageRowSize = Estimated Average Row Size
AverageRowSize = Average Row Size
ActualDataSize = Actual Data Size
############################################################################

10
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
View File

@@ -6210,8 +6210,8 @@ The Query Processor estimates that implementing the following index could improv
<note></note>
</trans-unit>
<trans-unit id="EstimatedSubtree">
<source>Estimated Subtree Cost %</source>
<target state="new">Estimated Subtree Cost %</target>
<source>Estimated Subtree Cost</source>
<target state="new">Estimated Subtree Cost</target>
<note></note>
</trans-unit>
<trans-unit id="ActualRows">
@@ -6249,9 +6249,9 @@ The Query Processor estimates that implementing the following index could improv
<target state="new">Actual Data Size</target>
<note></note>
</trans-unit>
<trans-unit id="EstimatedAverageRowSize">
<source>Estimated Average Row Size</source>
<target state="new">Estimated Average Row Size</target>
<trans-unit id="AverageRowSize">
<source>Average Row Size</source>
<target state="new">Average Row Size</target>
<note></note>
</trans-unit>
</body>