Merge pull request #433 from RoaringBitmap/clean_major_version_update

lemire · web-flow · commit 7b8e1c3d9d49 · 2024-06-13T12:30:54.000-04:00
more fixes having to do with the major version update
diff --git a/BitSliceIndexing/bsi.go b/BitSliceIndexing/bsi.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 )
 
 const (
diff --git a/BitSliceIndexing/bsi_test.go b/BitSliceIndexing/bsi_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/README.md b/README.md
@@ -188,7 +188,7 @@ package main
 
 import (
     "fmt"
-    "github.com/RoaringBitmap/roaring"
+    "github.com/RoaringBitmap/roaring/v2"
     "bytes"
 )
 
@@ -285,7 +285,7 @@ package main
 
 import (
     "fmt"
-    "github.com/RoaringBitmap/roaring/roaring64"
+    "github.com/RoaringBitmap/roaring/v2/roaring64"
     "bytes"
 )
 
diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/RoaringBitmap/roaring/v2
 go 1.14
 
 require (
-	github.com/RoaringBitmap/roaring v1.9.4
 	github.com/bits-and-blooms/bitset v1.12.0
 	github.com/mschoch/smat v0.2.0
 	github.com/stretchr/testify v1.7.0
diff --git a/go.sum b/go.sum
@@ -1,5 +1,3 @@
-github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ=
-github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90=
 github.com/bits-and-blooms/bitset v1.12.0 h1:U/q1fAF7xXRhFCrhROzIfffYnu+dlS38vCZtmFVPHmA=
 github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
diff --git a/optimize_test.go b/optimize_test.go
@@ -1,7 +1,7 @@
 package roaring_test
 
 import (
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 	"testing"
 )
 
diff --git a/roaring64/iterables64.go b/roaring64/iterables64.go
@@ -1,7 +1,7 @@
 package roaring64
 
 import (
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 )
 
 // IntIterable64 allows you to iterate over the values in a Bitmap
diff --git a/roaring64/iterables64_test.go b/roaring64/iterables64_test.go
@@ -4,7 +4,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/roaring64/parallel64.go b/roaring64/parallel64.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 )
 
 var defaultWorkerCount = runtime.NumCPU()
diff --git a/roaring64/roaring64.go b/roaring64/roaring64.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 	"github.com/RoaringBitmap/roaring/v2/internal"
 )
 
diff --git a/roaring64/roaring64_test.go b/roaring64/roaring64_test.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 	"github.com/bits-and-blooms/bitset"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/roaring64/roaringarray64.go b/roaring64/roaringarray64.go
@@ -1,7 +1,7 @@
 package roaring64
 
 import (
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 )
 
 type roaringArray64 struct {
diff --git a/roaring64/util.go b/roaring64/util.go
@@ -1,6 +1,6 @@
 package roaring64
 
-import "github.com/RoaringBitmap/roaring"
+import "github.com/RoaringBitmap/roaring/v2"
 
 func highbits(x uint64) uint32 {
 	return uint32(x >> 32)

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"sync"`
`8`	`8`	`"sync/atomic"`
`9`	`9`
`10`		`- "github.com/RoaringBitmap/roaring"`
	`10`	`+ "github.com/RoaringBitmap/roaring/v2"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"testing"`
`9`	`9`	`"time"`
`10`	`10`
`11`		`- "github.com/RoaringBitmap/roaring"`
	`11`	`+ "github.com/RoaringBitmap/roaring/v2"`
`12`	`12`	`"github.com/stretchr/testify/assert"`
`13`	`13`	`"github.com/stretchr/testify/require"`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ package main`
`188`	`188`
`189`	`189`	`import (`
`190`	`190`	`"fmt"`
`191`		`- "github.com/RoaringBitmap/roaring"`
	`191`	`+ "github.com/RoaringBitmap/roaring/v2"`
`192`	`192`	`"bytes"`
`193`	`193`	`)`
`194`	`194`
`@@ -285,7 +285,7 @@ package main`
`285`	`285`
`286`	`286`	`import (`
`287`	`287`	`"fmt"`
`288`		`- "github.com/RoaringBitmap/roaring/roaring64"`
	`288`	`+ "github.com/RoaringBitmap/roaring/v2/roaring64"`
`289`	`289`	`"bytes"`
`290`	`290`	`)`
`291`	`291`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ=`
`2`		`-github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90=`
`3`	`1`	`github.com/bits-and-blooms/bitset v1.12.0 h1:U/q1fAF7xXRhFCrhROzIfffYnu+dlS38vCZtmFVPHmA=`
`4`	`2`	`github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=`
`5`	`3`	`github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package roaring_test`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/RoaringBitmap/roaring"`
	`4`	`+ "github.com/RoaringBitmap/roaring/v2"`
`5`	`5`	`"testing"`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package roaring64`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/RoaringBitmap/roaring"`
	`4`	`+ "github.com/RoaringBitmap/roaring/v2"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`// IntIterable64 allows you to iterate over the values in a Bitmap`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"math"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/RoaringBitmap/roaring"`
	`7`	`+ "github.com/RoaringBitmap/roaring/v2"`
`8`	`8`	`"github.com/stretchr/testify/assert"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"runtime"`
`6`	`6`
`7`		`- "github.com/RoaringBitmap/roaring"`
	`7`	`+ "github.com/RoaringBitmap/roaring/v2"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`var defaultWorkerCount = runtime.NumCPU()`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"io"`
`9`	`9`	`"strconv"`
`10`	`10`
`11`		`- "github.com/RoaringBitmap/roaring"`
	`11`	`+ "github.com/RoaringBitmap/roaring/v2"`
`12`	`12`	`"github.com/RoaringBitmap/roaring/v2/internal"`
`13`	`13`	`)`
`14`	`14`