Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lightning: remove the unnecessary offset field in the key encoding for duplicate detection #29975

Merged
merged 9 commits into from
Dec 28, 2021
Prev Previous commit
Next Next commit
use Equal instead of EqualValues in test
  • Loading branch information
sleepymole committed Nov 25, 2021
commit 9f7612473399a4875a5debb7b9ebded9592b8023
18 changes: 9 additions & 9 deletions br/pkg/lightning/backend/local/iterator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,18 +146,18 @@ func TestDupDetectIterator(t *testing.T) {
// Verify first pair.
require.True(t, iter.First())
require.True(t, iter.Valid())
require.EqualValues(t, pairs[0].Key, iter.Key())
require.EqualValues(t, pairs[0].Val, iter.Value())
require.Equal(t, pairs[0].Key, iter.Key())
require.Equal(t, pairs[0].Val, iter.Value())

// Verify last pair.
require.True(t, iter.Last())
require.True(t, iter.Valid())
require.EqualValues(t, pairs[len(pairs)-1].Key, iter.Key())
require.EqualValues(t, pairs[len(pairs)-1].Val, iter.Value())
require.Equal(t, pairs[len(pairs)-1].Key, iter.Key())
require.Equal(t, pairs[len(pairs)-1].Val, iter.Value())

// Iterate all keys and check the count of unique keys.
for iter.First(); iter.Valid(); iter.Next() {
require.EqualValues(t, uniqueKeys[0], iter.Key())
require.Equal(t, uniqueKeys[0], iter.Key())
uniqueKeys = uniqueKeys[1:]
}
require.NoError(t, iter.Error())
Expand Down Expand Up @@ -190,8 +190,8 @@ func TestDupDetectIterator(t *testing.T) {
return keyCmp < 0 || keyCmp == 0 && bytes.Compare(detectedPairs[i].Val, detectedPairs[j].Val) < 0
})
for i := 0; i < len(detectedPairs); i++ {
require.EqualValues(t, duplicatePairs[i].Key, detectedPairs[i].Key)
require.EqualValues(t, duplicatePairs[i].Val, detectedPairs[i].Val)
require.Equal(t, duplicatePairs[i].Key, detectedPairs[i].Key)
require.Equal(t, duplicatePairs[i].Val, detectedPairs[i].Val)
}
}

Expand Down Expand Up @@ -250,9 +250,9 @@ func TestDupDetectIterSeek(t *testing.T) {
iter := newDupDetectIter(context.Background(), engine, &pebble.IterOptions{})

require.True(t, iter.Seek([]byte{1, 2, 3, 1}))
require.EqualValues(t, pairs[1].Val, iter.Value())
require.Equal(t, pairs[1].Val, iter.Value())
require.True(t, iter.Next())
require.EqualValues(t, pairs[3].Val, iter.Value())
require.Equal(t, pairs[3].Val, iter.Value())
require.NoError(t, iter.Close())
require.NoError(t, engine.Close())
require.NoError(t, duplicateDB.Close())
Expand Down
10 changes: 5 additions & 5 deletions br/pkg/lightning/backend/local/key_adapter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ func TestNoopKeyAdapter(t *testing.T) {
key := randBytes(32)
require.Equal(t, len(key), keyAdapter.EncodedLen(key))
encodedKey := keyAdapter.Encode(nil, key, 0)
require.EqualValues(t, key, encodedKey)
require.Equal(t, key, encodedKey)

decodedKey, err := keyAdapter.Decode(nil, encodedKey)
require.NoError(t, err)
require.EqualValues(t, key, decodedKey)
require.Equal(t, key, decodedKey)
}

func TestDupDetectKeyAdapter(t *testing.T) {
Expand Down Expand Up @@ -78,7 +78,7 @@ func TestDupDetectKeyAdapter(t *testing.T) {
// Decode the result.
key, err := keyAdapter.Decode(nil, result)
require.NoError(t, err)
require.EqualValues(t, input.key, key)
require.Equal(t, input.key, key)
}
}

Expand Down Expand Up @@ -129,7 +129,7 @@ func TestEncodeKeyToPreAllocatedBuf(t *testing.T) {
// Verify the encoded result first.
key2, err := keyAdapter.Decode(nil, buf2[4:])
require.NoError(t, err)
require.EqualValues(t, key, key2)
require.Equal(t, key, key2)
}
}

Expand Down Expand Up @@ -168,7 +168,7 @@ func TestDecodeKeyDstIsInsufficient(t *testing.T) {
buf2, err := keyAdapter.Decode(buf[:4], data)
require.NoError(t, err)
require.False(t, startWithSameMemory(buf, buf2))
require.EqualValues(t, buf[:4], buf2[:4])
require.Equal(t, buf[:4], buf2[:4])
require.Equal(t, key, buf2[4:])
}
}