Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: change var names from 'index'

Browse Source 
Having the same variable name as 'index' type
can be confusing and shadowing other variables.
This gives different variable names to 'index' variables.
This commit is contained in:
Gyu-Ho Lee 2015-12-12 10:10:49 -08:00
parent 8696a1509c
commit d55ab7798b
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
storage/index_test.go
View File

@ -225,17 +225,17 @@ func TestIndexCompact(t *testing.T) {
for i := int64(1); i < maxRev; i++ { for i := int64(1); i < maxRev; i++ {
am := ti.Compact(i) am := ti.Compact(i)
windex := newTreeIndex() wti := newTreeIndex()
for _, tt := range tests { for _, tt := range tests {
if _, ok := am[tt.rev]; ok || tt.rev.GreaterThan(revision{main: i}) { if _, ok := am[tt.rev]; ok || tt.rev.GreaterThan(revision{main: i}) {
if tt.remove { if tt.remove {
windex.Tombstone(tt.key, tt.rev) wti.Tombstone(tt.key, tt.rev)
} else { } else {
windex.Restore(tt.key, tt.created, tt.rev, tt.ver) wti.Restore(tt.key, tt.created, tt.rev, tt.ver)
} }
} }
} }
if !ti.Equal(windex) { if !ti.Equal(wti) {
t.Errorf("#%d: not equal ti", i) t.Errorf("#%d: not equal ti", i)
} }
} }
@ -252,17 +252,17 @@ func TestIndexCompact(t *testing.T) {
} }
am := ti.Compact(i) am := ti.Compact(i)
windex := newTreeIndex() wti := newTreeIndex()
for _, tt := range tests { for _, tt := range tests {
if _, ok := am[tt.rev]; ok || tt.rev.GreaterThan(revision{main: i}) { if _, ok := am[tt.rev]; ok || tt.rev.GreaterThan(revision{main: i}) {
if tt.remove { if tt.remove {
windex.Tombstone(tt.key, tt.rev) wti.Tombstone(tt.key, tt.rev)
} else { } else {
windex.Restore(tt.key, tt.created, tt.rev, tt.ver) wti.Restore(tt.key, tt.created, tt.rev, tt.ver)
} }
} }
} }
if !ti.Equal(windex) { if !ti.Equal(wti) {
t.Errorf("#%d: not equal ti", i) t.Errorf("#%d: not equal ti", i)
} }
} }

40
storage/kvstore_test.go
View File

@ -94,10 +94,10 @@ func TestStorePut(t *testing.T) {
}, },
} }
for i, tt := range tests { for i, tt := range tests {
s, b, index := newFakeStore() s, b, fi := newFakeStore()
s.currentRev = tt.rev s.currentRev = tt.rev
s.tx = b.BatchTx() s.tx = b.BatchTx()
index.indexGetRespc <- tt.r fi.indexGetRespc <- tt.r
s.put([]byte("foo"), []byte("bar")) s.put([]byte("foo"), []byte("bar"))
@ -115,7 +115,7 @@ func TestStorePut(t *testing.T) {
{"get", []interface{}{[]byte("foo"), tt.wputrev.main}}, {"get", []interface{}{[]byte("foo"), tt.wputrev.main}},
{"put", []interface{}{[]byte("foo"), tt.wputrev}}, {"put", []interface{}{[]byte("foo"), tt.wputrev}},
} }
if g := index.Action(); !reflect.DeepEqual(g, wact) { if g := fi.Action(); !reflect.DeepEqual(g, wact) {
t.Errorf("#%d: index action = %+v, want %+v", i, g, wact) t.Errorf("#%d: index action = %+v, want %+v", i, g, wact)
} }
if s.currentRev != tt.wrev { if s.currentRev != tt.wrev {
@ -154,11 +154,11 @@ func TestStoreRange(t *testing.T) {
}, },
} }
for i, tt := range tests { for i, tt := range tests {
s, b, index := newFakeStore() s, b, fi := newFakeStore()
s.currentRev = currev s.currentRev = currev
s.tx = b.BatchTx() s.tx = b.BatchTx()
b.tx.rangeRespc <- tt.r b.tx.rangeRespc <- tt.r
index.indexRangeRespc <- tt.idxr fi.indexRangeRespc <- tt.idxr
kvs, rev, err := s.rangeKeys([]byte("foo"), []byte("goo"), 1, 0) kvs, rev, err := s.rangeKeys([]byte("foo"), []byte("goo"), 1, 0)
if err != nil { if err != nil {
@ -181,7 +181,7 @@ func TestStoreRange(t *testing.T) {
wact = []testutil.Action{ wact = []testutil.Action{
{"range", []interface{}{[]byte("foo"), []byte("goo"), wrev}}, {"range", []interface{}{[]byte("foo"), []byte("goo"), wrev}},
} }
if g := index.Action(); !reflect.DeepEqual(g, wact) { if g := fi.Action(); !reflect.DeepEqual(g, wact) {
t.Errorf("#%d: index action = %+v, want %+v", i, g, wact) t.Errorf("#%d: index action = %+v, want %+v", i, g, wact)
} }
if s.currentRev != currev { if s.currentRev != currev {
@ -218,10 +218,10 @@ func TestStoreDeleteRange(t *testing.T) {
}, },
} }
for i, tt := range tests { for i, tt := range tests {
s, b, index := newFakeStore() s, b, fi := newFakeStore()
s.currentRev = tt.rev s.currentRev = tt.rev
s.tx = b.BatchTx() s.tx = b.BatchTx()
index.indexRangeRespc <- tt.r fi.indexRangeRespc <- tt.r
n := s.deleteRange([]byte("foo"), []byte("goo")) n := s.deleteRange([]byte("foo"), []byte("goo"))
if n != 1 { if n != 1 {
@ -244,7 +244,7 @@ func TestStoreDeleteRange(t *testing.T) {
{"range", []interface{}{[]byte("foo"), []byte("goo"), tt.wrrev}}, {"range", []interface{}{[]byte("foo"), []byte("goo"), tt.wrrev}},
{"tombstone", []interface{}{[]byte("foo"), tt.wdelrev}}, {"tombstone", []interface{}{[]byte("foo"), tt.wdelrev}},
} }
if g := index.Action(); !reflect.DeepEqual(g, wact) { if g := fi.Action(); !reflect.DeepEqual(g, wact) {
t.Errorf("#%d: index action = %+v, want %+v", i, g, wact) t.Errorf("#%d: index action = %+v, want %+v", i, g, wact)
} }
if s.currentRev != tt.wrev { if s.currentRev != tt.wrev {
@ -282,9 +282,9 @@ func TestStoreRangeHistory(t *testing.T) {
}, },
} }
for i, tt := range tests { for i, tt := range tests {
s, b, index := newFakeStore() s, b, fi := newFakeStore()
s.currentRev = currev s.currentRev = currev
index.indexRangeEventsRespc <- tt.idxr fi.indexRangeEventsRespc <- tt.idxr
b.tx.rangeRespc <- tt.r b.tx.rangeRespc <- tt.r
keys, kvs, _, err := s.RangeHistory([]byte("foo"), []byte("goo"), 1, 1) keys, kvs, _, err := s.RangeHistory([]byte("foo"), []byte("goo"), 1, 1)
@ -301,7 +301,7 @@ func TestStoreRangeHistory(t *testing.T) {
wact := []testutil.Action{ wact := []testutil.Action{
{"rangeEvents", []interface{}{[]byte("foo"), []byte("goo"), int64(1)}}, {"rangeEvents", []interface{}{[]byte("foo"), []byte("goo"), int64(1)}},
} }
if g := index.Action(); !reflect.DeepEqual(g, wact) { if g := fi.Action(); !reflect.DeepEqual(g, wact) {
t.Errorf("#%d: index action = %+v, want %+v", i, g, wact) t.Errorf("#%d: index action = %+v, want %+v", i, g, wact)
} }
wstart, wend := revBytesRange(tt.idxr.revs[0]) wstart, wend := revBytesRange(tt.idxr.revs[0])
@ -318,9 +318,9 @@ func TestStoreRangeHistory(t *testing.T) {
} }
func TestStoreCompact(t *testing.T) { func TestStoreCompact(t *testing.T) {
s, b, index := newFakeStore() s, b, fi := newFakeStore()
s.currentRev = revision{3, 0} s.currentRev = revision{3, 0}
index.indexCompactRespc <- map[revision]struct{}{revision{1, 0}: {}} fi.indexCompactRespc <- map[revision]struct{}{revision{1, 0}: {}}
key1 := newTestKeyBytes(revision{1, 0}, false) key1 := newTestKeyBytes(revision{1, 0}, false)
key2 := newTestKeyBytes(revision{2, 0}, false) key2 := newTestKeyBytes(revision{2, 0}, false)
b.tx.rangeRespc <- rangeResp{[][]byte{key1, key2}, nil} b.tx.rangeRespc <- rangeResp{[][]byte{key1, key2}, nil}
@ -345,13 +345,13 @@ func TestStoreCompact(t *testing.T) {
wact = []testutil.Action{ wact = []testutil.Action{
{"compact", []interface{}{int64(3)}}, {"compact", []interface{}{int64(3)}},
} }
if g := index.Action(); !reflect.DeepEqual(g, wact) { if g := fi.Action(); !reflect.DeepEqual(g, wact) {
t.Errorf("index action = %+v, want %+v", g, wact) t.Errorf("index action = %+v, want %+v", g, wact)
} }
} }
func TestStoreRestore(t *testing.T) { func TestStoreRestore(t *testing.T) {
s, b, index := newFakeStore() s, b, fi := newFakeStore()
putkey := newTestKeyBytes(revision{3, 0}, false) putkey := newTestKeyBytes(revision{3, 0}, false)
putkv := storagepb.KeyValue{ putkv := storagepb.KeyValue{
@ -398,7 +398,7 @@ func TestStoreRestore(t *testing.T) {
{"restore", []interface{}{[]byte("foo"), revision{3, 0}, revision{3, 0}, int64(1)}}, {"restore", []interface{}{[]byte("foo"), revision{3, 0}, revision{3, 0}, int64(1)}},
{"tombstone", []interface{}{[]byte("foo"), revision{4, 0}}}, {"tombstone", []interface{}{[]byte("foo"), revision{4, 0}}},
} }
if g := index.Action(); !reflect.DeepEqual(g, wact) { if g := fi.Action(); !reflect.DeepEqual(g, wact) {
t.Errorf("index action = %+v, want %+v", g, wact) t.Errorf("index action = %+v, want %+v", g, wact)
} }
} }
@ -708,7 +708,7 @@ func newTestKeyBytes(rev revision, tombstone bool) []byte {
func newFakeStore() (*store, *fakeBackend, *fakeIndex) { func newFakeStore() (*store, *fakeBackend, *fakeIndex) {
b := &fakeBackend{&fakeBatchTx{rangeRespc: make(chan rangeResp, 5)}} b := &fakeBackend{&fakeBatchTx{rangeRespc: make(chan rangeResp, 5)}}
index := &fakeIndex{ fi := &fakeIndex{
indexGetRespc: make(chan indexGetResp, 1), indexGetRespc: make(chan indexGetResp, 1),
indexRangeRespc: make(chan indexRangeResp, 1), indexRangeRespc: make(chan indexRangeResp, 1),
indexRangeEventsRespc: make(chan indexRangeEventsResp, 1), indexRangeEventsRespc: make(chan indexRangeEventsResp, 1),
@ -716,10 +716,10 @@ func newFakeStore() (*store, *fakeBackend, *fakeIndex) {
} }
return &store{ return &store{
b: b, b: b,
kvindex: index, kvindex: fi,
currentRev: revision{}, currentRev: revision{},
compactMainRev: -1, compactMainRev: -1,
}, b, index }, b, fi
} }
type rangeResp struct { type rangeResp struct {