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

codec: Don't convert set or enum datum to float64 #32372

Merged
merged 11 commits into from
Feb 23, 2022
Merged

codec: Don't convert set or enum datum to float64 #32372

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
40b385b
don't convert uint64 to float and back to uint64
ekexium Feb 15, 2022
4634623
Merge branch 'master' into fix32302-2
ti-chi-bot Feb 22, 2022
bb834e1
Merge branch 'master' into fix32302-2
ti-chi-bot Feb 22, 2022
c8b7cac
Merge branch 'master' into fix32302-2
ti-chi-bot Feb 22, 2022
b06718e
Merge branch 'master' into fix32302-2
ti-chi-bot Feb 22, 2022
0b49d76
Merge branch 'master' into fix32302-2
ti-chi-bot Feb 22, 2022
4ed62e8
Merge branch 'master' into fix32302-2
ti-chi-bot Feb 22, 2022
6a41811
Merge branch 'master' into fix32302-2
ti-chi-bot Feb 22, 2022
842096d
Merge branch 'master' into fix32302-2
ti-chi-bot Feb 23, 2022
8793dc2
Merge branch 'master' into fix32302-2
ti-chi-bot Feb 23, 2022
df09262
Merge branch 'master' into fix32302-2
ti-chi-bot Feb 23, 2022
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
16 changes: 8 additions & 8 deletions util/codec/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ func EstimateValueSize(sc *stmtctx.StatementContext, val types.Datum) (int, erro
case types.KindMysqlDecimal:
l = valueSizeOfDecimal(val.GetMysqlDecimal(), val.Length(), val.Frac()) + 1
case types.KindMysqlEnum:
l = valueSizeOfUnsignedInt(uint64(val.GetMysqlEnum().ToNumber()))
l = valueSizeOfUnsignedInt(val.GetMysqlEnum().Value)
case types.KindMysqlSet:
l = valueSizeOfUnsignedInt(uint64(val.GetMysqlSet().ToNumber()))
l = valueSizeOfUnsignedInt(val.GetMysqlSet().Value)
case types.KindMysqlBit, types.KindBinaryLiteral:
val, err := val.GetBinaryLiteral().ToInt(sc)
terror.Log(errors.Trace(err))
Expand Down Expand Up @@ -355,11 +355,11 @@ func encodeHashChunkRowIdx(sc *stmtctx.StatementContext, row chunk.Row, tp *type
case mysql.TypeEnum:
if mysql.HasEnumSetAsIntFlag(tp.Flag) {
flag = uvarintFlag
v := uint64(row.GetEnum(idx).ToNumber())
v := row.GetEnum(idx).Value
b = (*[sizeUint64]byte)(unsafe.Pointer(&v))[:]
} else {
flag = compactBytesFlag
v := uint64(row.GetEnum(idx).ToNumber())
v := row.GetEnum(idx).Value
str := ""
if enum, err := types.ParseEnumValue(tp.Elems, v); err == nil {
// str will be empty string if v out of definition of enum.
Expand Down Expand Up @@ -570,11 +570,11 @@ func HashChunkSelected(sc *stmtctx.StatementContext, h []hash.Hash64, chk *chunk
isNull[i] = !ignoreNull
} else if mysql.HasEnumSetAsIntFlag(tp.Flag) {
buf[0] = uvarintFlag
v := uint64(column.GetEnum(i).ToNumber())
v := column.GetEnum(i).Value
b = (*[sizeUint64]byte)(unsafe.Pointer(&v))[:]
} else {
buf[0] = compactBytesFlag
v := uint64(column.GetEnum(i).ToNumber())
v := column.GetEnum(i).Value
str := ""
if enum, err := types.ParseEnumValue(tp.Elems, v); err == nil {
// str will be empty string if v out of definition of enum.
Expand Down Expand Up @@ -1326,9 +1326,9 @@ func HashCode(b []byte, d types.Datum) []byte {
decStr := d.GetMysqlDecimal().ToString()
b = encodeBytes(b, decStr, false)
case types.KindMysqlEnum:
b = encodeUnsignedInt(b, uint64(d.GetMysqlEnum().ToNumber()), false)
b = encodeUnsignedInt(b, d.GetMysqlEnum().Value, false)
case types.KindMysqlSet:
b = encodeUnsignedInt(b, uint64(d.GetMysqlSet().ToNumber()), false)
b = encodeUnsignedInt(b, d.GetMysqlSet().Value, false)
case types.KindMysqlBit, types.KindBinaryLiteral:
val := d.GetBinaryLiteral()
b = encodeBytes(b, val, false)
Expand Down