close pingcap#29469; fix: mistakenly shadowed name idx

Signed-off-by: ekexium <ekexium@gmail.com>
ekexium · Nov 4, 2021 · 786d2bd · 786d2bd
1 parent 2f8f4d6
commit 786d2bd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/util/admin/admin.go b/util/admin/admin.go
@@ -379,17 +379,17 @@ func CheckRecordAndIndex(ctx context.Context, sessCtx sessionctx.Context, txn kv
 				return tablecodec.EncodeRecordKey(t.RecordPrefix(), handle)
 			},
 			IndexEncode: func(idxRow *consistency.RecordData) kv.Key {
-				var idx table.Index
+				var matchingIdx table.Index
 				for _, v := range t.Indices() {
 					if strings.EqualFold(v.Meta().Name.String(), idx.Meta().Name.O) {
-						idx = v
+						matchingIdx = v
 						break
 					}
 				}
-				if idx == nil {
+				if matchingIdx == nil {
 					return nil
 				}
-				k, _, err := idx.GenIndexKey(sessCtx.GetSessionVars().StmtCtx, idxRow.Values, idxRow.Handle, nil)
+				k, _, err := matchingIdx.GenIndexKey(sessCtx.GetSessionVars().StmtCtx, idxRow.Values, idxRow.Handle, nil)
 				if err != nil {
 					return nil
 				}