diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2719d437..b0d1c27e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: test: strategy: matrix: - go-version: [1.18.x, 1.19.x, 1.20.x] + go-version: [1.21.x, 1.22.x, 1.23.x] platform: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.platform }} steps: diff --git a/cmd/zap/cmd/dict.go b/cmd/zap/cmd/dict.go index 442323fc..db29de80 100644 --- a/cmd/zap/cmd/dict.go +++ b/cmd/zap/cmd/dict.go @@ -19,7 +19,7 @@ import ( "fmt" "math" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/blevesearch/vellum" zap "github.com/blevesearch/zapx/v13" "github.com/spf13/cobra" diff --git a/cmd/zap/cmd/explore.go b/cmd/zap/cmd/explore.go index 93ada999..9f3b3257 100644 --- a/cmd/zap/cmd/explore.go +++ b/cmd/zap/cmd/explore.go @@ -19,7 +19,7 @@ import ( "fmt" "math" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/blevesearch/vellum" zap "github.com/blevesearch/zapx/v13" "github.com/spf13/cobra" diff --git a/dict.go b/dict.go index 9b7cd1ee..bd54ab03 100644 --- a/dict.go +++ b/dict.go @@ -17,7 +17,7 @@ package zap import ( "fmt" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" index "github.com/blevesearch/bleve_index_api" segment "github.com/blevesearch/scorch_segment_api/v2" "github.com/blevesearch/vellum" diff --git a/go.mod b/go.mod index 85d437cd..59cdef48 100644 --- a/go.mod +++ b/go.mod @@ -1,19 +1,21 @@ module github.com/blevesearch/zapx/v13 -go 1.19 +go 1.21 + +toolchain go1.22.6 require ( - github.com/RoaringBitmap/roaring v1.2.3 - github.com/blevesearch/bleve_index_api v1.0.6 + github.com/RoaringBitmap/roaring/v2 v2.4.4 + github.com/blevesearch/bleve_index_api v1.2.1 github.com/blevesearch/mmap-go v1.0.4 - github.com/blevesearch/scorch_segment_api/v2 v2.1.6 + github.com/blevesearch/scorch_segment_api/v2 v2.3.2 github.com/blevesearch/vellum v1.0.10 github.com/golang/snappy v0.0.1 github.com/spf13/cobra v1.4.0 ) require ( - github.com/bits-and-blooms/bitset v1.2.0 // indirect + github.com/bits-and-blooms/bitset v1.12.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/mschoch/smat v0.2.0 // indirect github.com/spf13/pflag v1.0.5 // indirect diff --git a/go.sum b/go.sum index 0907571f..f9f063a6 100644 --- a/go.sum +++ b/go.sum @@ -1,20 +1,22 @@ -github.com/RoaringBitmap/roaring v1.2.3 h1:yqreLINqIrX22ErkKI0vY47/ivtJr6n+kMhVOVmhWBY= -github.com/RoaringBitmap/roaring v1.2.3/go.mod h1:plvDsJQpxOC5bw8LRteu/MLWHsHez/3y6cubLI4/1yE= -github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA= -github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/blevesearch/bleve_index_api v1.0.6 h1:gyUUxdsrvmW3jVhhYdCVL6h9dCjNT/geNU7PxGn37p8= -github.com/blevesearch/bleve_index_api v1.0.6/go.mod h1:YXMDwaXFFXwncRS8UobWs7nvo0DmusriM1nztTlj1ms= +github.com/RoaringBitmap/roaring/v2 v2.4.4 h1:a4k7LUbtIfERkheZ0Or/k5nNxnsnzmKiue+Ac1rljZA= +github.com/RoaringBitmap/roaring/v2 v2.4.4/go.mod h1:FiJcsfkGje/nZBZgCu0ZxCPOKD/hVXDS2dXi7/eUFE0= +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/blevesearch/bleve_index_api v1.2.1 h1:IuXwLvmyp7I7+e0FOA68gcHHLfzSQ4AqQ8wVab5uxk0= +github.com/blevesearch/bleve_index_api v1.2.1/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0= github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc= github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs= -github.com/blevesearch/scorch_segment_api/v2 v2.1.6 h1:CdekX/Ob6YCYmeHzD72cKpwzBjvkOGegHOqhAkXp6yA= -github.com/blevesearch/scorch_segment_api/v2 v2.1.6/go.mod h1:nQQYlp51XvoSVxcciBjtvuHPIVjlWrN1hX4qwK2cqdc= +github.com/blevesearch/scorch_segment_api/v2 v2.3.2 h1:hvcBElgN+u0aRybfKPCFLjwiOPdT54J9PZVqZjJm170= +github.com/blevesearch/scorch_segment_api/v2 v2.3.2/go.mod h1:eDTO6kPkiiZRT1jH3UDuHXSYos/G+G8VN5xHG+BPLKM= github.com/blevesearch/vellum v1.0.10 h1:HGPJDT2bTva12hrHepVT3rOyIKFFF4t7Gf6yMxyMIPI= github.com/blevesearch/vellum v1.0.10/go.mod h1:ul1oT0FhSMDIExNjIxHqJoGpVrBpKCdgDQNxfqgJt7k= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= @@ -33,5 +35,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbuf golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/merge.go b/merge.go index 6a853a16..e962c6ec 100644 --- a/merge.go +++ b/merge.go @@ -23,7 +23,7 @@ import ( "os" "sort" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" seg "github.com/blevesearch/scorch_segment_api/v2" "github.com/blevesearch/vellum" "github.com/golang/snappy" diff --git a/merge_test.go b/merge_test.go index 3aea005f..3abf58b3 100644 --- a/merge_test.go +++ b/merge_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" index "github.com/blevesearch/bleve_index_api" seg "github.com/blevesearch/scorch_segment_api/v2" ) diff --git a/new.go b/new.go index b4e0d034..47a509a1 100644 --- a/new.go +++ b/new.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" index "github.com/blevesearch/bleve_index_api" segment "github.com/blevesearch/scorch_segment_api/v2" "github.com/blevesearch/vellum" diff --git a/posting.go b/posting.go index 1ba133d6..a07ea75f 100644 --- a/posting.go +++ b/posting.go @@ -20,7 +20,7 @@ import ( "math" "reflect" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" segment "github.com/blevesearch/scorch_segment_api/v2" ) diff --git a/segment.go b/segment.go index 1fbf7848..936b6383 100644 --- a/segment.go +++ b/segment.go @@ -23,7 +23,7 @@ import ( "sync" "unsafe" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" mmap "github.com/blevesearch/mmap-go" segment "github.com/blevesearch/scorch_segment_api/v2" "github.com/blevesearch/vellum" diff --git a/segment_test.go b/segment_test.go index 1feddb4d..15a1869e 100644 --- a/segment_test.go +++ b/segment_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" segment "github.com/blevesearch/scorch_segment_api/v2" ) diff --git a/write.go b/write.go index 77aefdbf..d3786261 100644 --- a/write.go +++ b/write.go @@ -18,7 +18,7 @@ import ( "encoding/binary" "io" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" ) // writes out the length of the roaring bitmap in bytes as varint diff --git a/write_test.go b/write_test.go index 2e72d4b8..f76512b2 100644 --- a/write_test.go +++ b/write_test.go @@ -18,7 +18,7 @@ import ( "math" "testing" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" ) func TestRoaringSizes(t *testing.T) { @@ -40,11 +40,11 @@ func TestRoaringSizes(t *testing.T) { {[]uint32{0, 1}, 20, 20}, {[]uint32{0, 10000000}, 28, 28}, - {[]uint32{0, 1, 2}, 22, 15}, + {[]uint32{0, 1, 2}, 22, 22}, {[]uint32{0, 1, 20000000}, 30, 30}, {[]uint32{0, 1, 2, 3}, 24, 15}, - {[]uint32{0, 1, 2, 30000000}, 32, 21}, + {[]uint32{0, 1, 2, 30000000}, 32, 32}, } for _, test := range tests {