Merge pull request #1005 from pingcap/disksing/isolation-test

store: move isolation_test to /store/store_test.go

store/localstore/isolation_test.go

@@ -1,110 +0,0 @@
-package localstore_test
-
-import (
-	"fmt"
-	"sync"
-	"testing"
-
-	. "github.com/pingcap/check"
-	"github.com/pingcap/tidb"
-	"github.com/pingcap/tidb/kv"
-)
-
-func TestStore(t *testing.T) {
-	TestingT(t)
-}
-
-var _ = Suite(&testIsolationSuite{})
-
-type testIsolationSuite struct {
-	s kv.Storage
-}
-
-func (t *testIsolationSuite) TestInc(c *C) {
-	store, err := tidb.NewStore("memory://test/test_isolation")
-	c.Assert(err, IsNil)
-	defer store.Close()
-
-	threadCnt := 4
-
-	ids := make(map[int64]struct{}, threadCnt*100)
-	var m sync.Mutex
-	var wg sync.WaitGroup
-
-	wg.Add(threadCnt)
-	for i := 0; i < threadCnt; i++ {
-		go func() {
-			defer wg.Done()
-			for j := 0; j < 100; j++ {
-				var id int64
-				err := kv.RunInNewTxn(store, true, func(txn kv.Transaction) error {
-					var err1 error
-					id, err1 = kv.IncInt64(txn, []byte("key"), 1)
-					return err1
-				})
-				c.Assert(err, IsNil)
-
-				m.Lock()
-				_, ok := ids[id]
-				ids[id] = struct{}{}
-				m.Unlock()
-				c.Assert(ok, IsFalse)
-			}
-		}()
-	}
-
-	wg.Wait()
-}
-
-func (t *testIsolationSuite) TestMultiInc(c *C) {
-	store, err := tidb.NewStore("memory://test/test_isolation")
-	c.Assert(err, IsNil)
-	defer store.Close()
-
-	threadCnt := 4
-	incCnt := 100
-	keyCnt := 4
-
-	keys := make([][]byte, 0, keyCnt)
-	for i := 0; i < keyCnt; i++ {
-		keys = append(keys, []byte(fmt.Sprintf("test_key_%d", i)))
-	}
-
-	var wg sync.WaitGroup
-
-	wg.Add(threadCnt)
-	for i := 0; i < threadCnt; i++ {
-		go func() {
-			defer wg.Done()
-			for j := 0; j < incCnt; j++ {
-				err1 := kv.RunInNewTxn(store, true, func(txn kv.Transaction) error {
-					for _, key := range keys {
-						_, err2 := kv.IncInt64(txn, key, 1)
-						if err2 != nil {
-							return err2
-						}
-					}
-
-					return nil
-				})
-				c.Assert(err1, IsNil)
-			}
-		}()
-	}
-
-	wg.Wait()
-
-	for i := 0; i < keyCnt; i++ {
-		err = kv.RunInNewTxn(store, false, func(txn kv.Transaction) error {
-			for _, key := range keys {
-				id, err1 := kv.GetInt64(txn, key)
-				if err1 != nil {
-					return err1
-				}
-				c.Assert(id, Equals, int64(threadCnt*incCnt))
-			}
-			return nil
-		})
-		c.Assert(err, IsNil)
-	}
-}

store/store_test.go

@@ -594,3 +594,89 @@ func (s *testKVSuite) TestBoltDBDeadlock(c *C) {
 		return nil
 	})
 }
+
+func (s *testKVSuite) TestIsolationInc(c *C) {
+	threadCnt := 4
+
+	ids := make(map[int64]struct{}, threadCnt*100)
+	var m sync.Mutex
+	var wg sync.WaitGroup
+
+	wg.Add(threadCnt)
+	for i := 0; i < threadCnt; i++ {
+		go func() {
+			defer wg.Done()
+			for j := 0; j < 100; j++ {
+				var id int64
+				err := kv.RunInNewTxn(s.s, true, func(txn kv.Transaction) error {
+					var err1 error
+					id, err1 = kv.IncInt64(txn, []byte("key"), 1)
+					return err1
+				})
+				c.Assert(err, IsNil)
+
+				m.Lock()
+				_, ok := ids[id]
+				ids[id] = struct{}{}
+				m.Unlock()
+				c.Assert(ok, IsFalse)
+			}
+		}()
+	}
+
+	wg.Wait()
+
+	// delete
+	txn, err := s.s.Begin()
+	c.Assert(err, IsNil)
+	defer txn.Commit()
+	txn.Delete([]byte("key"))
+}
+
+func (s *testKVSuite) TestIsolationMultiInc(c *C) {
+	threadCnt := 4
+	incCnt := 100
+	keyCnt := 4
+
+	keys := make([][]byte, 0, keyCnt)
+	for i := 0; i < keyCnt; i++ {
+		keys = append(keys, []byte(fmt.Sprintf("test_key_%d", i)))
+	}
+
+	var wg sync.WaitGroup
+
+	wg.Add(threadCnt)
+	for i := 0; i < threadCnt; i++ {
+		go func() {
+			defer wg.Done()
+			for j := 0; j < incCnt; j++ {
+				err1 := kv.RunInNewTxn(s.s, true, func(txn kv.Transaction) error {
+					for _, key := range keys {
+						_, err2 := kv.IncInt64(txn, key, 1)
+						if err2 != nil {
+							return err2
+						}
+					}
+
+					return nil
+				})
+				c.Assert(err1, IsNil)
+			}
+		}()
+	}
+
+	wg.Wait()
+
+	err := kv.RunInNewTxn(s.s, false, func(txn kv.Transaction) error {
+		for _, key := range keys {
+			id, err1 := kv.GetInt64(txn, key)
+			if err1 != nil {
+				return err1
+			}
+			c.Assert(id, Equals, int64(threadCnt*incCnt))
+			txn.Delete(key)
+		}
+		return nil
+	})
+	c.Assert(err, IsNil)
+}