refactor: impl piece state with bitmap

This commit is contained in:
liwei committed 2020-03-11 12:24:45 +08:00
1 parent b823dfbb36
commit 1d2f38d7ae
5 files changed
+79 -146

No files matched your search

+19 -68
View File
@@ -1,6 +1,7 @@
package message
import (
"github.com/RoaringBitmap/roaring"
"reflect"
"testing"
)
@@ -8,7 +9,7 @@ import (
func TestBitfield_IsComplete(t *testing.T) {
type fields struct {
Message Message
payload []byte
payload *roaring.Bitmap
}
type args struct {
i int
@@ -19,20 +20,10 @@ func TestBitfield_IsComplete(t *testing.T) {
args args
want bool
}{
{
"case-0",
fields{
payload: []byte{0b10000000},
},
args{
0,
},
true,
},
{
"case-1",
fields{
payload: []byte{0b01000000},
payload: roaring.BitmapOf(1, 2, 3, 4),
},
args{
1,
@@ -42,40 +33,10 @@ func TestBitfield_IsComplete(t *testing.T) {
{
"case-2",
fields{
payload: []byte{0b00000000, 0b00100000},
payload: roaring.BitmapOf(1, 2, 3, 4),
},
args{
2,
},
false,
},
{
"case-10",
fields{
payload: []byte{0b00000000, 0b00100000},
},
args{
10,
},
true,
},
{
"case-11",
fields{
payload: []byte{0b00000000, 0b00100000},
},
args{
11,
},
false,
},
{
"case-20",
fields{
payload: []byte{0b00000000, 0b00100000},
},
args{
20,
5,
},
false,
},
@@ -96,56 +57,46 @@ func TestBitfield_IsComplete(t *testing.T) {
func TestBitfield_Have(t *testing.T) {
type fields struct {
Message Message
payload []byte
payload *roaring.Bitmap
}
type args struct {
pieces []bool
had *roaring.Bitmap
}
tests := []struct {
name string
fields fields
args args
want []int
want []uint32
}{
{
"case-1",
fields{
payload: []byte{0b11111111, 0b00000000},
payload: roaring.BitmapOf(0, 1, 2, 3, 4),
},
args{
[]bool{false, false, false, false, false, false, false, false},
roaring.BitmapOf(0),
},
[]int{0, 1, 2, 3, 4, 5, 6, 7},
[]uint32{1, 2, 3, 4},
},
{
"case-2",
fields{
payload: []byte{0b01010101, 0b01000000},
payload: roaring.BitmapOf(0, 1, 2, 3, 4, 5, 6, 7, 8),
},
args{
[]bool{false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},
roaring.BitmapOf(0, 1, 3, 5, 6, 8),
},
[]int{1, 3, 5, 7, 9},
[]uint32{2, 4, 7},
},
{
"case-3",
fields{
payload: []byte{0b11010101, 0b01000000},
payload: roaring.BitmapOf(),
},
args{
[]bool{false, true, false},
roaring.BitmapOf(0, 1, 2, 3, 4, 5, 6, 7, 8, 9),
},
[]int{0},
},
{
"case-4",
fields{
payload: []byte{0b11010101},
},
args{
[]bool{false, true, false, false, true, false, false, true, false},
},
[]int{0, 3, 5},
[]uint32{},
},
}
for _, tt := range tests {
@@ -154,8 +105,8 @@ func TestBitfield_Have(t *testing.T) {
Message: &tt.fields.Message,
payload: tt.fields.payload,
}
if got := b.Have(tt.args.pieces); !reflect.DeepEqual(got, tt.want) {
t.Errorf("Bitfield.Have() = %v, want %v", got, tt.want)
if got := b.Provide(tt.args.had); !reflect.DeepEqual(got, tt.want) {
t.Errorf("Bitfield.Provide() = %v, want %v", got, tt.want)
}
})
}