Max memory usage
{statementSampled && (
@@ -908,10 +900,9 @@ export class StatementDetails extends React.Component<
},
].filter(function(r) {
if (
- (r.name === "Network Bytes Sent" &&
- r.value &&
- r.value.mean === 0) ||
- (r.name === "Rows Written" && !showRowsWritten)
+ r.name === "Network Bytes Sent" &&
+ r.value &&
+ r.value.mean === 0
) {
// Omit if empty.
return false;
diff --git a/pkg/ui/workspaces/cluster-ui/src/statementsTable/statementsTableContent.tsx b/pkg/ui/workspaces/cluster-ui/src/statementsTable/statementsTableContent.tsx
index 8aad0e689a72..6689758422cb 100644
--- a/pkg/ui/workspaces/cluster-ui/src/statementsTable/statementsTableContent.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/statementsTable/statementsTableContent.tsx
@@ -27,11 +27,10 @@ import {
databaseAttr,
aggregatedTsAttr,
propsToQueryString,
- summarize,
TimestampToMoment,
aggregationIntervalAttr,
+ computeOrUseStmtSummary,
} from "src/util";
-import { shortStatement } from "./statementsTable";
import styles from "./statementsTableContent.module.scss";
import { cockroach } from "@cockroachlabs/crdb-protobuf-client";
import { Download } from "@cockroachlabs/icons";
@@ -185,14 +184,6 @@ export const StatementLink = ({
database,
onClick,
}: StatementLinkProps): React.ReactElement => {
- const summary = summarize(statement);
- // current statements that we support summaries for from the backend.
- const summarizedStmts = new Set(["select", "insert", "upsert", "update"]);
- const shortStmt =
- statementSummary && summarizedStmts.has(summary.statement)
- ? statementSummary
- : shortStatement(summary, statement);
-
const onStatementClick = React.useCallback(() => {
if (onClick) {
onClick(statement);
@@ -209,6 +200,8 @@ export const StatementLink = ({
database,
};
+ const summary = computeOrUseStmtSummary(statement, statementSummary);
+
return (
@@ -221,7 +214,7 @@ export const StatementLink = ({
}
>
- {getHighlightedText(shortStmt, search, false, true)}
+ {getHighlightedText(summary, search, false, true)}
diff --git a/pkg/ui/workspaces/cluster-ui/src/transactionDetails/transactionDetails.tsx b/pkg/ui/workspaces/cluster-ui/src/transactionDetails/transactionDetails.tsx
index e1a633897768..1ed9827c3dda 100644
--- a/pkg/ui/workspaces/cluster-ui/src/transactionDetails/transactionDetails.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/transactionDetails/transactionDetails.tsx
@@ -29,7 +29,7 @@ import { SqlBox } from "../sql";
import { aggregateStatements } from "../transactionsPage/utils";
import { Loading } from "../loading";
import { SummaryCard } from "../summaryCard";
-import { Bytes, Duration, formatNumberForDisplay } from "src/util";
+import { Bytes, Duration, formatNumberForDisplay, summarize } from "src/util";
import { UIConfigState } from "../store";
import SQLActivityError from "../sqlActivity/errorComponent";
diff --git a/pkg/ui/workspaces/cluster-ui/src/transactionsPage/utils.ts b/pkg/ui/workspaces/cluster-ui/src/transactionsPage/utils.ts
index a6dc063dfcc1..ab6970f63ab1 100644
--- a/pkg/ui/workspaces/cluster-ui/src/transactionsPage/utils.ts
+++ b/pkg/ui/workspaces/cluster-ui/src/transactionsPage/utils.ts
@@ -28,6 +28,7 @@ import {
addStatementStats,
flattenStatementStats,
DurationToNumber,
+ computeOrUseStmtSummary,
} from "../util";
type Statement = protos.cockroach.server.serverpb.StatementsResponse.ICollectedStatementStatistics;
@@ -80,6 +81,21 @@ export const statementFingerprintIdsToText = (
.join("\n");
};
+// Combine all statement summaries into a string.
+export const statementFingerprintIdsToSummarizedText = (
+ statementFingerprintIds: Long[],
+ statements: Statement[],
+): string => {
+ return statementFingerprintIds
+ .map(s => {
+ const query = statements.find(stmt => stmt.id.eq(s))?.key.key_data.query;
+ const querySummary = statements.find(stmt => stmt.id.eq(s))?.key.key_data
+ .query_summary;
+ return computeOrUseStmtSummary(query, querySummary);
+ })
+ .join("\n");
+};
+
// Aggregate transaction statements from different nodes.
export const aggregateStatements = (
statements: Statement[],
diff --git a/pkg/ui/workspaces/cluster-ui/src/transactionsTable/transactionsCells/transactionsCells.tsx b/pkg/ui/workspaces/cluster-ui/src/transactionsTable/transactionsCells/transactionsCells.tsx
index bd8e841ea2f8..09e65ae87985 100644
--- a/pkg/ui/workspaces/cluster-ui/src/transactionsTable/transactionsCells/transactionsCells.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/transactionsTable/transactionsCells/transactionsCells.tsx
@@ -8,19 +8,13 @@
// by the Apache License, Version 2.0, included in the file
// licenses/APL.txt.
-import * as protos from "@cockroachlabs/crdb-protobuf-client";
import React from "react";
import { getHighlightedText } from "src/highlightedText";
-import { Anchor } from "src/anchor";
import { Tooltip } from "@cockroachlabs/ui-components";
-import { summarize } from "src/util/sql/summarize";
-import { shortStatement } from "src/statementsTable/statementsTable";
-import { statementsSql } from "src/util";
import { limitText } from "../utils";
import classNames from "classnames/bind";
import statementsStyles from "../../statementsTable/statementsTableContent.module.scss";
import transactionsCellsStyles from "./transactionsCells.module.scss";
-import Long from "long";
const statementsCx = classNames.bind(statementsStyles);
const ownCellStyles = classNames.bind(transactionsCellsStyles);
@@ -28,38 +22,36 @@ const descriptionClassName = statementsCx("cl-table-link__description");
const textWrapper = ownCellStyles("text-wrapper");
const hoverAreaClassName = ownCellStyles("hover-area");
-
-type TransactionStats = protos.cockroach.sql.ITransactionStatistics;
-
interface TextCellProps {
transactionText: string;
+ transactionSummary: string;
onClick: () => void;
search: string;
}
export const textCell = ({
transactionText,
+ transactionSummary,
onClick,
search,
}: TextCellProps): React.ReactElement => {
- const summary = summarize(transactionText);
return (
- {getHighlightedText(transactionText, search, true)}
+ {getHighlightedText(transactionText, search, true /* hasDarkBkg */)}
}
>
{getHighlightedText(
- limitText(shortStatement(summary, transactionText), 200),
+ limitText(transactionSummary, 200),
search,
- false,
- true,
+ false /* hasDarkBkg */,
+ true /* isOriginalText */,
)}
diff --git a/pkg/ui/workspaces/cluster-ui/src/transactionsTable/transactionsTable.tsx b/pkg/ui/workspaces/cluster-ui/src/transactionsTable/transactionsTable.tsx
index d35266a1a05e..393c90c2038d 100644
--- a/pkg/ui/workspaces/cluster-ui/src/transactionsTable/transactionsTable.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/transactionsTable/transactionsTable.tsx
@@ -44,6 +44,7 @@ import {
getStatementsByFingerprintIdAndTime,
collectStatementsText,
statementFingerprintIdsToText,
+ statementFingerprintIdsToSummarizedText,
} from "../transactionsPage/utils";
import classNames from "classnames/bind";
import statsTablePageStyles from "src/statementsTable/statementsTableContent.module.scss";
@@ -130,6 +131,10 @@ export function makeTransactionsColumns(
item.stats_data.statement_fingerprint_ids,
statements,
),
+ transactionSummary: statementFingerprintIdsToSummarizedText(
+ item.stats_data.statement_fingerprint_ids,
+ statements,
+ ),
onClick: () => handleDetails(item),
search,
}),
diff --git a/pkg/ui/workspaces/cluster-ui/src/util/sql/summarize.spec.ts b/pkg/ui/workspaces/cluster-ui/src/util/sql/summarize.spec.ts
new file mode 100644
index 000000000000..343a325aafd9
--- /dev/null
+++ b/pkg/ui/workspaces/cluster-ui/src/util/sql/summarize.spec.ts
@@ -0,0 +1,138 @@
+// Copyright 2021 The Cockroach Authors.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+import { assert } from "chai";
+import { summarize, computeOrUseStmtSummary } from "./summarize";
+
+describe("summarize", () => {
+ describe("summarize", () => {
+ it("correctly identifies simple statement keywords", () => {
+ const simpleStatements = [
+ {
+ type: "update",
+ stmt: "UPDATE system.jobs SET progress = 'value' WHERE id = '12312'",
+ },
+ {
+ type: "select",
+ stmt: "SELECT (SELECT job_id FROM system.jobs) FROM system.apps",
+ },
+ {
+ type: "insert",
+ stmt:
+ "INSERT INTO system.table_statistics(\"tableID\", name) SELECT 'cockroach', app_names FROM system.apps",
+ },
+ {
+ type: "upsert",
+ stmt:
+ 'UPSERT INTO system.reports_meta(id, "generated") VALUES ($1, $2)',
+ },
+ {
+ type: "delete",
+ stmt:
+ 'DELETE FROM system.public.lease WHERE ("descID", version, "nodeID", expiration) = ($1, $2, __more2__)',
+ },
+ {
+ type: "create",
+ stmt: "CREATE TABLE foo (x INT8)",
+ },
+ {
+ type: "set",
+ stmt: "SET CLUSTER SETTING sql.defaults.distsql = 1;",
+ },
+ ];
+
+ simpleStatements.forEach(s =>
+ assert.equal(s.type, summarize(s.stmt).statement),
+ );
+ });
+
+ it("correctly identifies more complicated statement keywords", () => {
+ const simpleStatements = [
+ {
+ type: "update",
+ stmt:
+ "UPDATE system.jobs SET claim_session_id = _ WHERE claim_session_id IN (SELECT claim_session_id WHERE ((claim_session_id != $1) AND (status IN ('_', '_', __more3__))) AND (NOT crdb_internal.sql_liveness_is_alive(claim_session_id)) LIMIT $2)",
+ },
+ {
+ type: "insert",
+ stmt:
+ 'INSERT INTO system.settings(name, value, "lastUpdated", "valueType") SELECT \'unique_pear\', value, "lastUpdated", "valueType" FROM system.settings JOIN system.internal_tables ON system.settings.id = system.internal_tables.id WHERE name = \'_\' ON CONFLICT (name) DO NOTHING',
+ },
+ {
+ type: "select",
+ stmt:
+ "SELECT aggregated_ts, fingerprint_id, app_name, metadata, statistics, agg_interval FROM system.transaction_statistics AS OF SYSTEM TIME follower_read_timestamp() ORDER BY aggregated_ts, app_name, fingerprint_id",
+ },
+ ];
+
+ simpleStatements.forEach(s =>
+ assert.equal(s.type, summarize(s.stmt).statement),
+ );
+ });
+ });
+
+ describe("computeOrUseStmtSummary", () => {
+ it("returns the given statement summary for supported formats", () => {
+ const simpleStatements = [
+ {
+ stmt: "UPDATE system.jobs SET progress = 'value' WHERE id = '12312'",
+ summary: "UPDATE system.jobs SET progress = '_' WHERE id = '_'",
+ },
+ {
+ stmt: "SELECT (SELECT job_id FROM system.jobs) FROM system.apps",
+ summary: "SELECT (SELECT FROM sy...) FROM system.apps",
+ },
+ {
+ stmt:
+ "INSERT INTO system.table_statistics(\"tableID\", name) SELECT 'cockroach', app_names FROM system.apps",
+ summary:
+ "INSERT INTO system.table_statistics SELECT '_', app_names FROM system.apps",
+ },
+ {
+ stmt:
+ 'UPSERT INTO system.reports_meta(id, "generated") VALUES ($1, $2)',
+ summary: 'UPSERT INTO system.reports_meta(id, "generated")',
+ },
+ ];
+
+ simpleStatements.forEach(s =>
+ assert.equal(s.summary, computeOrUseStmtSummary(s.stmt, s.summary)),
+ );
+ });
+
+ it("returns the regex statement summary for unsupported formats", () => {
+ const simpleStatements = [
+ {
+ stmt:
+ 'DELETE FROM system.public.lease WHERE ("descID", version, "nodeID", expiration) = ($1, $2, __more2__)\n',
+ summary:
+ 'DELETE FROM system.public.lease WHERE ("descID", version, "nodeID", expiration) = ($1, $2, __more2__)\n',
+ expected: "DELETE FROM system.public.lease",
+ },
+ {
+ stmt:
+ "CREATE TABLE crdb_internal.index_usage_statistics (table_id INT8 NOT NULL, index_id INT8 NOT NULL, total_reads INT8 NOT NULL, last_read TIMESTAMPTZ NULL)",
+ summary:
+ "CREATE TABLE crdb_internal.index_usage_statistics (table_id INT8 NOT NULL, index_id INT8 NOT NULL, total_reads INT8 NOT NULL, last_read TIMESTAMPTZ NULL)",
+ expected: "CREATE TABLE crdb_internal.index_usage_statistics",
+ },
+ {
+ stmt: "SET CLUSTER SETTING sql.defaults.distsql = 1",
+ summary: "SET CLUSTER SETTING sql.defaults.distsql = 1",
+ expected: "SET CLUSTER SETTING sql.defaults.distsql",
+ },
+ ];
+
+ simpleStatements.forEach(s =>
+ assert.equal(s.expected, computeOrUseStmtSummary(s.stmt, s.summary)),
+ );
+ });
+ });
+});
diff --git a/pkg/ui/workspaces/cluster-ui/src/util/sql/summarize.ts b/pkg/ui/workspaces/cluster-ui/src/util/sql/summarize.ts
index 704c49843cf0..d62204d3170e 100644
--- a/pkg/ui/workspaces/cluster-ui/src/util/sql/summarize.ts
+++ b/pkg/ui/workspaces/cluster-ui/src/util/sql/summarize.ts
@@ -9,6 +9,7 @@
// licenses/APL.txt.
import _ from "lodash";
+import { shortStatement } from "../../statementsTable";
export interface StatementSummary {
statement?: string;
@@ -55,3 +56,20 @@ export function summarize(statement: string): StatementSummary {
error: "unimplemented",
};
}
+
+// Check if a valid statement summary exists and is supported, or else
+// compute summary using regex.
+export function computeOrUseStmtSummary(
+ statement: string,
+ statementSummary: string,
+): string {
+ // Statement summary computed with regex.
+ const regexSummary = summarize(statement);
+
+ // Current statements that we support summaries for from the backend.
+ const summarizedStmts = new Set(["select", "insert", "upsert", "update"]);
+
+ return statementSummary && summarizedStmts.has(regexSummary.statement)
+ ? statementSummary
+ : shortStatement(regexSummary, statement);
+}