lightning/external: port file.go and necessary codes #45795

lance6716 · 2023-08-03T10:54:06Z

What problem does this PR solve?

Issue Number: ref #45719

Problem Summary:

What is changed and how it works?

Add KeyValueStore which can serialize the KV pair and maintain the range property collector

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No code

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

tiprow · 2023-08-03T10:54:35Z

Hi @lance6716. 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/test-infra repository.

codecov · 2023-08-03T11:04:15Z

Codecov Report

Merging #45795 (d1f973b) into master (c8a8819) will increase coverage by 0.0266%.
Report is 1 commits behind head on master.
The diff coverage is 58.8652%.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #45795        +/-   ##
================================================
+ Coverage   73.3504%   73.3771%   +0.0266%     
================================================
  Files          1272       1277         +5     
  Lines        393076     393894       +818     
================================================
+ Hits         288323     289028       +705     
- Misses        86373      86469        +96     
- Partials      18380      18397        +17

Flag	Coverage Δ
integration	`78.1388% <ø> (?)`
unit	`73.3689% <58.8652%> (+0.0184%)`	⬆️

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

Components	Coverage Δ
dumpling	`54.0444% <ø> (ø)`
parser	`85.0467% <ø> (ø)`
br	`52.0894% <58.8652%> (+0.0533%)`	⬆️

Signed-off-by: lance6716 <lance6716@gmail.com>

br/pkg/lightning/backend/external/file.go

br/pkg/lightning/backend/external/sharedisk.go

Signed-off-by: lance6716 <lance6716@gmail.com>

br/pkg/lightning/backend/external/sharedisk.go

Signed-off-by: lance6716 <lance6716@gmail.com>

ywqzzy · 2023-08-04T03:54:08Z

br/pkg/lightning/backend/external/file.go

+// NewKeyValueStore creates a new KeyValueStore. The data will be written to the
+// given dataWriter and range properties will be maintained in the given
+// rangePropertiesCollector.
+func NewKeyValueStore(


Can we provide an function to clear all data stored in kv store？

I'm not sure about the design from a higher perspective, seems NewKeyValueStore just wraps the writing functionality on external store, and clearing all data is still a functionality of external store itself.

ywqzzy · 2023-08-04T03:55:00Z

br/pkg/lightning/backend/external/file_test.go

+	encoded = rc.encode()
+	require.Greater(t, len(encoded), 0)
+
+	// when not accumulated enough data, no range property will be added.


How can we enforce collect the range property if not accumulated enough data？

Seems we don't and the code runs fine.

ywqzzy · 2023-08-04T03:56:48Z

br/pkg/lightning/backend/external/sharedisk.go

+	"encoding/binary"
+)
+
+type rangeProperty struct {


Add more comments about the meaning of the rangeProperty？

I have added comments for some members. I'm not sure about the rest ones.

ywqzzy · 2023-08-04T03:58:47Z

br/pkg/lightning/backend/external/file.go

+// size or key count exceeds the given distance, a new range property will be
+// appended to the rangePropertiesCollector with current status.
+// Caller should guarantee `writerID` and `seq` are not changed.
+func (s *KeyValueStore) AddKeyValue(key, value []byte, writerID, seq int) error {


Will we have batch add function？

The overhead of AddKeyValue is not much, that's a premature optimization.

Signed-off-by: lance6716 <lance6716@gmail.com>

tangenta · 2023-08-04T06:33:13Z

br/pkg/lightning/backend/external/file.go

+}
+
+// FilePathHandle handles data file paths under a prefix path.
+type FilePathHandle struct {


Maybe we can abandon this structure and use []string instead.

I will think again when port the usage of FilePathHandle

Signed-off-by: lance6716 <lance6716@gmail.com>

tangenta · 2023-08-04T08:08:40Z

br/pkg/lightning/backend/external/file.go

+	writerID  int
+	seq       int
+	offset    uint64
+	u64Buffer []byte


Maybe change this field to a local variable var b [8]byte is better.

Signed-off-by: lance6716 <lance6716@gmail.com>

ti-chi-bot · 2023-08-07T04:26:32Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tangenta, wjhuang2016

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:

~~OWNERS~~ [tangenta,wjhuang2016]

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

ti-chi-bot · 2023-08-07T04:26:33Z

[LGTM Timeline notifier]

Timeline:

2023-08-04 08:25:37.448997077 +0000 UTC m=+433021.391345624: ☑️ agreed by wjhuang2016.
2023-08-07 04:26:32.884866274 +0000 UTC m=+677876.827214804: ☑️ agreed by tangenta.

lance6716 · 2023-08-07T04:30:32Z

/retest

tiprow · 2023-08-07T04:31:03Z

@lance6716: 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/test-infra repository.

hawkingrei · 2023-08-07T04:36:22Z

/retest

tiprow · 2023-08-07T04:39:33Z

@lance6716: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
tiprow_fast_test	`f3d7fc7`	link	true	`/test tiprow_fast_test`

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

Signed-off-by: lance6716 <lance6716@gmail.com>

lance6716 · 2023-08-07T05:41:05Z

/retest

sharedisk: port file.go and necessary codes

a2e8c31

add UT

2bed095

Signed-off-by: lance6716 <lance6716@gmail.com>

lance6716 changed the title ~~[WIP]sharedisk: port file.go and necessary codes~~ sharedisk: port file.go and necessary codes Aug 4, 2023

ti-chi-bot bot removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-linked-issue labels Aug 4, 2023

rename package

ee82f56

lance6716 changed the title ~~sharedisk: port file.go and necessary codes~~ lightning/external: port file.go and necessary codes Aug 4, 2023

lance6716 commented Aug 4, 2023

View reviewed changes

br/pkg/lightning/backend/external/file.go Outdated Show resolved Hide resolved

tangenta reviewed Aug 4, 2023

View reviewed changes

br/pkg/lightning/backend/external/sharedisk.go Outdated Show resolved Hide resolved

address comment

956d3e0

Signed-off-by: lance6716 <lance6716@gmail.com>

tangenta reviewed Aug 4, 2023

View reviewed changes

br/pkg/lightning/backend/external/sharedisk.go Outdated Show resolved Hide resolved

address comment

c118984

Signed-off-by: lance6716 <lance6716@gmail.com>

ywqzzy reviewed Aug 4, 2023

View reviewed changes

lance6716 added 2 commits August 4, 2023 12:15

address comment

8f00b0b

Signed-off-by: lance6716 <lance6716@gmail.com>

move writerID and seq to ctor

8b28300

Signed-off-by: lance6716 <lance6716@gmail.com>

tangenta reviewed Aug 4, 2023

View reviewed changes

ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 4, 2023

Merge branch 'master' of github.com:pingcap/tidb into port-file

43272e9

Signed-off-by: lance6716 <lance6716@gmail.com>

ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 4, 2023

tangenta reviewed Aug 4, 2023

View reviewed changes

lance6716 added 2 commits August 4, 2023 16:11

address comment

15b6469

Signed-off-by: lance6716 <lance6716@gmail.com>

address comment

f3d7fc7

Signed-off-by: lance6716 <lance6716@gmail.com>

wjhuang2016 approved these changes Aug 4, 2023

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Aug 4, 2023

ti-chi-bot bot added the approved label Aug 4, 2023

lance6716 requested review from tangenta and ywqzzy August 7, 2023 03:46

tangenta approved these changes Aug 7, 2023

View reviewed changes

ti-chi-bot bot added the lgtm label Aug 7, 2023

ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Aug 7, 2023

lance6716 added 2 commits August 7, 2023 13:25

Merge branch 'master' of github.com:pingcap/tidb into port-file

bb4c021

fix conflict

d1f973b

Signed-off-by: lance6716 <lance6716@gmail.com>

ti-chi-bot bot merged commit de30804 into pingcap:master Aug 7, 2023
6 of 9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

lightning/external: port file.go and necessary codes #45795

lightning/external: port file.go and necessary codes #45795

lance6716 commented Aug 3, 2023 •

edited

Loading

tiprow bot commented Aug 3, 2023

codecov bot commented Aug 3, 2023 •

edited

Loading

ywqzzy Aug 4, 2023

lance6716 Aug 4, 2023

ywqzzy Aug 4, 2023

lance6716 Aug 4, 2023

ywqzzy Aug 4, 2023

lance6716 Aug 4, 2023

ywqzzy Aug 4, 2023

lance6716 Aug 4, 2023

tangenta Aug 4, 2023

lance6716 Aug 4, 2023

tangenta Aug 4, 2023

ti-chi-bot bot commented Aug 7, 2023

ti-chi-bot bot commented Aug 7, 2023

lance6716 commented Aug 7, 2023

tiprow bot commented Aug 7, 2023

hawkingrei commented Aug 7, 2023

tiprow bot commented Aug 7, 2023

lance6716 commented Aug 7, 2023

lightning/external: port file.go and necessary codes #45795

lightning/external: port file.go and necessary codes #45795

Conversation

lance6716 commented Aug 3, 2023 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

tiprow bot commented Aug 3, 2023

codecov bot commented Aug 3, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Aug 7, 2023

ti-chi-bot bot commented Aug 7, 2023

[LGTM Timeline notifier]

lance6716 commented Aug 7, 2023

tiprow bot commented Aug 7, 2023

hawkingrei commented Aug 7, 2023

tiprow bot commented Aug 7, 2023

lance6716 commented Aug 7, 2023

lance6716 commented Aug 3, 2023 •

edited

Loading

codecov bot commented Aug 3, 2023 •

edited

Loading