Skip to content

Commit

Permalink
server, ui: update prettify parameter
Browse files Browse the repository at this point in the history
Previously, we were using `PrettyAlignAndDeindent`
parameter option for the usage of `prettify_statement`
on statement details endpoint and insights details
endpoints, which was subjected to a quadratic explosion.

This commit updates those uses to parameter
`PrettyAlignOnly` (1).

Part Of cockroachdb#91197

Release note: None
  • Loading branch information
maryliag committed Nov 3, 2022
1 parent 0965142 commit 23bf219
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkg/server/combined_statement_stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ func getTotalStatementDetails(
args = append(args, aggregatedMetadata.Query)
query = fmt.Sprintf(
`SELECT prettify_statement($1, %d, %d, %d)`,
tree.ConsoleLineWidth, tree.PrettyAlignAndDeindent, tree.UpperCase)
tree.ConsoleLineWidth, tree.PrettyAlignOnly, tree.UpperCase)
row, err = ie.QueryRowEx(ctx, "combined-stmts-details-format-query", nil,
sessiondata.InternalExecutorOverride{
User: username.NodeUserName(),
Expand Down
4 changes: 2 additions & 2 deletions pkg/ui/workspaces/cluster-ui/src/api/insightsApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ type FingerprintStmtsResponseColumns = {
const fingerprintStmtsQuery = (
stmt_fingerprint_ids: string[],
) => `SELECT DISTINCT ON (fingerprint_id) encode(fingerprint_id, 'hex') AS statement_fingerprint_id,
prettify_statement(metadata ->> 'query', 108, 2, 1) AS query
prettify_statement(metadata ->> 'query', 108, 1, 1) AS query
FROM crdb_internal.statement_statistics
WHERE encode(fingerprint_id, 'hex') = ANY (string_to_array('${stmt_fingerprint_ids}'
, ','))`;
Expand Down Expand Up @@ -648,7 +648,7 @@ const statementInsightsQuery: InsightQuery<
> = {
name: InsightNameEnum.highContention,
// We only surface the most recently observed problem for a given statement.
query: `SELECT *, prettify_statement(non_prettified_query, 108, 2, 1) AS query from (
query: `SELECT *, prettify_statement(non_prettified_query, 108, 1, 1) AS query from (
SELECT
session_id,
txn_id,
Expand Down

0 comments on commit 23bf219

Please sign in to comment.