ddl: unify drop table index and tiny clean up

mxmz · Jan 4, 2016 · 28f7fad · 28f7fad
1 parent 846af17
commit 28f7fad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 56 deletions.
diff --git a/ddl/index.go b/ddl/index.go
@@ -394,7 +394,6 @@ func (d *ddl) getSnapshotRows(t table.Table, version uint64, seekHandle int64) (
 
 		handles = append(handles, handle)
 		if len(handles) == maxBatchSize {
-			seekHandle = handle + 1
 			break
 		}
 
@@ -476,54 +475,7 @@ func (d *ddl) backfillTableIndex(t table.Table, indexInfo *model.IndexInfo, hand
 
 func (d *ddl) dropTableIndex(t table.Table, indexInfo *model.IndexInfo) error {
 	prefix := kv.GenIndexPrefix(t.IndexPrefix(), indexInfo.ID)
-	for {
-		keys := make([]kv.Key, 0, maxBatchSize)
-		err := kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error {
-			iter, err := txn.Seek(prefix)
-			if err != nil {
-				return errors.Trace(err)
-			}
-
-			defer iter.Close()
-			for i := 0; i < maxBatchSize; i++ {
-				if iter.Valid() && iter.Key().HasPrefix(prefix) {
-					keys = append(keys, iter.Key().Clone())
-					err = iter.Next()
-					if err != nil {
-						return errors.Trace(err)
-					}
-				} else {
-					break
-				}
-			}
-
-			return nil
-		})
-
-		// if err or delete no keys, return.
-		if err != nil || len(keys) == 0 {
-			return errors.Trace(err)
-		}
-
-		// delete index key one by one
-		for _, key := range keys {
-			err = kv.RunInNewTxn(d.store, true, func(txn kv.Transaction) error {
-				if err1 := d.isReorgRunnable(txn); err1 != nil {
-					return errors.Trace(err1)
-				}
-
-				err1 := txn.Delete(key)
-				// if key doesn't exist, skip this error.
-				if err1 != nil && !terror.ErrorEqual(err1, kv.ErrNotExist) {
-					return errors.Trace(err1)
-				}
+	err := d.delKeysWithPrefix(prefix)
 
-				return nil
-			})
-
-			if err != nil {
-				return errors.Trace(err)
-			}
-		}
-	}
+	return errors.Trace(err)
 }
diff --git a/ddl/reorg.go b/ddl/reorg.go
@@ -182,6 +182,7 @@ func (d *ddl) delKeysWithPrefix(prefix kv.Key) error {
 			for _, key := range keys {
 				err := txn.Delete(key)
 				// must skip ErrNotExist
+				// if key doesn't exist, skip this error.
 				if err != nil && !terror.ErrorEqual(err, kv.ErrNotExist) {
 					return errors.Trace(err)
 				}
@@ -190,14 +191,10 @@ func (d *ddl) delKeysWithPrefix(prefix kv.Key) error {
 			return nil
 		})
 
-		if err != nil {
+		// if err or delete no keys, returns.
+		if err != nil || len(keys) == 0 {
 			return errors.Trace(err)
 		}
-
-		// delete no keys, return.
-		if len(keys) == 0 {
-			return nil
-		}
 	}
 }