*: Speed up the add index operation (pingcap#4579)

chenguoming1 · Sep 22, 2017 · a764561 · a764561
1 parent 16c008b
commit a764561
Show file tree

Hide file tree

Showing 8 changed files with 185 additions and 195 deletions.
diff --git a/ddl/column.go b/ddl/column.go
@@ -272,7 +272,7 @@ func (d *ddl) addTableColumn(t table.Table, columnInfo *model.ColumnInfo, reorgI
 	for {
 		startTime := time.Now()
 		handles = handles[:0]
-		err = d.iterateSnapshotRows(t, version, seekHandle,
+		err = iterateSnapshotRows(d.store, t, version, seekHandle,
 			func(h int64, rowKey kv.Key, rawRecord []byte) (bool, error) {
 				handles = append(handles, h)
 				if len(handles) == defaultBatchCnt {
@@ -363,7 +363,7 @@ func (d *ddl) backfillColumn(ctx context.Context, t table.Table, colMeta *column
 		}
 
 		err := kv.RunInNewTxn(d.store, true, func(txn kv.Transaction) error {
-			if err := d.isReorgRunnable(txn); err != nil {
+			if err := d.isReorgRunnable(); err != nil {
 				return errors.Trace(err)
 			}
 

diff --git a/ddl/ddl_db_test.go b/ddl/ddl_db_test.go
@@ -16,6 +16,7 @@ package ddl_test
 import (
 	"fmt"
 	"io"
+	"math"
 	"math/rand"
 	"strconv"
 	"strings"
@@ -46,7 +47,7 @@ import (
 
 var _ = Suite(&testDBSuite{})
 
-const defaultBatchSize = 1024
+const defaultBatchSize = 4196
 
 type testDBSuite struct {
 	store      kv.Storage
@@ -350,9 +351,10 @@ func (s *testDBSuite) testAlterLock(c *C) {
 
 func (s *testDBSuite) testAddIndex(c *C) {
 	done := make(chan error, 1)
-	num := defaultBatchSize + 10
+	start := -10
+	num := defaultBatchSize
 	// first add some rows
-	for i := 0; i < num; i++ {
+	for i := start; i < num; i++ {
 		s.mustExec(c, "insert into t1 values (?, ?, ?)", i, i, i)
 	}
 
@@ -382,16 +384,18 @@ LOOP:
 			for i := num; i < num+step; i++ {
 				n := rand.Intn(num)
 				deletedKeys[n] = struct{}{}
-				s.mustExec(c, "delete from t1 where c1 = ?", n)
-				s.mustExec(c, "insert into t1 values (?, ?, ?)", i, i, i)
+				sql := fmt.Sprintf("delete from t1 where c1 = %d", n)
+				s.mustExec(c, sql)
+				sql = fmt.Sprintf("insert into t1 values (%d, %d, %d)", i, i, i)
+				s.mustExec(c, sql)
 			}
 			num += step
 		}
 	}
 
 	// get exists keys
 	keys := make([]int, 0, num)
-	for i := 0; i < num; i++ {
+	for i := start; i < num; i++ {
 		if _, ok := deletedKeys[i]; ok {
 			continue
 		}
@@ -403,7 +407,7 @@ LOOP:
 	for _, key := range keys {
 		expectedRows = append(expectedRows, []interface{}{key})
 	}
-	rows := s.mustQuery(c, "select c1 from t1 where c3 >= 0")
+	rows := s.mustQuery(c, fmt.Sprintf("select c1 from t1 where c3 >= %d", start))
 	matchRows(c, rows, expectedRows)
 
 	// test index range
@@ -424,7 +428,8 @@ LOOP:
 	c.Assert(ctx.NewTxn(), IsNil)
 	t := s.testGetTable(c, "t1")
 	handles := make(map[int64]struct{})
-	err := t.IterRecords(ctx, t.FirstKey(), t.Cols(),
+	startKey := t.RecordKey(math.MinInt64)
+	err := t.IterRecords(ctx, startKey, t.Cols(),
 		func(h int64, data []types.Datum, cols []*table.Column) (bool, error) {
 			handles[h] = struct{}{}
 			return true, nil
@@ -1156,9 +1161,11 @@ func (s *testDBSuite) TestCreateTableWithLike(c *C) {
 func (s *testDBSuite) TestCreateTable(c *C) {
 	store, err := tidb.NewStore("memory://create_table")
 	c.Assert(err, IsNil)
+	defer store.Close()
 	s.tk = testkit.NewTestKit(c, store)
-	_, err = tidb.BootstrapSession(store)
+	dom, err := tidb.BootstrapSession(store)
 	c.Assert(err, IsNil)
+	defer dom.Close()
 
 	s.tk.MustExec("use test")
 	s.tk.MustExec("CREATE TABLE `t` (`a` double DEFAULT 1.0 DEFAULT now() DEFAULT 2.0 );")