table: Update delta from column slice, instead of map #53670

ekexium · 2024-05-30T03:37:13Z

What problem does this PR solve?

Issue Number: close #53660

Problem Summary:

AddRecord/UpdateRecord/RemoveRecord is in the hot path for writing. Iterating over a map when they call UpdateDeltaForTable is slow.

What changed and how does it work?

Replace the map with a slice.

Before:

ROUTINE ======================== github.com/pingcap/tidb/pkg/sessionctx/variable.(*TransactionContext).UpdateDeltaForTable in /Users/eke/code/tidb/pkg/sessionctx/variable/session.go
      30ms      420ms (flat, cum)  2.04% of Total
         .          .    309:func (tc *TransactionContext) UpdateDeltaForTable(physicalTableID int64, delta int64, count int64, colSize map[int64]int64) {
         .          .    310:	tc.tdmLock.Lock()
         .          .    311:	defer tc.tdmLock.Unlock()
         .          .    312:	if tc.TableDeltaMap == nil {
         .          .    313:		tc.TableDeltaMap = make(map[int64]TableDelta)
         .          .    314:	}
         .          .    315:	item := tc.TableDeltaMap[physicalTableID]
         .          .    316:	if item.ColSize == nil && colSize != nil {
         .          .    317:		item.ColSize = make(map[int64]int64, len(colSize))
         .          .    318:	}
         .          .    319:	item.Delta += delta
         .          .    320:	item.Count += count
         .          .    321:	item.TableID = physicalTableID
      10ms      350ms    322:	for key, val := range colSize {
         .       20ms    323:		item.ColSize[key] += val
         .          .    324:	}
         .       30ms    325:	tc.TableDeltaMap[physicalTableID] = item
      20ms       20ms    326:}
         .          .    327:
         .          .    328:// GetKeyInPessimisticLockCache gets a key in pessimistic lock cache.
         .          .    329:func (tc *TransactionContext) GetKeyInPessimisticLockCache(key kv.Key) (val []byte, ok bool) {
         .          .    330:	if tc.pessimisticLockCache == nil && tc.CurrentStmtPessimisticLockCache == nil {
         .          .    331:		return nil, false

This PR:

ROUTINE ======================== github.com/pingcap/tidb/pkg/sessionctx/variable.(*TransactionContext).UpdateDeltaForTableFromColSlice in /Users/eke/code/tidb/pkg/sessionctx/variable/session.go
      10ms       30ms (flat, cum)  0.13% of Total
         .          .    334:func (tc *TransactionContext) UpdateDeltaForTableFromColSlice(
         .          .    335:	physicalTableID int64, delta int64,
         .          .    336:	count int64, colSizes []ColSize,
         .          .    337:) {
         .          .    338:	tc.tdmLock.Lock()
         .          .    339:	defer tc.tdmLock.Unlock()
         .          .    340:	if tc.TableDeltaMap == nil {
         .          .    341:		tc.TableDeltaMap = make(map[int64]TableDelta)
         .          .    342:	}
         .       10ms    343:	item := tc.TableDeltaMap[physicalTableID]
         .          .    344:	if item.ColSize == nil && colSizes != nil {
         .          .    345:		item.ColSize = make(map[int64]int64, len(colSizes))
         .          .    346:	}
         .          .    347:	item.Delta += delta
         .          .    348:	item.Count += count
         .          .    349:	item.TableID = physicalTableID
         .          .    350:	for _, s := range colSizes {
         .       10ms    351:		item.ColSize[s.ColId] += s.Size
         .          .    352:	}
         .          .    353:	tc.TableDeltaMap[physicalTableID] = item
      10ms       10ms    354:}
         .          .    355:
         .          .    356:// GetKeyInPessimisticLockCache gets a key in pessimistic lock cache.
         .          .    357:func (tc *TransactionContext) GetKeyInPessimisticLockCache(key kv.Key) (val []byte, ok bool) {
         .          .    358:	if tc.pessimisticLockCache == nil && tc.CurrentStmtPessimisticLockCache == nil {
         .          .    359:		return nil, false

Check List

Tests

Unit test: microbenchmark
Integration test
Manual test (add detailed scripts or steps below)
No need to test
- I checked and no code files have been changed.

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

Signed-off-by: ekexium <eke@fastmail.com>

…om-col-slice

tiprow · 2024-05-30T03:37:30Z

Hi @ekexium. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Signed-off-by: ekexium <eke@fastmail.com>

codecov · 2024-05-30T04:09:15Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.7496%. Comparing base (04c66ee) to head (74c936a).
Report is 12 commits behind head on master.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #53670        +/-   ##
================================================
+ Coverage   74.4884%   74.7496%   +0.2612%     
================================================
  Files          1506       1506                
  Lines        357618     433103     +75485     
================================================
+ Hits         266384     323743     +57359     
- Misses        71857      89496     +17639     
- Partials      19377      19864       +487

Flag	Coverage Δ
integration	`49.6159% <100.0000%> (?)`
unit	`71.6483% <100.0000%> (-1.7190%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
dumpling	`53.9957% <ø> (-2.3014%)`	⬇️
parser	`∅ <ø> (∅)`
br	`50.3524% <ø> (+6.7889%)`	⬆️

ekexium · 2024-05-30T04:14:13Z

/retest

tiprow · 2024-05-30T04:14:39Z

@ekexium: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

go.mod

Signed-off-by: ekexium <eke@fastmail.com>

…om-col-slice

go.mod

pkg/sessionctx/variable/session.go

cfzjywxk · 2024-05-30T08:35:59Z

pkg/table/tables/tables.go

@@ -670,7 +670,7 @@ func (t *TableCommon) UpdateRecord(ctx context.Context, sctx table.MutateContext
 			return err
 		}
 	}
-	colSize := make(map[int64]int64, len(t.Cols()))
+	colSize := make([]variable.ColSize, len(t.Cols()))


Nice catch, we could check if there similar implemetations in other performance critical paths.

Signed-off-by: ekexium <eke@fastmail.com>

pkg/sessionctx/variable/session.go

Signed-off-by: ekexium <eke@fastmail.com>

ekexium · 2024-05-31T01:32:41Z

/retest

tiprow · 2024-05-31T01:33:04Z

@ekexium: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

cfzjywxk

LGTM

ti-chi-bot · 2024-05-31T03:08:58Z

[LGTM Timeline notifier]

Timeline:

2024-05-31 01:52:03.524371615 +0000 UTC m=+3000477.281507189: ☑️ agreed by cfzjywxk.
2024-05-31 03:08:57.270659714 +0000 UTC m=+3005091.027795288: ☑️ agreed by zyguan.

ekexium · 2024-05-31T03:27:09Z

@yudongusa PTAL

cfzjywxk · 2024-05-31T08:22:57Z

@ekexium
Need approvement from variable file owners.

yudongusa

LGTM

ti-chi-bot · 2024-06-01T12:19:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfzjywxk, lcwangchao, you06, yudongusa, zyguan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~pkg/sessionctx/variable/OWNERS~~ [yudongusa]
~~pkg/table/OWNERS~~ [cfzjywxk]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

ekexium added 2 commits May 29, 2024 19:00

opt: pass slice instead of map for col sizez

1fa39a5

Signed-off-by: ekexium <eke@fastmail.com>

Merge branch 'master' of github.com:pingcap/tidb into update-delta-fr…

7a18a8e

…om-col-slice

ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 30, 2024

opt: also for UpdateRecord and RemoveRecord

0c599f0

Signed-off-by: ekexium <eke@fastmail.com>

ekexium force-pushed the update-delta-from-col-slice branch from d49d9e4 to 0c599f0 Compare May 30, 2024 03:46

ekexium requested review from you06 and cfzjywxk May 30, 2024 04:14

hawkingrei reviewed May 30, 2024

View reviewed changes

go.mod Outdated Show resolved Hide resolved

chore: update bazel

9a855fb

Signed-off-by: ekexium <eke@fastmail.com>

ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 30, 2024

Merge branch 'master' of github.com:pingcap/tidb into update-delta-fr…

f338d79

…om-col-slice

cfzjywxk requested review from zyguan and MyonKeminta May 30, 2024 08:21

cfzjywxk reviewed May 30, 2024

View reviewed changes

chore: restore dependency

8ea916f

Signed-off-by: ekexium <eke@fastmail.com>

ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 30, 2024

ekexium added 2 commits May 30, 2024 19:18

refactor: use len(colSizes) > 0 as condition

6289475

Signed-off-by: ekexium <eke@fastmail.com>

style: lint

239d7b6

Signed-off-by: ekexium <eke@fastmail.com>

cfzjywxk reviewed May 30, 2024

View reviewed changes

pkg/sessionctx/variable/session.go Show resolved Hide resolved

style: lint

74c936a

Signed-off-by: ekexium <eke@fastmail.com>

cfzjywxk approved these changes May 31, 2024

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label May 31, 2024

zyguan approved these changes May 31, 2024

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels May 31, 2024

you06 approved these changes May 31, 2024

View reviewed changes

lcwangchao approved these changes May 31, 2024

View reviewed changes

yudongusa approved these changes Jun 1, 2024

View reviewed changes

ti-chi-bot bot added the approved label Jun 1, 2024

ti-chi-bot bot merged commit 8483dc5 into pingcap:master Jun 1, 2024
23 checks passed

ekexium mentioned this pull request Jul 10, 2024

table: make slices in ColSizeDeltaBuffer private #54539

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

table: Update delta from column slice, instead of map #53670

table: Update delta from column slice, instead of map #53670

ekexium commented May 30, 2024 •

edited

Loading

tiprow bot commented May 30, 2024

codecov bot commented May 30, 2024 •

edited

Loading

ekexium commented May 30, 2024

tiprow bot commented May 30, 2024

cfzjywxk May 30, 2024

ekexium commented May 31, 2024

tiprow bot commented May 31, 2024

cfzjywxk left a comment

ti-chi-bot bot commented May 31, 2024

ekexium commented May 31, 2024

cfzjywxk commented May 31, 2024

yudongusa left a comment

ti-chi-bot bot commented Jun 1, 2024

table: Update delta from column slice, instead of map #53670

table: Update delta from column slice, instead of map #53670

Conversation

ekexium commented May 30, 2024 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

tiprow bot commented May 30, 2024

codecov bot commented May 30, 2024 • edited Loading

Codecov Report

ekexium commented May 30, 2024

tiprow bot commented May 30, 2024

cfzjywxk May 30, 2024

Choose a reason for hiding this comment

ekexium commented May 31, 2024

tiprow bot commented May 31, 2024

cfzjywxk left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented May 31, 2024

[LGTM Timeline notifier]

ekexium commented May 31, 2024

cfzjywxk commented May 31, 2024

yudongusa left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Jun 1, 2024

ekexium commented May 30, 2024 •

edited

Loading

codecov bot commented May 30, 2024 •

edited

Loading