Skip to content

Commit

Permalink
executor: do not acqurie pessimistic lock for non-unique index keys (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
ekexium authored Jul 26, 2022
1 parent db179bf commit 87c5b50
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 14 deletions.
25 changes: 14 additions & 11 deletions session/tidb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ func TestParseErrorWarn(t *testing.T) {

func TestKeysNeedLock(t *testing.T) {
rowKey := tablecodec.EncodeRowKeyWithHandle(1, kv.IntHandle(1))
indexKey := tablecodec.EncodeIndexSeekKey(1, 1, []byte{1})
uniqueIndexKey := tablecodec.EncodeIndexSeekKey(1, 1, []byte{1})
nonUniqueIndexKey := tablecodec.EncodeIndexSeekKey(1, 2, []byte{1})
uniqueValue := make([]byte, 8)
uniqueUntouched := append(uniqueValue, '1')
nonUniqueVal := []byte{'0'}
Expand All @@ -83,18 +84,20 @@ func TestKeysNeedLock(t *testing.T) {
}{
{rowKey, rowVal, true},
{rowKey, deleteVal, true},
{indexKey, nonUniqueVal, false},
{indexKey, nonUniqueUntouched, false},
{indexKey, uniqueValue, true},
{indexKey, uniqueUntouched, false},
{indexKey, deleteVal, false},
{nonUniqueIndexKey, nonUniqueVal, false},
{nonUniqueIndexKey, nonUniqueUntouched, false},
{uniqueIndexKey, uniqueValue, true},
{uniqueIndexKey, uniqueUntouched, false},
{uniqueIndexKey, deleteVal, false},
}

for _, test := range tests {
require.Equal(t, test.need, keyNeedToLock(test.key, test.val, 0))
}
need := keyNeedToLock(test.key, test.val, 0)
require.Equal(t, test.need, need)

flag := kv.KeyFlags(1)
require.True(t, flag.HasPresumeKeyNotExists())
require.True(t, keyNeedToLock(indexKey, deleteVal, flag))
flag := kv.KeyFlags(1)
need = keyNeedToLock(test.key, test.val, flag)
require.True(t, flag.HasPresumeKeyNotExists())
require.True(t, need)
}
}
9 changes: 6 additions & 3 deletions session/txn.go
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,12 @@ func keyNeedToLock(k, v []byte, flags kv.KeyFlags) bool {
if tablecodec.IsUntouchedIndexKValue(k, v) {
return false
}
isNonUniqueIndex := tablecodec.IsIndexKey(k) && len(v) == 1
// Put row key and unique index need to lock.
return !isNonUniqueIndex

if !tablecodec.IsIndexKey(k) {
return true
}

return tablecodec.IndexKVIsUnique(v)
}

func getBinlogMutation(ctx sessionctx.Context, tableID int64) *binlog.TableMutation {
Expand Down
13 changes: 13 additions & 0 deletions tablecodec/tablecodec.go
Original file line number Diff line number Diff line change
Expand Up @@ -1580,3 +1580,16 @@ func decodeIndexKvGeneral(key, value []byte, colsLen int, hdStatus HandleStatus,
}
return resultValues, nil
}

// IndexKVIsUnique uses to judge if an index is unique, it can handle the KV committed by txn already, it doesn't consider the untouched flag.
func IndexKVIsUnique(value []byte) bool {
if len(value) <= MaxOldEncodeValueLen {
return len(value) == 8
}
if getIndexVersion(value) == 1 {
segs := SplitIndexValueForClusteredIndexVersion1(value)
return segs.CommonHandle != nil
}
segs := SplitIndexValue(value)
return segs.IntHandle != nil || segs.CommonHandle != nil
}

0 comments on commit 87c5b50

Please sign in to comment.