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

tablecodec: fix text type decode for old row format (#23751) #23772

Merged
merged 9 commits into from
May 11, 2021
Merged

tablecodec: fix text type decode for old row format (#23751) #23772

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
193b9a0
cherry pick #23751 to release-4.0
wjhuang2016 Mar 31, 2021
1d65980
Merge branch 'release-4.0' into release-4.0-fb2df7675c64
ti-chi-bot May 7, 2021
c00e678
Merge branch 'release-4.0' into release-4.0-fb2df7675c64
ti-chi-bot May 7, 2021
4a16ae7
Merge branch 'release-4.0' into release-4.0-fb2df7675c64
ti-chi-bot May 7, 2021
0ce1c46
Merge branch 'release-4.0' into release-4.0-fb2df7675c64
ti-chi-bot May 8, 2021
9fe7690
Merge branch 'release-4.0' into release-4.0-fb2df7675c64
ti-chi-bot May 10, 2021
9b31675
Merge branch 'release-4.0' into release-4.0-fb2df7675c64
ti-chi-bot May 10, 2021
da4005b
Merge branch 'release-4.0' into release-4.0-fb2df7675c64
ti-chi-bot May 10, 2021
d0915e8
Merge branch 'release-4.0' into release-4.0-fb2df7675c64
ti-chi-bot May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tablecodec/tablecodec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,11 +512,11 @@ func unflatten(datum types.Datum, ft *types.FieldType, loc *time.Location) (type
case mysql.TypeFloat:
datum.SetFloat32(float32(datum.GetFloat64()))
return datum, nil
case mysql.TypeVarchar, mysql.TypeString, mysql.TypeVarString:
case mysql.TypeVarchar, mysql.TypeString, mysql.TypeVarString, mysql.TypeTinyBlob,
mysql.TypeMediumBlob, mysql.TypeBlob, mysql.TypeLongBlob:
datum.SetString(datum.GetString(), ft.Collate)
case mysql.TypeTiny, mysql.TypeShort, mysql.TypeYear, mysql.TypeInt24,
mysql.TypeLong, mysql.TypeLonglong, mysql.TypeDouble, mysql.TypeTinyBlob,
mysql.TypeMediumBlob, mysql.TypeBlob, mysql.TypeLongBlob:
mysql.TypeLong, mysql.TypeLonglong, mysql.TypeDouble:
return datum, nil
case mysql.TypeDate, mysql.TypeDatetime, mysql.TypeTimestamp:
t := types.NewTime(types.ZeroCoreTime, ft.Tp, int8(ft.Decimal))
Expand Down
10 changes: 10 additions & 0 deletions tablecodec/tablecodec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,16 @@ func (s *testTableCodecSuite) TestUnflattenDatums(c *C) {
cmp, err := input[0].CompareDatum(sc, &output[0])
c.Assert(err, IsNil)
c.Assert(cmp, Equals, 0)

input = []types.Datum{types.NewCollationStringDatum("aaa", "utf8mb4_unicode_ci", 0)}
tps = []*types.FieldType{types.NewFieldType(mysql.TypeBlob)}
tps[0].Collate = "utf8mb4_unicode_ci"
output, err = UnflattenDatums(input, tps, sc.TimeZone)
c.Assert(err, IsNil)
cmp, err = input[0].CompareDatum(sc, &output[0])
c.Assert(err, IsNil)
c.Assert(cmp, Equals, 0)
c.Assert(output[0].Collation(), Equals, "utf8mb4_unicode_ci")
}

func (s *testTableCodecSuite) TestTimeCodec(c *C) {
Expand Down