Skip to content

lightning: fix routes panic for csv data load (#45405)#45536

Merged
ti-chi-bot[bot] merged 2 commits intopingcap:release-6.5from
ti-chi-bot:cherry-pick-45405-to-release-6.5
Aug 7, 2023
Merged

lightning: fix routes panic for csv data load (#45405)#45536
ti-chi-bot[bot] merged 2 commits intopingcap:release-6.5from
ti-chi-bot:cherry-pick-45405-to-release-6.5

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Jul 24, 2023

This is an automated cherry-pick of #45405

What problem does this PR solve?

Issue Number: close #43284

Problem Summary:

Routes does not work for standard csv data.

tidb/br/pkg/lightning/mydump/loader.go

Lines 512 to 527 in c0e7057

knownDBNames := make(map[string]*dbInfo)
for _, info := range s.dbSchemas {
knownDBNames[info.TableName.Schema] = &dbInfo{
fileMeta: info.FileMeta,
count: 1,
}
}
for _, info := range s.tableSchemas {
knownDBNames[info.TableName.Schema].count++
}
for _, info := range s.viewSchemas {
knownDBNames[info.TableName.Schema].count++
}
for _, info := range s.tableDatas {
knownDBNames[info.TableName.Schema].count++
}

It does map initialization for s.dbSchemas, then operate on s.tableSchemas, s.viewSchemas, and s.tableDatas. However, the scope of s.tableSchemas does not cover the latter three ones, resulting in accessing invalid memory address or nil pointer dereference.

What is changed and how it works?

For s.tableSchemas, s.viewSchemas, and s.tableDatas, initialize for each of them respectively, instead of initializing for s.dbSchemas.

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

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

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

None

@lyzx2001 @ti-chi-bot
This is an automated cherry-pick of pingcap#45405
03aa7e2 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-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 Jul 24, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 24, 2023
Merged
12 tasks
@ti-chi-bot ti-chi-bot added the type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. label Jul 24, 2023
@ti-chi-bot 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 Jul 24, 2023
@codecov
Copy link

codecov bot commented Jul 24, 2023 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@ff1f933). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files 
@@               Coverage Diff                @@
##             release-6.5     #45536   +/-   ##
================================================
  Coverage               ?   74.4669%           
================================================
  Files                  ?       1083           
  Lines                  ?     352888           
  Branches               ?          0           
================================================
  Hits                   ?     262785           
  Misses                 ?      73816           
  Partials               ?      16287

@ti-chi-bot 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 Jul 25, 2023
@lyzx2001
Copy link
Contributor

lyzx2001 commented Jul 25, 2023

/cc @lance6716

@ti-chi-bot ti-chi-bot bot requested a review from lance6716 July 25, 2023 10:02
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jul 25, 2023
@lyzx2001
Copy link
Contributor

lyzx2001 commented Jul 25, 2023

/cc @GMHDBJD

@ti-chi-bot ti-chi-bot bot requested a review from GMHDBJD July 25, 2023 12:25
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 1, 2023
GMHDBJD
GMHDBJD approved these changes Aug 7, 2023
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

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 7, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: GMHDBJD, lance6716

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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
Copy link

ti-chi-bot bot commented Aug 7, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-07-25 10:07:01.988945663 +0000 UTC m=+262564.583476641: ☑️ agreed by lance6716.
  • 2023-08-07 11:39:05.376948258 +0000 UTC m=+13223.010793661: ☑️ agreed by GMHDBJD.

@ti-chi-bot ti-chi-bot bot merged commit 1127dbb into pingcap:release-6.5 Aug 7, 2023
@ti-chi-bot ti-chi-bot deleted the cherry-pick-45405-to-release-6.5 branch April 15, 2025 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lance6716 lance6716 lance6716 approved these changes

@GMHDBJD GMHDBJD GMHDBJD approved these changes

Assignees

@lyzx2001 lyzx2001

Labels

approved cherry-pick-approved Cherry pick PR approved by release team. lgtm 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. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ti-chi-bot @lyzx2001 @lance6716 @GMHDBJD