executor: add ru details in slow log and INFORMATION_SCHEMA.SLOW_QUERY #49067
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -932,6 +932,10 @@ var slowQueryCols = []columnInfo{ | |
| {name: variable.SlowLogBinaryPlan, tp: mysql.TypeLongBlob, size: types.UnspecifiedLength}, | ||
| {name: variable.SlowLogPrevStmt, tp: mysql.TypeLongBlob, size: types.UnspecifiedLength}, | ||
| {name: variable.SlowLogQuerySQLStr, tp: mysql.TypeLongBlob, size: types.UnspecifiedLength}, | ||
| {name: variable.SlowLogResourceGroup, tp: mysql.TypeVarchar, size: 64}, | ||
| {name: variable.SlowLogRRU, tp: mysql.TypeDouble, size: 22}, | ||
| {name: variable.SlowLogWRU, tp: mysql.TypeDouble, size: 22}, | ||
| {name: variable.SlowLogWaitRUDuration, tp: mysql.TypeDouble, size: 22}, | ||
| } | ||
|
|
||
| // TableTiDBHotRegionsCols is TiDB hot region mem table columns. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3096,6 +3096,14 @@ const ( | |
| SlowLogIsWriteCacheTable = "IsWriteCacheTable" | ||
| // SlowLogIsSyncStatsFailed is used to indicate whether any failure happen during sync stats | ||
| SlowLogIsSyncStatsFailed = "IsSyncStatsFailed" | ||
| // SlowLogResourceGroup is the resource group name that the current session bind. | ||
| SlowLogResourceGroup = "Resource_group" | ||
| // SlowLogRRU is the read request_unit(RU) cost | ||
| SlowLogRRU = "Request_unit_read" | ||
| // SlowLogRRU is the write request_unit(RU) cost | ||
| SlowLogWRU = "Request_unit_write" | ||
| // SlowLogWaitRUDuration is the total duration for kv requests to wait available request-units. | ||
| SlowLogWaitRUDuration = "Time_queued_by_rc" | ||
|
There was a problem hiding this comment. maybe we need to add tikv side wait duration in the future. |
||
| ) | ||
|
|
||
| // GenerateBinaryPlan decides whether we should record binary plan in slow log and stmt summary. | ||
|
|
@@ -3151,6 +3159,10 @@ type SlowQueryLogItems struct { | |
| UsedStats map[int64]*stmtctx.UsedStatsInfoForTable | ||
| IsSyncStatsFailed bool | ||
| Warnings []JSONSQLWarnForSlowLog | ||
| ResourceGroupName string | ||
| RRU float64 | ||
| WRU float64 | ||
| WaitRUDuration time.Duration | ||
| } | ||
|
|
||
| // SlowLogFormat uses for formatting slow log. | ||
|
|
@@ -3348,6 +3360,20 @@ func (s *SessionVars) SlowLogFormat(logItems *SlowQueryLogItems) string { | |
| if len(logItems.BinaryPlan) != 0 { | ||
| writeSlowLogItem(&buf, SlowLogBinaryPlan, logItems.BinaryPlan) | ||
| } | ||
|
|
||
| if s.ResourceGroupName != "" { | ||
| writeSlowLogItem(&buf, SlowLogResourceGroup, logItems.ResourceGroupName) | ||
| } | ||
| if logItems.WaitRUDuration > time.Duration(0) { | ||
| writeSlowLogItem(&buf, SlowLogWaitRUDuration, strconv.FormatFloat(logItems.KVTotal.Seconds(), 'f', -1, 64)) | ||
| } | ||
| if logItems.RRU > 0.0 { | ||
| writeSlowLogItem(&buf, SlowLogRRU, strconv.FormatFloat(logItems.RRU, 'f', -1, 64)) | ||
| } | ||
| if logItems.WRU > 0.0 { | ||
| writeSlowLogItem(&buf, SlowLogWRU, strconv.FormatFloat(logItems.WRU, 'f', -1, 64)) | ||
| } | ||
|
|
||
| if logItems.PrevStmt != "" { | ||
| writeSlowLogItem(&buf, SlowLogPrevStmt, logItems.PrevStmt) | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -806,7 +806,7 @@ func (h *Helper) GetPDRegionStats(ctx context.Context, tableID int64, noIndexSta | |
| startKey = codec.EncodeBytes([]byte{}, startKey) | ||
| endKey = codec.EncodeBytes([]byte{}, endKey) | ||
|
|
||
| return pdCli.GetRegionStatusByKeyRange(ctx, pd.NewKeyRange(startKey, endKey), false) | ||
| } | ||
|
|
||
| // GetTiFlashTableIDFromEndKey computes tableID from pd rule's endKey. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -165,7 +165,7 @@ func (c *pdClient) SplitAndScatterRegions(ctx context.Context, splitKeys [][]byt | |
| return nil, nil | ||
| } | ||
|
|
||
| func (c *pdClient) GetRegionFromMember(ctx context.Context, key []byte, memberURLs []string, opts ...pd.GetRegionOption) (*pd.Region, error) { | ||
| return nil, nil | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -854,7 +854,7 @@ func (pd *MockPD) GetAllStores(ctx context.Context, opts ...pdclient.GetStoreOpt | |
| // Limit limits the maximum number of regions returned. | ||
| // If a region has no leader, corresponding leader will be placed by a peer | ||
| // with empty value (PeerID is 0). | ||
| func (pd *MockPD) ScanRegions(ctx context.Context, startKey []byte, endKey []byte, limit int, opts ...pdclient.GetRegionOption) ([]*pdclient.Region, error) { | ||
| regions := pd.rm.ScanRegions(startKey, endKey, limit) | ||
| return regions, nil | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please run
make bazel_prepareand upload the dependencies.