Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release-23.2.0-rc: ui: update label "CPU" to "SQL CPU" #116450

Merged
merged 1 commit into from Dec 14, 2023
Merged

release-23.2.0-rc: ui: update label "CPU" to "SQL CPU" #116450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ces/cluster-ui/src/insights/workloadInsightDetails/statementInsightDetailsOverviewTab.tsx
View file
Open in desktop
Expand Up @@ -123,8 +123,8 @@ export const StatementInsightDetailsOverviewTab: React.FC<
value={Duration(insightDetails.elapsedTimeMillis * 1e6)}
/>
<SummaryCardItem
label={"CPU Time"}
value={Duration(insightDetails.cpuSQLNanos)}
label={"SQL CPU Time"}
value={Duration(insightDetails?.cpuSQLNanos)}
/>
<SummaryCardItem
label="Rows Read"
Expand Down
2 changes: 1 addition & 1 deletion ...s/cluster-ui/src/insights/workloadInsightDetails/transactionInsightDetailsOverviewTab.tsx
View file
Open in desktop
Expand Up @@ -178,7 +178,7 @@ the maximum number of statements was reached in the console.`;
value={Duration(txnDetails.elapsedTimeMillis * 1e6)}
/>
<SummaryCardItem
label="CPU Time"
label="SQL CPU Time"
value={Duration(txnDetails.cpuSQLNanos)}
/>
<SummaryCardItem
Expand Down
5 changes: 3 additions & 2 deletions pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/util/insightsColumns.tsx
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@ export const insightsColumnLabels = {
databaseName: "Database Name",
tableName: "Table Name",
indexName: "Index Name",
cpu: "CPU Time",
cpu: "SQL CPU Time",
};

export type InsightsTableColumnKeys = keyof typeof insightsColumnLabels;
Expand Down Expand Up @@ -238,7 +238,8 @@ export const insightsTableTitles: InsightsTableTitleType = {
},
cpu: (_: InsightExecEnum) => {
return makeToolTip(
<p>{`CPU Time spent executing within the specified time interval.`}</p>,
<p>{`SQL CPU Time spent executing within the specified time interval. It
does not include SQL planning time nor KV execution time.`}</p>,
"cpu",
);
},
Expand Down
8 changes: 4 additions & 4 deletions pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetails.tsx
View file
Open in desktop
Expand Up @@ -665,8 +665,8 @@ export class StatementDetails extends React.Component<
const cpuTimeseries: AlignedData =
generateCPUTimeseries(statsPerAggregatedTs);
const cpuOps: Partial<Options> = {
axes: [{}, { label: "CPU Time" }],
series: [{}, { label: "CPU Time" }],
axes: [{}, { label: "SQL CPU Time" }],
series: [{}, { label: "SQL CPU Time" }],
legend: { show: false },
width: cardWidth,
};
Expand Down Expand Up @@ -831,7 +831,7 @@ export class StatementDetails extends React.Component<
)}
/>
<SummaryCardItem
label="CPU Time"
label="SQL CPU Time"
value={formatNumberForDisplay(
stats?.exec_stats?.cpu_sql_nanos.mean,
Duration,
Expand Down Expand Up @@ -909,7 +909,7 @@ export class StatementDetails extends React.Component<
</Col>
<Col className="gutter-row" span={12}>
<BarGraphTimeSeries
title={`CPU Time${noSamples}`}
title={`SQL CPU Time${noSamples}`}
alignedData={cpuTimeseries}
uPlotOptions={cpuOps}
tooltip={unavailableTooltip}
Expand Down
7 changes: 4 additions & 3 deletions pkg/ui/workspaces/cluster-ui/src/statsTableUtil/statsTableUtil.tsx
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ export const statisticsColumnLabels = {
bytesRead: "Bytes Read",
clientAddress: "Client IP Address",
contention: "Contention Time",
cpu: "CPU Time",
cpu: "SQL CPU Time",
database: "Database",
diagnostics: "Diagnostics",
executionCount: "Execution Count",
Expand Down Expand Up @@ -650,8 +650,9 @@ export const statisticsTableTitles: StatisticTableTitleType = {
content={
<>
<p>
Average CPU time spent executing within the specified time
interval. The gray bar indicates mean CPU time. The blue bar
Average SQL CPU time spent executing within the specified time
interval. It does not include SQL planning time nor KV execution
time. The gray bar indicates mean SQL CPU time. The blue bar
indicates one standard deviation from the mean.
</p>
</>
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/workspaces/cluster-ui/src/util/sqlActivityConstants.tsx
View file
Open in desktop
Expand Up @@ -72,7 +72,7 @@ export function getSortLabel(
case SqlStatsSortOptions.EXECUTION_COUNT:
return "Execution Count";
case SqlStatsSortOptions.CPU_TIME:
return "CPU Time";
return "SQL CPU Time";
case SqlStatsSortOptions.P99_STMTS_ONLY:
return "P99 Latency";
case SqlStatsSortOptions.CONTENTION_TIME:
Expand Down