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

Jump to bottom

lightning: support extracting source/schema/table name to specific column #37790

Merged
merged 53 commits into from Oct 26, 2022
Merged

lightning: support extracting source/schema/table name to specific column #37790

merged 53 commits into from Oct 26, 2022

Conversation

lichunzhu
Copy link
Contributor

@lichunzhu lichunzhu commented Sep 13, 2022 •
edited by lance6716

What problem does this PR solve?

Issue Number: close #37797

ref pingcap/tiflow#3339

Problem Summary:

What is changed and how it works?

  • Support fetch info in routes config initialization and append them to DataFile info.
  • Append extend values to parser lastRow and modify column definition before kv encoder.
  • Regenerate extend data for chunks loaded from checkpoint.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    Use lightning with extend columns routes, it works correctly.

Side effects

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

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features

Release note

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

support extracting source/schema/table name to specific column for lightning

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 13, 2022 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • gozssky
  • lance6716

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 13, 2022
@lichunzhu
Copy link
Contributor Author

/run-all-tests

@lichunzhu lichunzhu changed the title lightning: support extend column routes lightning: support extracting source/schema/table name to specific column Sep 14, 2022
@lance6716
Copy link
Contributor

seems test file build failed

@lichunzhu
Copy link
Contributor Author

seems test file build failed

working on it
/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 14, 2022
@lichunzhu
Copy link
Contributor Author

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 14, 2022
@D3Hunter
Copy link
Contributor

/run-integration-br-test

lance6716
lance6716 reviewed Sep 14, 2022
View reviewed changes
Copy link
Contributor

@lance6716 lance6716 left a comment

Choose a reason for hiding this comment

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

will review later

br/pkg/lightning/config/config.go
@@ -447,6 +447,7 @@ type MydumperRuntime struct {
ReadBlockSize ByteSize `toml:"read-block-size" json:"read-block-size"`
BatchSize ByteSize `toml:"batch-size" json:"batch-size"`
BatchImportRatio float64 `toml:"batch-import-ratio" json:"batch-import-ratio"`
SourceID string `toml:"source-id" json:"source-id"`
Copy link
Contributor

Choose a reason for hiding this comment

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

not sure if we should expose it to user by toml, because this seems a DM only feature request

br/pkg/lightning/mydump/loader.go Outdated Show resolved Hide resolved
br/pkg/lightning/restore/get_pre_info.go Outdated Show resolved Hide resolved
br/pkg/lightning/restore/get_pre_info.go Outdated Show resolved Hide resolved
D3Hunter
D3Hunter reviewed Sep 14, 2022
View reviewed changes
Copy link
Contributor

@D3Hunter D3Hunter left a comment

Choose a reason for hiding this comment

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

will review later

br/tests/lightning_extend_routes/run.sh Show resolved Hide resolved
br/tests/lightning_extend_routes/run.sh Outdated Show resolved Hide resolved
@lichunzhu @lance6716
Apply suggestions from code review
d50ecd1 
Co-authored-by: lance6716 <lance6716@gmail.com>
sleepymole
sleepymole reviewed Oct 25, 2022
View reviewed changes
br/tests/run.sh Outdated Show resolved Hide resolved
@sleepymole
Copy link
Contributor

/run-integration-br-test

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Oct 25, 2022
@lichunzhu
Copy link
Contributor Author

/run-integration-br-test

GMHDBJD
GMHDBJD approved these changes Oct 25, 2022
View reviewed changes
Copy link
Contributor

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

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

lgtm

@lichunzhu
Copy link
Contributor Author

/run-integration-br-test

@dsdashun
Copy link
Contributor

/run-integration-br-test

@lichunzhu
Copy link
Contributor Author

/run-integration-br-test

@lichunzhu
Copy link
Contributor Author

/run-integration-br-test

@lichunzhu
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 112901a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 26, 2022
@lichunzhu
Copy link
Contributor Author

/run-integration-br-test

@ti-chi-bot ti-chi-bot merged commit 0f6baa3 into pingcap:master Oct 26, 2022
@lichunzhu lichunzhu deleted the supportExtendColumn branch October 26, 2022 09:53
@sre-bot
Copy link
Contributor

sre-bot commented Oct 26, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [2] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-ddl-test 🟥 failed 1, success 5, total 6 29 min New failing
idc-jenkins-ci-tidb/common-test 🟥 failed 1, success 10, total 11 9 min 3 sec New failing
idc-jenkins-ci/integration-cdc-test 🟢 all 38 tests passed 20 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 11 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 13 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 6 min 3 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 2 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 26 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 46 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@Frank945946 Frank945946 mentioned this pull request Nov 3, 2022
Merged
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@D3Hunter D3Hunter D3Hunter left review comments

@buchuitoudegou buchuitoudegou buchuitoudegou left review comments

@lance6716 lance6716 lance6716 approved these changes

@sleepymole sleepymole sleepymole approved these changes

@GMHDBJD GMHDBJD GMHDBJD approved these changes

@dsdashun dsdashun Awaiting requested review from dsdashun

Assignees
No one assigned
Labels
component/lightning This issue is related to Lightning of TiDB. release-note size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

lightning: support distinguishing data source when merge shared tables with no shared key
9 participants
@lichunzhu @ti-chi-bot @lance6716 @D3Hunter @sleepymole @dsdashun @sre-bot @buchuitoudegou @GMHDBJD