executor: fix batchget overflow lock panic (#23774) (#23778)

pingcap · May 8, 2021 · b8fb03c · b8fb03c
1 parent 4195c2b
commit b8fb03c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/executor/batch_point_get.go b/executor/batch_point_get.go
@@ -180,6 +180,9 @@ func (e *BatchPointGetExec) initialize(ctx context.Context) error {
 			if err1 != nil && !kv.ErrNotExist.Equal(err1) {
 				return err1
 			}
+			if idxKey == nil {
+				continue
+			}
 			s := hack.String(idxKey)
 			if _, found := dedup[s]; found {
 				continue

diff --git a/session/pessimistic_test.go b/session/pessimistic_test.go
@@ -304,6 +304,7 @@ func (s *testPessimisticSuite) TestPointGetOverflow(c *C) {
 	tk.MustExec("create table t(k tinyint, v int, unique key(k))")
 	tk.MustExec("begin pessimistic")
 	tk.MustExec("update t set v = 100 where k = -200;")
+	tk.MustExec("update t set v = 100 where k in (-200, -400);")
 }
 
 func (s *testPessimisticSuite) TestPointGetKeyLock(c *C) {