Merge pull request #510 from DhruvilK7/removal

Remove unnecessary type conversions + added make command to do the same

Author: lemire

.gitignore

@@ -3,3 +3,4 @@ roaring-fuzz.zip
 workdir
 coverage.out
 testdata/all3.classic
+/vendor

BitSliceIndexing/bsi.go

@@ -148,7 +148,7 @@ func (b *BSI) GetValue(columnID uint64) (int64, bool) {
 			value |= (1 << uint64(i))
 		}
 	}
-	return int64(value), exists
+	return value, exists
 }
 
 type action func(t *task, batch []uint32, resultsChan chan *roaring.Bitmap, wg *sync.WaitGroup)
@@ -767,7 +767,7 @@ func batchEqual(e *task, batch []uint32, resultsChan chan *roaring.Bitmap,
 	for i := 0; i < len(batch); i++ {
 		cID := batch[i]
 		if value, ok := e.bsi.GetValue(uint64(cID)); ok {
-			if _, yes := e.values[int64(value)]; yes {
+			if _, yes := e.values[value]; yes {
 				results.Add(cID)
 			}
 		}

Makefile

@@ -0,0 +1,10 @@
+# Display general help about this command
+help:
+	@echo ""
+	@echo "The following commands are available:"
+	@echo "    make unconvert   : Find unnecessary type conversions"
+	@echo ""
+
+# Find unnecessary type conversions
+unconvert:
+	go tool unconvert -apply ./...

arraycontainer.go

@@ -969,7 +969,7 @@ func (ac *arrayContainer) resetTo(a container) {
 		x.fillArray(ac.content)
 
 	case *runContainer16:
-		card := int(x.getCardinality())
+		card := x.getCardinality()
 		ac.realloc(card)
 		cur := 0
 		for _, r := range x.iv {

bitmapcontainer.go

@@ -1133,7 +1133,7 @@ func (bc *bitmapContainer) NextSetBit(i uint) int {
 		return -1
 	}
 	w := bc.bitmap[x]
-	w = w >> uint(i%64)
+	w = w >> (i % 64)
 	if w != 0 {
 		return int(i) + countTrailingZeros(w)
 	}
@@ -1155,7 +1155,7 @@ func (bc *bitmapContainer) NextUnsetBit(i uint) int {
 		return int(i)
 	}
 	w := bc.bitmap[x]
-	w = w >> uint(i%64)
+	w = w >> (i % 64)
 	w = ^w
 	if w != 0 {
 		return int(i) + countTrailingZeros(w)
@@ -1192,7 +1192,7 @@ func (bc *bitmapContainer) uPrevSetBit(i uint) int {
 
 	b := i % 64
 
-	w = w << uint(63-b)
+	w = w << (63 - b)
 	if w != 0 {
 		return int(i) - countLeadingZeros(w)
 	}

bitmapcontainer_test.go

@@ -52,7 +52,7 @@ func TestBitmapContainerNumberOfRuns024(t *testing.T) {
 func TestBitmapcontainerAndCardinality(t *testing.T) {
 	for r := 0; r <= 65535; r++ {
 		c1 := newRunContainer16Range(0, uint16(r))
-		c2 := newBitmapContainerwithRange(0, int(r))
+		c2 := newBitmapContainerwithRange(0, r)
 
 		assert.Equal(t, r+1, c1.andCardinality(c2))
 	}

ctz_test.go

@@ -105,5 +105,5 @@ func numberOfTrailingZeros(i uint64) int {
 		n -= 2
 		x = y
 	}
-	return int(n - int64(uint64(x<<1)>>63))
+	return int(n - int64(x<<1>>63))
 }

fastaggregation_test.go

@@ -199,23 +199,23 @@ func TestFastAggregationsAndAny(t *testing.T) {
 	rb3 := NewBitmap()
 	// only one filter has some values
 	from := uint32(maxCapacity * 4)
-	for i := uint32(from); i < from+100; i += 2 {
+	for i := from; i < from+100; i += 2 {
 		rb1.Add(i)
 	}
 	// only base has values
 	from = maxCapacity * 7
-	for i := uint32(from); i < from+100; i += 2 {
+	for i := from; i < from+100; i += 2 {
 		base.Add(i)
 	}
 	// base and one of filters have same values
 	from = maxCapacity * 8
-	for i := uint32(from); i < from+100; i += 2 {
+	for i := from; i < from+100; i += 2 {
 		base.Add(i)
 		rb1.Add(i)
 	}
 	// small union
 	from = maxCapacity * 10
-	for i := uint32(from); i < from+1000; i += 10 {
+	for i := from; i < from+1000; i += 10 {
 		base.Add(i)
 		base.Add(i + i%3)
 
@@ -229,17 +229,17 @@ func TestFastAggregationsAndAny(t *testing.T) {
 	}
 	// run filters
 	from = maxCapacity * 10
-	for i := uint32(from); i < from+1000; i += 3 {
+	for i := from; i < from+1000; i += 3 {
 		base.Add(i)
 	}
-	for i := uint32(from); i < from+100; i++ {
+	for i := from; i < from+100; i++ {
 		rb1.Add(i)
 		rb2.Add(i + 333)
 		rb3.Add(i + 433)
 	}
 	// large union
 	from = maxCapacity * 16
-	for i := uint32(from); i < from+arrayDefaultMaxSize*10; i += 3 {
+	for i := from; i < from+arrayDefaultMaxSize*10; i += 3 {
 		base.Add(i)
 		base.Add(i + i%2 + 1)
 		rb2.Add(i)
@@ -248,7 +248,7 @@ func TestFastAggregationsAndAny(t *testing.T) {
 
 	// some extra base values
 	from = maxCapacity * 17
-	for i := uint32(from); i < from+1000; i++ {
+	for i := from; i < from+1000; i++ {
 		base.Add(i)
 	}
 

go.mod

@@ -13,6 +13,13 @@ require (
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/mdempsky/unconvert v0.0.0-20250216222326-4a038b3d31f5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/mod v0.23.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/tools v0.30.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+tool github.com/mdempsky/unconvert

go.sum

@@ -2,14 +2,26 @@ github.com/bits-and-blooms/bitset v1.24.2 h1:M7/NzVbsytmtfHbumG+K2bremQPMJuqv1JD
 github.com/bits-and-blooms/bitset v1.24.2/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/mdempsky/unconvert v0.0.0-20250216222326-4a038b3d31f5 h1:KXBP3ozzczYKdX6aHLYRxr0RVkc4Zt2wZk2hZP5yTqc=
+github.com/mdempsky/unconvert v0.0.0-20250216222326-4a038b3d31f5/go.mod h1:mVCHGHs8r8jnrZ2ammcv8ySbhG2+rEPXegFmdNA51GI=
 github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
 github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=