diff --git a/arraycontainer.go b/arraycontainer.go index 92036992..03adaf27 100644 --- a/arraycontainer.go +++ b/arraycontainer.go @@ -355,7 +355,6 @@ func (ac *arrayContainer) ior(a container) container { return ac.iorArray(x) case *bitmapContainer: return a.(*bitmapContainer).orArray(ac) - // return ac.iorBitmap(x) // note: this does not make sense case *runContainer16: if x.isFull() { return x.clone() diff --git a/bitmapcontainer.go b/bitmapcontainer.go index d59578d6..edd168f7 100644 --- a/bitmapcontainer.go +++ b/bitmapcontainer.go @@ -238,11 +238,10 @@ func (bc *bitmapContainer) getManyIterator() manyIterable { } func (bc *bitmapContainer) getSizeInBytes() int { - return len(bc.bitmap) * 8 // + bcBaseBytes + return len(bc.bitmap) * 8 } func (bc *bitmapContainer) serializedSizeInBytes() int { - // return bc.Msgsize()// NOO! This breaks GetSerializedSizeInBytes return len(bc.bitmap) * 8 } @@ -820,7 +819,7 @@ func (bc *bitmapContainer) andBitmap(value2 *bitmapContainer) container { } ac := newArrayContainerSize(newcardinality) fillArrayAND(ac.content, bc.bitmap, value2.bitmap) - ac.content = ac.content[:newcardinality] // not sure why i need this + ac.content = ac.content[:newcardinality] return ac } diff --git a/roaring64/roaring64.go b/roaring64/roaring64.go index 9e7f6b7f..56b9e30e 100644 --- a/roaring64/roaring64.go +++ b/roaring64/roaring64.go @@ -176,14 +176,6 @@ func (rb *Bitmap) ReadFrom(stream io.Reader) (p int64, err error) { return p, nil } -// FromBuffer creates a bitmap from its serialized version stored in buffer -// func (rb *Bitmap) FromBuffer(data []byte) (p int64, err error) { -// -// // TODO: Add buffer interning as in base roaring package. -// buf := bytes.NewBuffer(data) -// return rb.ReadFrom(buf) -// } - // MarshalBinary implements the encoding.BinaryMarshaler interface for the bitmap // (same as ToBytes) func (rb *Bitmap) MarshalBinary() ([]byte, error) { diff --git a/roaringarray.go b/roaringarray.go index 52ccf483..376d89b8 100644 --- a/roaringarray.go +++ b/roaringarray.go @@ -31,7 +31,6 @@ type container interface { iadd(x uint16) bool // inplace, returns true if x was new. iaddReturnMinimized(uint16) container // may change return type to minimize storage. - // addRange(start, final int) container // range is [firstOfRange,lastOfRange) (unused) iaddRange(start, endx int) container // i stands for inplace, range is [firstOfRange,endx) iremove(x uint16) bool // inplace, returns true if x was present. @@ -62,7 +61,6 @@ type container interface { lazyOR(r container) container lazyIOR(r container) container getSizeInBytes() int - // removeRange(start, final int) container // range is [firstOfRange,lastOfRange) (unused) iremoveRange(start, final int) container // i stands for inplace, range is [firstOfRange,lastOfRange) selectInt(x uint16) int // selectInt returns the xth integer in the container serializedSizeInBytes() int