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.

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

planner,executor: support admin show slow command #7785

Merged
merged 8 commits into from
Sep 26, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
address comment
  • Loading branch information
tiancaiamao committed Sep 26, 2018
commit ed271b9854986a6391fdcfb1b548d79425464438
6 changes: 6 additions & 0 deletions executor/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,12 @@ func (a *ExecStmt) logSlowQuery(txnTS uint64, succ bool) {
if user != nil {
userString = user.String()
}
if len(tableIDs) > 10 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about if len(tableIDs) > len("table_ids:") ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a comment for it already.

tableIDs = tableIDs[10 : len(tableIDs)-1] // Remove "table_ids:" and the last ","
}
if len(indexIDs) > 10 {
indexIDs = indexIDs[10 : len(indexIDs)-1] // Remove "index_ids:" and the last ","
}
domain.GetDomain(a.Ctx).LogSlowQuery(&domain.SlowQueryInfo{
SQL: sql,
Start: a.startTime,
Expand Down
22 changes: 21 additions & 1 deletion executor/show_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -637,11 +637,31 @@ func (s *testSuite) TestShowTableStatus(c *C) {
partition by range(a)
( partition p0 values less than (10),
partition p1 values less than (20),
partition p2 values less than (maxvalue)
partition p2 values less than (maxvalue)
);`)
rs, err = tk.Exec("show table status from test like 'tp';")
c.Assert(errors.ErrorStack(err), Equals, "")
rows, err = session.GetRows4Test(context.Background(), tk.Se, rs)
c.Assert(errors.ErrorStack(err), Equals, "")
c.Assert(rows[0].GetString(16), Equals, "partitioned")
}

func (s *testSuite) TestShowSlow(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec(`drop table if exists t`)
tk.MustExec(`create table t(a bigint)`)
tk.MustQuery(`select sleep(1)`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't assume sleep 1s is a slow query, we need to use cfg.Log.SlowThreshold?


result := tk.MustQuery(`admin show slow recent 3`)
c.Check(result.Rows(), HasLen, 1)

result = tk.MustQuery(`admin show slow top 3`)
c.Check(result.Rows(), HasLen, 1)

result = tk.MustQuery(`admin show slow top internal 3`)
c.Check(result.Rows(), HasLen, 0)

result = tk.MustQuery(`admin show slow top all 3`)
c.Check(result.Rows(), HasLen, 1)
}
2 changes: 1 addition & 1 deletion planner/core/planbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ func buildShowSlowSchema() *expression.Schema {
schema.Append(buildColumn("", "DETAILS", mysql.TypeVarchar, 256))
schema.Append(buildColumn("", "SUCC", mysql.TypeTiny, 2))
schema.Append(buildColumn("", "CONN_ID", mysql.TypeLonglong, 4))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

length is too small.

schema.Append(buildColumn("", "TXNTS", mysql.TypeLonglong, 4))
schema.Append(buildColumn("", "TRANSACTION_TS", mysql.TypeLonglong, 4))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

length is too small

schema.Append(buildColumn("", "USER", mysql.TypeVarchar, 32))
schema.Append(buildColumn("", "DB", mysql.TypeVarchar, 64))
schema.Append(buildColumn("", "TABLE_IDS", mysql.TypeVarchar, 64))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

length is too small.

Expand Down