Fix bug for ingesting data to a "pk is handle" table (#2125)#2127
Merged
JaySon-Huang merged 1 commit intopingcap:release-4.0from Jun 17, 2021
Merged
Conversation
Contributor
|
/rebuild |
1a0a1b4 to
3fbdf73
Compare
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
3fbdf73 to
6e926e4
Compare
Contributor
|
/run-all-tests |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cherry-pick #2125 to release-4.0
You can switch your code base to this Pull Request by using git-extras:
# In tics repo: git pr https://github.com/pingcap/tics/pull/2127After apply modifications, you can push your change to this PR via:
What problem does this PR solve?
Issue Number: close #2118
Problem Summary:
DeltaTree add a "_tidb_rowid" column to the table even if "pk is handle" is true. We use the
FunctionToInt64to copy data from the primary key column to the handle column under this situation.https://github.com/pingcap/tics/blob/1078d0b8199a1cfe54d73623ea8da636505f419b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp#L403-L410
However, if the types are identical,
FunctionToInt64only does a shallow copy and makes the primary key column and_tidb_rowidshare the same column ptr when "pk is handle".https://github.com/pingcap/tics/blob/1078d0b8199a1cfe54d73623ea8da636505f419b/dbms/src/Functions/FunctionsConversion.h#L832-L841
After that, we need to reorganize the boundary of blocks, this makes us append some rows into the pk column and handle column. Unfortunately, they share the same column pointer, which makes the columns inside one block don't align and make trouble for later processing.
https://github.com/pingcap/tics/blob/1078d0b8199a1cfe54d73623ea8da636505f419b/dbms/src/Storages/DeltaMerge/PKSquashingBlockInputStream.h#L75-L99
What is changed and how it works?
Use deep copy instead of shallow copy when the types are identical in
DeltaMergeStore::addExtraColumnIfNeed.Related changes
pingcap/docs/pingcap/docs-cn:Check List
Tests
Side effects
Release note