Skip to content

Commit 79b22d9

Browse files
authored
ranger: handle float/integers overflow properly (#53501) (#53524)
close #46538
1 parent 4b0834b commit 79b22d9

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

pkg/planner/core/plan_cache_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,8 +1852,11 @@ func TestIndexRange(t *testing.T) {
18521852
tk := testkit.NewTestKit(t, store)
18531853
tk.MustExec(`use test`)
18541854

1855-
tk.MustExec(`CREATE TABLE posts (id bigint NOT NULL AUTO_INCREMENT PRIMARY KEY)`)
1856-
tk.MustExec(`INSERT INTO posts (id) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11);`)
1855+
tk.MustExec(`CREATE TABLE t0 (id bigint NOT NULL AUTO_INCREMENT PRIMARY KEY)`)
1856+
tk.MustExec(`CREATE TABLE t1(c0 FLOAT ZEROFILL, PRIMARY KEY(c0));`)
1857+
tk.MustExec(`INSERT INTO t0 (id) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11);`)
1858+
tk.MustExec("INSERT INTO t1(c0) VALUES (1);")
18571859
tk.MustExec(`set tidb_enable_non_prepared_plan_cache=1;`)
1858-
tk.MustQuery(`SELECT posts.* FROM posts WHERE (id = 1 or id = 9223372036854775808);`).Check(testkit.Rows("1"))
1860+
tk.MustQuery(`SELECT t0.* FROM t0 WHERE (id = 1 or id = 9223372036854775808);`).Check(testkit.Rows("1"))
1861+
tk.MustQuery("SELECT t1.c0 FROM t1 WHERE t1.c0!=BIN(-1);").Check(testkit.Rows("1"))
18591862
}

pkg/util/ranger/ranger.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,10 @@ func convertPoint(sctx planctx.PlanContext, point *point, newTp *types.FieldType
175175
// see issue #19067: we should ignore the types.ErrDataTooLong when we convert value to TypeBit value
176176
} else if (newTp.GetType() == mysql.TypeNewDecimal || newTp.GetType() == mysql.TypeLonglong) && terror.ErrorEqual(err, types.ErrOverflow) {
177177
// Ignore the types.ErrOverflow when we convert TypeNewDecimal/TypeLonglong values.
178+
} else if newTp.GetType() == mysql.TypeNewDecimal && terror.ErrorEqual(err, types.ErrOverflow) {
179+
// Ignore the types.ErrOverflow when we convert TypeNewDecimal values.
180+
} else if (newTp.GetType() == mysql.TypeNewDecimal || mysql.IsIntegerType(newTp.GetType()) || newTp.GetType() == mysql.TypeFloat) && terror.ErrorEqual(err, types.ErrOverflow) {
181+
// Ignore the types.ErrOverflow when we convert TypeNewDecimal/TypeTiny/TypeShort/TypeInt24/TypeLong/TypeLonglong/TypeFloat values.
178182
// A trimmed valid boundary point value would be returned then. Accordingly, the `excl` of the point
179183
// would be adjusted. Impossible ranges would be skipped by the `validInterval` call later.
180184
// tests in TestIndexRange/TestIndexRangeForDecimal

0 commit comments

Comments
 (0)