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.

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

ddl: Fix NULL value in non-nullable column (#8722) #8740

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #8722

What problem does this PR solve?

Issue Number: close #8419

Problem Summary: As the issue described. #8419 (comment)

When the column is defined with default value, the column id exists in non-nullable-column-ids:
https://github.com/pingcap/tidb/blob/90fc8148a29ee77708628b6c6984d51b7e9f8cc3/pkg/table/tables/tables.go#L525-L528

There is a function for fixing similar cases, but it only handle the case for "missing column". And those column defined with default value is not consider as "missing column"

inline bool addDefaultValueToColumnIfPossible(
const ColumnInfo & column_info,
Block & block,
size_t block_column_pos,
bool ignore_pk_if_absent,
bool force_decode)
{
// We consider a missing column could be safely filled with NULL, unless it has not default value and is NOT NULL.
// This could saves lots of unnecessary schema syncs for old data with a newer schema that has newly added columns.
if (column_info.hasPriKeyFlag())
{
// For clustered index or pk_is_handle, if the pk column does not exists, it can still be decoded from the key
if (ignore_pk_if_absent)
return true;
assert(!ignore_pk_if_absent);
if (!force_decode)
return false;
// Else non-clustered index, and not pk_is_handle, it could be a row encoded by older schema,
// we need to fill the column wich has primary key flag with default value.
// fallthrough to fill default value when force_decode
}
if (column_info.hasNoDefaultValueFlag() && column_info.hasNotNullFlag())
{
if (!force_decode)
return false;
// Else the row does not contain this "not null" / "no default value" column,
// it could be a row encoded by older schema.
// fallthrough to fill default value when force_decode
}
// not null or has no default value, tidb will fill with specific value.
auto * raw_column = const_cast<IColumn *>((block.getByPosition(block_column_pos)).column.get());
raw_column->insert(column_info.defaultValueToField());
return true;
}

What is changed and how it works?

When tiflash meets such NULL datum value in non-nullable column when force_decode==true, just fill with the default value.

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

Fix the issue that executing the `ALTER TABLE ... MODIFY COLUMN ... NOT NULL` that turn a nullable column to not nullable cause panic

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Jan 31, 2024
@ti-chi-bot ti-chi-bot force-pushed the cherry-pick-8722-to-release-7.5 branch from a02ca9d to 232c7f4 Compare January 31, 2024 08:11
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jan 31, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jan 31, 2024
@ti-chi-bot ti-chi-bot force-pushed the cherry-pick-8722-to-release-7.5 branch from 232c7f4 to 6b25487 Compare January 31, 2024 08:38
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jan 31, 2024
Copy link
Contributor

ti-chi-bot bot commented Jan 31, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JaySon-Huang, Lloyd-Pottiger

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 [JaySon-Huang,Lloyd-Pottiger]

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

Copy link
Contributor

ti-chi-bot bot commented Jan 31, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-01-31 08:12:31.741126283 +0000 UTC m=+1553193.305423984: ☑️ agreed by JaySon-Huang.
  • 2024-01-31 08:38:37.128038661 +0000 UTC m=+1554758.692336366: ☑️ agreed by Lloyd-Pottiger.

JaySon-Huang and others added 4 commits January 31, 2024 08:38
Co-authored-by: Lloyd-Pottiger <60744015+Lloyd-Pottiger@users.noreply.github.com>
@ti-chi-bot ti-chi-bot force-pushed the cherry-pick-8722-to-release-7.5 branch from 6b25487 to f0432b2 Compare January 31, 2024 08:38
@JaySon-Huang
Copy link
Contributor

/run-all-tests

@ti-chi-bot ti-chi-bot bot merged commit bf1fe41 into pingcap:release-7.5 Jan 31, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants