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

ui: fix contention chart on Statement Details page #82911

Merged
merged 1 commit into from
Jun 17, 2022
+5 −4
Merged

ui: fix contention chart on Statement Details page #82911

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/ui/workspaces/cluster-ui/src/sortedtable/sortedtable.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
}

.cl-table-container {
padding: 18px 24px 18px 0px;
padding: 20px 24px 18px 0px;
}
.cl-table-wrapper {
padding: 9.55px 20px 17px;
Expand Down
3 changes: 2 additions & 1 deletion pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ export class StatementDetails extends React.Component<
available until the statement is sampled.
</div>
);
const noSamples = statementSampled ? "" : " (no samples)";

const db = databases ? (
<Text>{databases}</Text>
Expand Down Expand Up @@ -781,7 +782,7 @@ export class StatementDetails extends React.Component<
<Row gutter={24}>
<Col className="gutter-row" span={12}>
<BarGraphTimeSeries
title="Contention"
title={`Contention${noSamples}`}
alignedData={contentionTimeseries}
uPlotOptions={contentionOps}
tooltip={unavailableTooltip}
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/workspaces/cluster-ui/src/statementDetails/timeseriesUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export function generateContentionTimeseries(

stats.forEach(function (stat: statementStatisticsPerAggregatedTs) {
ts.push(TimestampToNumber(stat.aggregated_ts) * 1e3);
count.push(stat.stats.exec_stats.contention_time.mean);
count.push(stat.stats.exec_stats.contention_time.mean * 1e9);
});

return [ts, count];
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/workspaces/cluster-ui/src/statementsPage/statementsPage.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
.table-area {
position: relative;
overflow-x: scroll;
min-height: 480px;
min-height: 590px;
}

.reset-btn-area {
Expand Down