From b5eea7b68797e6d45cd6692cfb0dab6f2407803f Mon Sep 17 00:00:00 2001 From: xia Date: Mon, 21 Dec 2015 21:45:42 +0800 Subject: [PATCH] inspectkv: address comments --- inspectkv/inspectkv.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/inspectkv/inspectkv.go b/inspectkv/inspectkv.go index 13f7f9a12c..3372f8f50a 100644 --- a/inspectkv/inspectkv.go +++ b/inspectkv/inspectkv.go @@ -242,22 +242,16 @@ func checkColsAndIndex(txn kv.Transaction, t table.Table, idx *column.IndexedCol kvIndex := kv.NewKVIndex(t.IndexPrefix(), idx.Name.L, idx.ID, idx.Unique) err := t.IterRecords(txn, string(startKey), cols, func(h1 int64, vals1 []interface{}, cols []*column.Col) (bool, error) { - it, hit, err := kvIndex.Seek(txn, vals1) - if err != nil { - return false, errors.Trace(err) - } - defer it.Close() - - if !hit { - ret := newDiffRetError(h1, resultNotExist, vals1, nil) + isExist, h2, err := kvIndex.Exist(txn, vals1, h1) + if terror.ErrorEqual(err, kv.ErrKeyExists) { + ret := newDiffRetError(h1, h2, vals1, vals1) return false, errors.Trace(ret) } - _, h2, err := it.Next() if err != nil { return false, errors.Trace(err) } - if h1 != h2 { - ret := newDiffRetError(h1, h2, vals1, vals1) + if !isExist { + ret := newDiffRetError(h1, resultNotExist, vals1, nil) return false, errors.Trace(ret) }