Merge pull request #447 from RoaringBitmap/fix_returned_value_roaring…

…64_from_unsafe_bytes

Fix returned value roaring64 from unsafe bytes

roaring64/roaring64.go

@@ -87,11 +87,10 @@ func (rb *Bitmap) WriteTo(stream io.Writer) (int64, error) {
 func (rb *Bitmap) FromUnsafeBytes(data []byte) (p int64, err error) {
 	stream := internal.NewByteBuffer(data)
 	sizeBuf := make([]byte, 8)
-	n, err := stream.Read(sizeBuf)
+	_, err = stream.Read(sizeBuf)
 	if err != nil {
 		return 0, err
 	}
-	p += int64(n)
 	size := binary.LittleEndian.Uint64(sizeBuf)
 
 	rb.highlowcontainer.resize(0)
@@ -115,17 +114,16 @@ func (rb *Bitmap) FromUnsafeBytes(data []byte) (p int64, err error) {
 		if err != nil {
 			return 0, fmt.Errorf("error in bitmap.UnsafeFromBytes: could not read key #%d: %w", i, err)
 		}
-		p += 4
 		rb.highlowcontainer.keys[i] = binary.LittleEndian.Uint32(keyBuf)
 		rb.highlowcontainer.containers[i] = roaring.NewBitmap()
 		n, err := rb.highlowcontainer.containers[i].ReadFrom(stream)
+
 		if n == 0 || err != nil {
 			return int64(n), fmt.Errorf("Could not deserialize bitmap for key #%d: %s", i, err)
 		}
-		p += int64(n)
 	}
 
-	return p, nil
+	return stream.GetReadBytes(), nil
 }
 
 // ReadFrom reads a serialized version of this bitmap from stream.
@@ -167,12 +165,12 @@ func (rb *Bitmap) ReadFrom(stream io.Reader) (p int64, err error) {
 		rb.highlowcontainer.keys[i] = binary.LittleEndian.Uint32(keyBuf)
 		rb.highlowcontainer.containers[i] = roaring.NewBitmap()
 		n, err := rb.highlowcontainer.containers[i].ReadFrom(stream)
+
 		if n == 0 || err != nil {
 			return int64(n), fmt.Errorf("Could not deserialize bitmap for key #%d: %s", i, err)
 		}
 		p += int64(n)
 	}
-
 	return p, nil
 }
 

roaring64/roaring64cow_test.go

@@ -1481,7 +1481,6 @@ func TestBigRandomCOW(t *testing.T) {
 }
 
 func rTestCOW(t *testing.T, N int) {
-	log.Println("rtest N=", N)
 	for gap := 1; gap <= 65536; gap *= 2 {
 		bs1 := bitset.New(0)
 		rb1 := NewBitmap()

roaring64/serialization_test.go

@@ -17,6 +17,18 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func fromUnsafeBytesChecked(t *testing.T, unsafeBm *Bitmap, b []byte) {
+	var r bytes.Reader
+	r.Reset(b)
+	safeBm := NewBitmap()
+	safeCount, err := safeBm.ReadFrom(&r)
+	unsafeCount, err := unsafeBm.FromUnsafeBytes(b)
+	require.NoError(t, err)
+	require.NoError(t, err)
+	assert.True(t, safeBm.Equals(unsafeBm))
+	assert.EqualValues(t, safeCount, unsafeCount)
+}
+
 func TestSerializationOfEmptyBitmap(t *testing.T) {
 	rb := NewBitmap()
 
@@ -34,8 +46,7 @@ func TestSerializationOfEmptyBitmap(t *testing.T) {
 	assert.True(t, rb.Equals(newrb))
 
 	newrb2 := NewBitmap()
-	_, err = newrb2.FromUnsafeBytes(data)
-	require.NoError(t, err)
+	fromUnsafeBytesChecked(t, newrb2, data)
 	assert.True(t, rb.Equals(newrb2))
 }
 
@@ -70,8 +81,7 @@ func TestSerializationBasic037(t *testing.T) {
 	assert.True(t, rb.Equals(newrb))
 
 	newrb2 := NewBitmap()
-	_, err = newrb2.FromUnsafeBytes(data)
-	require.NoError(t, err)
+	fromUnsafeBytesChecked(t, newrb2, data)
 	assert.True(t, rb.Equals(newrb2))
 }
 
@@ -113,8 +123,7 @@ func TestSerializationToFile038(t *testing.T) {
 	assert.True(t, rb.Equals(newrb))
 
 	newrb2 := NewBitmap()
-	_, err = newrb2.FromUnsafeBytes(buf.Bytes())
-	require.NoError(t, err)
+	fromUnsafeBytesChecked(t, newrb2, buf.Bytes())
 	assert.True(t, rb.Equals(newrb2))
 }
 
@@ -136,8 +145,7 @@ func TestSerializationBasic2_041(t *testing.T) {
 	assert.True(t, rb.Equals(newrb))
 
 	newrb2 := NewBitmap()
-	_, err = newrb2.FromUnsafeBytes(data)
-	require.NoError(t, err)
+	fromUnsafeBytesChecked(t, newrb2, data)
 	assert.True(t, rb.Equals(newrb2))
 }
 
@@ -162,8 +170,7 @@ func TestSerializationBasic3_042(t *testing.T) {
 	assert.True(t, newrb.Equals(rb))
 
 	newrb2 := NewBitmap()
-	_, err = newrb2.FromUnsafeBytes(data)
-	require.NoError(t, err)
+	fromUnsafeBytesChecked(t, newrb2, data)
 	assert.True(t, rb.Equals(newrb2))
 }
 

roaring_test.go

@@ -95,8 +95,6 @@ func checkValidity(t *testing.T, rb *Bitmap) {
 }
 
 func hashTest(t *testing.T, N uint64) {
-	t.Log("rtest N=", N)
-
 	hashes := map[uint64]struct{}{}
 	count := 0
 
@@ -1944,7 +1942,6 @@ func TestHash(t *testing.T) {
 }
 
 func rTest(t *testing.T, N int) {
-	t.Log("rtest N=", N)
 	for gap := 1; gap <= 65536; gap *= 2 {
 		bs1 := bitset.New(0)
 		rb1 := NewBitmap()

roaringcow_test.go

@@ -1533,7 +1533,6 @@ func TestBigRandomCOW(t *testing.T) {
 }
 
 func rTestCOW(t *testing.T, N int) {
-	t.Log("rtest N=", N)
 	for gap := 1; gap <= 65536; gap *= 2 {
 		bs1 := bitset.New(0)
 		rb1 := NewBitmap()