From c4b46faaabf9bd3d7baab2da33003c31fd6fb417 Mon Sep 17 00:00:00 2001 From: disksing Date: Tue, 10 Nov 2015 09:39:49 +0800 Subject: [PATCH] *: address review comments --- kv/cache_snapshot_test.go | 71 +++++++++++++++++---------------------- kv/union_store_test.go | 60 +++++++++++++-------------------- 2 files changed, 54 insertions(+), 77 deletions(-) diff --git a/kv/cache_snapshot_test.go b/kv/cache_snapshot_test.go index cc74cadc5f..97e9fb41ac 100644 --- a/kv/cache_snapshot_test.go +++ b/kv/cache_snapshot_test.go @@ -21,22 +21,11 @@ import ( var _ = Suite(&testCacheSnapshotSuite{}) type testCacheSnapshotSuite struct { - k1, k2, k3, k4 []byte - v1, v2, v3, v4 []byte - store MemBuffer - cache Snapshot + store MemBuffer + cache Snapshot } func (s *testCacheSnapshotSuite) SetUpTest(c *C) { - s.k1 = []byte("k1") - s.k2 = []byte("k2") - s.k3 = []byte("k3") - s.k4 = []byte("k4") - s.v1 = []byte("1") - s.v2 = []byte("2") - s.v3 = []byte("3") - s.v4 = []byte("4") - s.store = NewMemDbBuffer() s.cache = NewCacheSnapshot(&mockSnapshot{s.store}) } @@ -46,58 +35,58 @@ func (s *testCacheSnapshotSuite) TearDownTest(c *C) { } func (s *testCacheSnapshotSuite) TestGet(c *C) { - s.store.Set(s.k1, s.v1) - s.store.Set(s.k2, s.v2) + s.store.Set([]byte("1"), []byte("1")) + s.store.Set([]byte("2"), []byte("2")) - v, err := s.cache.Get(s.k1) + v, err := s.cache.Get([]byte("1")) c.Assert(err, IsNil) - c.Assert(v, BytesEquals, s.v1) + c.Assert(v, BytesEquals, []byte("1")) - s.store.Set(s.k1, s.v3) - v, err = s.cache.Get(s.k1) + s.store.Set([]byte("1"), []byte("3")) + v, err = s.cache.Get([]byte("1")) c.Assert(err, IsNil) - c.Assert(v, BytesEquals, s.v1) + c.Assert(v, BytesEquals, []byte("1")) - s.store.Set(s.k2, s.v4) - v, err = s.cache.Get(s.k2) + s.store.Set([]byte("2"), []byte("4")) + v, err = s.cache.Get([]byte("2")) c.Assert(err, IsNil) - c.Assert(v, BytesEquals, s.v4) + c.Assert(v, BytesEquals, []byte("4")) } func (s *testCacheSnapshotSuite) TestBatchGet(c *C) { - s.store.Set(s.k1, s.v1) - s.store.Set(s.k2, s.v2) + s.store.Set([]byte("1"), []byte("1")) + s.store.Set([]byte("2"), []byte("2")) - m, err := s.cache.BatchGet([]Key{s.k1, s.k2, s.k3}) + m, err := s.cache.BatchGet([]Key{[]byte("1"), []byte("2"), []byte("3")}) c.Assert(err, IsNil) - c.Assert(m[string(s.k1)], BytesEquals, s.v1) - c.Assert(m[string(s.k2)], BytesEquals, s.v2) - _, exist := m[string(s.k3)] + c.Assert(m["1"], BytesEquals, []byte("1")) + c.Assert(m["2"], BytesEquals, []byte("2")) + _, exist := m["3"] c.Assert(exist, IsFalse) // result should be saved in cache - s.store.Set(s.k1, s.v4) - v, err := s.cache.Get(s.k1) + s.store.Set([]byte("1"), []byte("4")) + v, err := s.cache.Get([]byte("1")) c.Assert(err, IsNil) - c.Assert(v, BytesEquals, s.v1) + c.Assert(v, BytesEquals, []byte("1")) } func (s *testCacheSnapshotSuite) TestRangeGet(c *C) { - s.store.Set(s.k1, s.v1) - s.store.Set(s.k2, s.v2) - s.store.Set(s.k3, s.v3) + s.store.Set([]byte("1"), []byte("1")) + s.store.Set([]byte("2"), []byte("2")) + s.store.Set([]byte("3"), []byte("3")) - m, err := s.cache.RangeGet(s.k1, s.k2, 100) + m, err := s.cache.RangeGet([]byte("1"), []byte("2"), 100) c.Assert(err, IsNil) c.Assert(m, HasLen, 2) - c.Assert(m[string(s.k1)], BytesEquals, s.v1) - c.Assert(m[string(s.k2)], BytesEquals, s.v2) + c.Assert(m["1"], BytesEquals, []byte("1")) + c.Assert(m["2"], BytesEquals, []byte("2")) // result should be saved in cache - s.store.Set(s.k1, s.v4) - v, err := s.cache.Get(s.k1) + s.store.Set([]byte("1"), []byte("4")) + v, err := s.cache.Get([]byte("1")) c.Assert(err, IsNil) - c.Assert(v, BytesEquals, s.v1) + c.Assert(v, BytesEquals, []byte("1")) } type mockSnapshot struct { diff --git a/kv/union_store_test.go b/kv/union_store_test.go index 94910520e0..77e676b6aa 100644 --- a/kv/union_store_test.go +++ b/kv/union_store_test.go @@ -18,23 +18,11 @@ import . "github.com/pingcap/check" var _ = Suite(&testUnionStoreSuite{}) type testUnionStoreSuite struct { - k1, k2, k3, k4 []byte - v1, v2, v3, v4 []byte - store MemBuffer us UnionStore } func (s *testUnionStoreSuite) SetUpTest(c *C) { - s.k1 = []byte("k1") - s.k2 = []byte("k2") - s.k3 = []byte("k3") - s.k4 = []byte("k4") - s.v1 = []byte("1") - s.v2 = []byte("2") - s.v3 = []byte("3") - s.v4 = []byte("4") - s.store = NewMemDbBuffer() s.us = NewUnionStore(&mockSnapshot{s.store}) } @@ -44,51 +32,51 @@ func (s *testUnionStoreSuite) TearDownTest(c *C) { } func (s *testUnionStoreSuite) TestGetSet(c *C) { - s.store.Set(s.k1, s.v1) - v, err := s.us.Get(s.k1) + s.store.Set([]byte("1"), []byte("1")) + v, err := s.us.Get([]byte("1")) c.Assert(err, IsNil) - c.Assert(v, BytesEquals, s.v1) - s.us.Set(s.k1, s.v2) - v, err = s.us.Get(s.k1) + c.Assert(v, BytesEquals, []byte("1")) + s.us.Set([]byte("1"), []byte("2")) + v, err = s.us.Get([]byte("1")) c.Assert(err, IsNil) - c.Assert(v, BytesEquals, s.v2) + c.Assert(v, BytesEquals, []byte("2")) } func (s *testUnionStoreSuite) TestDelete(c *C) { - s.store.Set(s.k1, s.v1) - err := s.us.Delete(s.k1) + s.store.Set([]byte("1"), []byte("1")) + err := s.us.Delete([]byte("1")) c.Assert(err, IsNil) - _, err = s.us.Get(s.k1) + _, err = s.us.Get([]byte("1")) c.Assert(IsErrNotFound(err), IsTrue) - s.us.Set(s.k1, s.v2) - v, err := s.us.Get(s.k1) + s.us.Set([]byte("1"), []byte("2")) + v, err := s.us.Get([]byte("1")) c.Assert(err, IsNil) - c.Assert(v, BytesEquals, s.v2) + c.Assert(v, BytesEquals, []byte("2")) } func (s *testUnionStoreSuite) TestSeek(c *C) { - s.store.Set(s.k1, s.v1) - s.store.Set(s.k2, s.v2) - s.store.Set(s.k3, s.v3) + s.store.Set([]byte("1"), []byte("1")) + s.store.Set([]byte("2"), []byte("2")) + s.store.Set([]byte("3"), []byte("3")) iter, err := s.us.Seek(nil, nil) c.Assert(err, IsNil) - checkIterator(c, iter, [][]byte{s.k1, s.k2, s.k3}, [][]byte{s.v1, s.v2, s.v3}) + checkIterator(c, iter, [][]byte{[]byte("1"), []byte("2"), []byte("3")}, [][]byte{[]byte("1"), []byte("2"), []byte("3")}) - iter, err = s.us.Seek(s.k2, nil) + iter, err = s.us.Seek([]byte("2"), nil) c.Assert(err, IsNil) - checkIterator(c, iter, [][]byte{s.k2, s.k3}, [][]byte{s.v2, s.v3}) + checkIterator(c, iter, [][]byte{[]byte("2"), []byte("3")}, [][]byte{[]byte("2"), []byte("3")}) - s.us.Set(s.k4, s.v4) - iter, err = s.us.Seek(s.k2, nil) + s.us.Set([]byte("4"), []byte("4")) + iter, err = s.us.Seek([]byte("2"), nil) c.Assert(err, IsNil) - checkIterator(c, iter, [][]byte{s.k2, s.k3, s.k4}, [][]byte{s.v2, s.v3, s.v4}) + checkIterator(c, iter, [][]byte{[]byte("2"), []byte("3"), []byte("4")}, [][]byte{[]byte("2"), []byte("3"), []byte("4")}) - s.us.Delete(s.k3) - iter, err = s.us.Seek(s.k2, nil) + s.us.Delete([]byte("3")) + iter, err = s.us.Seek([]byte("2"), nil) c.Assert(err, IsNil) - checkIterator(c, iter, [][]byte{s.k2, s.k4}, [][]byte{s.v2, s.v4}) + checkIterator(c, iter, [][]byte{[]byte("2"), []byte("4")}, [][]byte{[]byte("2"), []byte("4")}) } func checkIterator(c *C, iter Iterator, keys [][]byte, values [][]byte) {