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: show disk usage information for statement and slow query #777

Merged
merged 4 commits into from
Oct 28, 2020
Merged

ui: show disk usage information for statement and slow query #777

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4be2d09
ui: show disk usage information for statement and slow query
baurine Oct 22, 2020
1eca7b2
Merge branch 'master' into disk-usage-info
baurine Oct 27, 2020
799481a
show the disk information in the detail page
baurine Oct 28, 2020
77ce02c
Merge remote-tracking branch 'origin/master' into disk-usage-info
baurine Oct 28, 2020
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
1 change: 1 addition & 0 deletions pkg/apiserver/slowquery/queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ type SlowQuery struct {
ProcessTime float64 `gorm:"column:Process_time" json:"process_time"`

MemoryMax int `gorm:"column:Mem_max" json:"memory_max"`
DiskMax int `gorm:"column:Disk_max" json:"disk_max"`
TxnStartTS uint `gorm:"column:Txn_start_ts" json:"txn_start_ts"`

// Detail
Expand Down
2 changes: 2 additions & 0 deletions pkg/apiserver/statement/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ type Model struct {
AggSumBackoffTimes int `json:"sum_backoff_times" agg:"SUM(sum_backoff_times)"`
AggAvgMem int `json:"avg_mem" agg:"ROUND(SUM(exec_count * avg_mem) / SUM(exec_count))"`
AggMaxMem int `json:"max_mem" agg:"MAX(max_mem)"`
AggAvgDisk int `json:"avg_disk" agg:"ROUND(SUM(exec_count * avg_disk) / SUM(exec_count))"`
AggMaxDisk int `json:"max_disk" agg:"MAX(max_disk)"`
AggAvgAffectedRows int `json:"avg_affected_rows" agg:"ROUND(SUM(exec_count * avg_affected_rows) / SUM(exec_count))"`
AggFirstSeen int `json:"first_seen" agg:"UNIX_TIMESTAMP(MIN(first_seen))"`
AggLastSeen int `json:"last_seen" agg:"UNIX_TIMESTAMP(MAX(last_seen))"`
Expand Down
2 changes: 2 additions & 0 deletions ui/lib/apps/SlowQuery/translations/en.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ slow_query:
query_time_tooltip: Execution time of the query
memory_max: Max Memory
memory_max_tooltip: Maximum memory usage of the query
disk_max: Max Disk
disk_max_tooltip: Maximum disk usage of the query
digest: Query Template ID
digest_tooltip: a.k.a. Query digest
is_internal: Is Internal?
Expand Down
2 changes: 2 additions & 0 deletions ui/lib/apps/SlowQuery/translations/zh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ slow_query:
query_time_tooltip: 该 SQL 查询总的执行时间
memory_max: 最大内存
memory_max_tooltip: 该 SQL 查询执行时占用的最大内存空间
disk_max: 最大磁盘空间
disk_max_tooltip: 该 SQL 查询执行时占用的最大磁盘空间
digest: SQL 模板 ID
digest_tooltip: SQL 模板的唯一标识（SQL 指纹）
is_internal: 是否为内部 SQL 查询
Expand Down
1 change: 1 addition & 0 deletions ui/lib/apps/SlowQuery/utils/tableColumns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export function slowQueryColumns(
tcf.bar.single('compile_time', 's', rows),
tcf.bar.single('process_time', 's', rows),
tcf.bar.single('memory_max', 'bytes', rows),
tcf.bar.single('disk_max', 'bytes', rows),

tcf.textWithTooltip('txn_start_ts', rows),
// success columnn
Expand Down
4 changes: 4 additions & 0 deletions ui/lib/apps/Statement/translations/en.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ statement:
avg_mem_tooltip: Memory usage of single query
max_mem: Max Memory
max_mem_tooltip: Maximum memory usage of single query
avg_disk: Mean Disk
avg_disk_tooltip: Disk usage of single query
max_disk: Max Disk
max_disk_tooltip: Maximum disk usage of single query
index_names: Index Name
index_names_tooltip: The name of the used index
first_seen: First Seen
Expand Down
4 changes: 4 additions & 0 deletions ui/lib/apps/Statement/translations/zh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ statement:
avg_mem_tooltip: 单条 SQL 查询的消耗内存大小
max_mem: 最大内存
max_mem_tooltip: 最大单条 SQL 查询消耗内存大小
avg_disk: 平均磁盘空间
avg_disk_tooltip: 单条 SQL 查询占用的磁盘空间大小
max_disk: 最大磁盘空间
max_disk_tooltip: 最大单条 SQL 查询占用的磁盘空间大小
table_names: 表名
index_names: 索引名
index_names_tooltip: SQL 执行时使用的索引名称
Expand Down
2 changes: 2 additions & 0 deletions ui/lib/apps/Statement/utils/tableColumns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const derivedFields = {
),
avg_txn_retry: genDerivedBarSources('avg_txn_retry', 'max_txn_retry'),
avg_mem: genDerivedBarSources('avg_mem', 'max_mem'),
avg_disk: genDerivedBarSources('avg_disk', 'max_disk'),
sum_errors: ['sum_errors', 'sum_warnings'],
related_schemas: ['table_names'],
}
Expand Down Expand Up @@ -163,6 +164,7 @@ export function statementColumns(
columnActionsMode: ColumnActionsMode.clickable,
},
avgMaxColumn(tcf, 'avg_mem', 'bytes', rows),
avgMaxColumn(tcf, 'avg_disk', 'bytes', rows),
errorsWarningsColumn(tcf, rows),
avgMaxColumn(tcf, 'parse_latency', 'ns', rows),
avgMaxColumn(tcf, 'compile_latency', 'ns', rows),
Expand Down