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

types/data: the bit data type should be treat as uint64 #11951

Merged
merged 9 commits into from
Sep 26, 2019
Merged

types/data: the bit data type should be treat as uint64 #11951

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
5647756
types/data: the bit operation didn't parse correctly
gaoxingliang Aug 30, 2019
3159c31
types/data: the bit operation didn't parse correctly (#11895)
gaoxingliang Aug 30, 2019
1c82e4d
types/data: the bit operation didn't parse correctly (#11895)
gaoxingliang Aug 30, 2019
85a7459
types/data: the bit operation didn't parse correctly (#11895)
gaoxingliang Sep 10, 2019
94aaae2
Merge branch 'master' into fixBITOp
gaoxingliang Sep 10, 2019
0b3a629
types/data: format
gaoxingliang Sep 10, 2019
9f88fa6
Merge branch 'master' into fixBITOp
gaoxingliang Sep 11, 2019
73e1344
Merge branch 'master' into fixBITOp
sre-bot Sep 26, 2019
d4edfb2
Merge branch 'master' into fixBITOp
sre-bot Sep 26, 2019
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
19 changes: 19 additions & 0 deletions executor/insert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
. "github.com/pingcap/check"
"github.com/pingcap/parser/terror"
"github.com/pingcap/tidb/table"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util/testkit"
)

Expand Down Expand Up @@ -573,3 +574,21 @@ func (s *testSuite3) TestPartitionInsertOnDuplicate(c *C) {
tk.MustExec("insert into t3 values (1,2,3,4,5),(6,2,3,4,6) on duplicate key update e = e + values(e)")
tk.MustQuery("select * from t3").Check(testkit.Rows("1 2 3 4 16"))
}

func (s *testSuite3) TestBit(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec(`use test`)
tk.MustExec(`create table t1 (a bit(3))`)
_, err := tk.Exec("insert into t1 values(-1)")
c.Assert(types.ErrDataTooLong.Equal(err), IsTrue)
c.Assert(err.Error(), Matches, ".*Data too long for column 'a' at.*")
_, err = tk.Exec("insert into t1 values(9)")
c.Assert(err.Error(), Matches, ".*Data too long for column 'a' at.*")

tk.MustExec(`create table t64 (a bit(64))`)
tk.MustExec("insert into t64 values(-1)")
tk.MustExec("insert into t64 values(18446744073709551615)") // 2^64 - 1
_, err = tk.Exec("insert into t64 values(18446744073709551616)") // z^64
c.Assert(err.Error(), Matches, ".*Out of range value for column 'a' at.*")

}
6 changes: 5 additions & 1 deletion types/datum.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,12 +1214,16 @@ func (d *Datum) convertToMysqlBit(sc *stmtctx.StatementContext, target *FieldTyp
switch d.k {
case KindString, KindBytes:
uintValue, err = BinaryLiteral(d.b).ToInt(sc)
case KindInt64:
// if input kind is int64 (signed), when trans to bit, we need to treat it as unsigned
d.k = KindUint64
fallthrough
default:
uintDatum, err1 := d.convertToUint(sc, target)
uintValue, err = uintDatum.GetUint64(), err1
}
if target.Flen < 64 && uintValue >= 1<<(uint64(target.Flen)) {
return Datum{}, errors.Trace(ErrOverflow.GenWithStackByArgs("BIT", fmt.Sprintf("(%d)", target.Flen)))
return Datum{}, errors.Trace(ErrDataTooLong.GenWithStack("Data Too Long, field len %d", target.Flen))
}
byteSize := (target.Flen + 7) >> 3
ret.SetMysqlBit(NewBinaryLiteralFromUint(uintValue, byteSize))
Expand Down