Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions pkg/executor/check_table_index.go
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ func (w *checkIndexWorker) HandleTask(task checkIndexTask, _ func(workerpool.Non

currentOffset := 0

meetError = false
// Every checksum in table side should be the same as the index side.
i := 0
for i < len(tableChecksum) && i < len(indexChecksum) {
Expand Down
51 changes: 49 additions & 2 deletions pkg/executor/test/admintest/admin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1523,10 +1523,9 @@ func TestAdminCheckTableErrorLocate(t *testing.T) {
tk.MustExec("set cte_max_recursion_depth=10000;")
tk.MustExec("insert into admin_test with recursive cte(a, b) as (select 1, 1 union select a+1, b+1 from cte where cte.a< 10000) select * from cte;")

// Make some corrupted index. Build the index information.
sctx := mock.NewContext()
sctx.Store = store
ctx := sctx.GetTableCtx()
<<<<<<< HEAD
is := domain.InfoSchema()
dbName := pmodel.NewCIStr("test")
tblName := pmodel.NewCIStr("admin_test")
Expand All @@ -1535,10 +1534,58 @@ func TestAdminCheckTableErrorLocate(t *testing.T) {
tblInfo := tbl.Meta()
idxInfo := tblInfo.Indices[0]
indexOpr := tables.NewIndex(tblInfo.ID, tblInfo, idxInfo)
=======

// Make some corrupted index. Build the index information.
getIndex := func() table.Index {
sctx.Store = store
is := domain.InfoSchema()
dbName := ast.NewCIStr("test")
tblName := ast.NewCIStr("admin_test")
tbl, err := is.TableByName(context.Background(), dbName, tblName)
require.NoError(t, err)
tblInfo := tbl.Meta()
idxInfo := tblInfo.Indices[0]
indexOpr := tables.NewIndex(tblInfo.ID, tblInfo, idxInfo)
return indexOpr
}

indexOpr := getIndex()
>>>>>>> 0587d81370a (executor: fix unexpected successful admin check in the table when no index record exists (#63871))

pattern := "handle:\\s(\\d+)"
r := regexp.MustCompile(pattern)

// No index record
for i := range 10001 {
txn, err := store.Begin()
require.NoError(t, err)
err = indexOpr.Delete(ctx, txn, types.MakeDatums(i), kv.IntHandle(i))
require.NoError(t, err)
err = txn.Commit(context.Background())
require.NoError(t, err)
}
err := tk.ExecToErr("admin check table admin_test")
require.Error(t, err)

// Reset table.
tk.MustExec("truncate admin_test")
indexOpr = getIndex()
// No table record
for i := range 100 {
txn, err := store.Begin()
require.NoError(t, err)
_, err = indexOpr.Create(ctx, txn, types.MakeDatums(i), kv.IntHandle(i), nil)
require.NoError(t, err)
err = txn.Commit(context.Background())
require.NoError(t, err)
}
err = tk.ExecToErr("admin check table admin_test")
require.Error(t, err)

tk.MustExec("truncate admin_test")
tk.MustExec("insert into admin_test with recursive cte(a, b) as (select 1, 1 union select a+1, b+1 from cte where cte.a< 10000) select * from cte;")
indexOpr = getIndex()
// Delete an index record randomly.
for i := 0; i < 10; i++ {
txn, err := store.Begin()
Expand Down