From c30d0a1a58cbf4a2772f8c4ab09d307c68453311 Mon Sep 17 00:00:00 2001 From: Abhi Dangeti Date: Wed, 5 Feb 2025 14:03:42 -0700 Subject: [PATCH] Update to RoaringBitmap/roaring's v2.4.4 (#2135) Requires: * https://github.com/blevesearch/scorch_segment_api/pull/49 * https://github.com/blevesearch/zapx/pull/296 * https://github.com/blevesearch/zapx/pull/297 * https://github.com/blevesearch/zapx/pull/298 * https://github.com/blevesearch/zapx/pull/299 * https://github.com/blevesearch/zapx/pull/300 * https://github.com/blevesearch/zapx/pull/301 --- .github/workflows/tests.yml | 2 +- go.mod | 16 +++++++------- go.sum | 35 ++++++++++++++++-------------- index/scorch/builder.go | 2 +- index/scorch/introducer.go | 2 +- index/scorch/merge.go | 2 +- index/scorch/optimize.go | 2 +- index/scorch/optimize_knn.go | 2 +- index/scorch/persister.go | 2 +- index/scorch/scorch.go | 2 +- index/scorch/segment_plugin.go | 3 +-- index/scorch/snapshot_index.go | 2 +- index/scorch/snapshot_index_doc.go | 2 +- index/scorch/snapshot_index_vr.go | 2 +- index/scorch/snapshot_segment.go | 2 +- index/scorch/unadorned.go | 2 +- 16 files changed, 41 insertions(+), 39 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e0db47ee1..73097eed8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: test: strategy: matrix: - go-version: [1.20.x, 1.21.x, 1.22.x] + go-version: [1.21.x, 1.22.x, 1.23.x] platform: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: diff --git a/go.mod b/go.mod index 49b71da6e..f76e36ef6 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/blevesearch/bleve/v2 go 1.21 require ( - github.com/RoaringBitmap/roaring v1.9.3 + github.com/RoaringBitmap/roaring/v2 v2.4.4 github.com/bits-and-blooms/bitset v1.12.0 github.com/blevesearch/bleve_index_api v1.2.1 github.com/blevesearch/geo v0.1.20 @@ -12,19 +12,19 @@ require ( github.com/blevesearch/go-porterstemmer v1.0.3 github.com/blevesearch/goleveldb v1.0.1 github.com/blevesearch/gtreap v0.1.1 - github.com/blevesearch/scorch_segment_api/v2 v2.3.1 + github.com/blevesearch/scorch_segment_api/v2 v2.3.2 github.com/blevesearch/segment v0.9.1 github.com/blevesearch/snowball v0.6.1 github.com/blevesearch/snowballstem v0.9.0 github.com/blevesearch/stempel v0.2.0 github.com/blevesearch/upsidedown_store_api v1.0.2 github.com/blevesearch/vellum v1.1.0 - github.com/blevesearch/zapx/v11 v11.3.11 - github.com/blevesearch/zapx/v12 v12.3.11 - github.com/blevesearch/zapx/v13 v13.3.11 - github.com/blevesearch/zapx/v14 v14.3.11 - github.com/blevesearch/zapx/v15 v15.3.18 - github.com/blevesearch/zapx/v16 v16.1.11-0.20250107152255-021e66397612 + github.com/blevesearch/zapx/v11 v11.4.0 + github.com/blevesearch/zapx/v12 v12.4.0 + github.com/blevesearch/zapx/v13 v13.4.0 + github.com/blevesearch/zapx/v14 v14.4.0 + github.com/blevesearch/zapx/v15 v15.4.0 + github.com/blevesearch/zapx/v16 v16.2.0 github.com/couchbase/moss v0.2.0 github.com/golang/protobuf v1.3.2 github.com/spf13/cobra v1.7.0 diff --git a/go.sum b/go.sum index 1914f7919..3689b6bac 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/RoaringBitmap/roaring v1.9.3 h1:t4EbC5qQwnisr5PrP9nt0IRhRTb9gMUgQF4t4S2OByM= -github.com/RoaringBitmap/roaring v1.9.3/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90= +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= @@ -19,8 +19,8 @@ github.com/blevesearch/gtreap v0.1.1/go.mod h1:QaQyDRAT51sotthUWAH4Sj08awFSSWzgY github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= 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.3.1 h1:jjexIzwOdBtC9MlUceNErYHepLvoKxTdA5atbeZSRWE= -github.com/blevesearch/scorch_segment_api/v2 v2.3.1/go.mod h1:Np3Y03rsemM5TsyFxQ3wy+tG97EcviLTbp2S5W0tpRY= +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/segment v0.9.1 h1:+dThDy+Lvgj5JMxhmOVlgFfkUtZV2kw49xax4+jTfSU= github.com/blevesearch/segment v0.9.1/go.mod h1:zN21iLm7+GnBHWTao9I+Au/7MBiL8pPFtJBJTsk6kQw= github.com/blevesearch/snowball v0.6.1 h1:cDYjn/NCH+wwt2UdehaLpr2e4BwLIjN4V/TdLsL+B5A= @@ -33,18 +33,18 @@ github.com/blevesearch/upsidedown_store_api v1.0.2 h1:U53Q6YoWEARVLd1OYNc9kvhBMG github.com/blevesearch/upsidedown_store_api v1.0.2/go.mod h1:M01mh3Gpfy56Ps/UXHjEO/knbqyQ1Oamg8If49gRwrQ= github.com/blevesearch/vellum v1.1.0 h1:CinkGyIsgVlYf8Y2LUQHvdelgXr6PYuvoDIajq6yR9w= github.com/blevesearch/vellum v1.1.0/go.mod h1:QgwWryE8ThtNPxtgWJof5ndPfx0/YMBh+W2weHKPw8Y= -github.com/blevesearch/zapx/v11 v11.3.11 h1:r6/wFHFAKWvXJb82f5aO53l6p+gRH6eiX7S1tb3VGc0= -github.com/blevesearch/zapx/v11 v11.3.11/go.mod h1:0+gW+FaE48fNxoVtMY5ugtNHHof/PxCqh7CnhYdnMzQ= -github.com/blevesearch/zapx/v12 v12.3.11 h1:GBBAmXesxXLV5UZ+FZ0qILb7HPssT+kxEkbPPfp5HPM= -github.com/blevesearch/zapx/v12 v12.3.11/go.mod h1:0yeZg6JhaGxITlsS5co73aqPtM04+ycnI6D1v0mhbCs= -github.com/blevesearch/zapx/v13 v13.3.11 h1:H5ZvgS1qM1XKzsAuwp3kvDfh5sJFu9bLH/B8U6Im5e8= -github.com/blevesearch/zapx/v13 v13.3.11/go.mod h1:w2wjSDQ/WBVeEIvP0fvMJZAzDwqwIEzVPnCPrz93yAk= -github.com/blevesearch/zapx/v14 v14.3.11 h1:pg+c/YFzMJ32GkOwLzH/HAQ/GBr6y1Ar7/K5ZQpxTNo= -github.com/blevesearch/zapx/v14 v14.3.11/go.mod h1:qqyuR0u230jN1yMmE4FIAuCxmahRQEOehF78m6oTgns= -github.com/blevesearch/zapx/v15 v15.3.18 h1:yJcQnQyHGNF6rAiwq85OHn3HaXo26t7vgd83RclEw7U= -github.com/blevesearch/zapx/v15 v15.3.18/go.mod h1:vXRQzJJvlGVCdmOD5hg7t7JdjUT5DmDPhsAfjvtzIq8= -github.com/blevesearch/zapx/v16 v16.1.11-0.20250107152255-021e66397612 h1:LhORiqEVyUPUrVETzmmVuT0Yudsz2R3qGLFJWUpMsQo= -github.com/blevesearch/zapx/v16 v16.1.11-0.20250107152255-021e66397612/go.mod h1:+FIylxb+5Z/sFVmNaGpppGLHKBMUEnPSbkKoi+izER8= +github.com/blevesearch/zapx/v11 v11.4.0 h1:NjdO0XyScfGZwRtHvZUKDRzeK+t3G3eMLhizijt8UQs= +github.com/blevesearch/zapx/v11 v11.4.0/go.mod h1:R9T6RMzKLllfVVizBBmT8vxn+tZllExmOhBqO8AaQ8Q= +github.com/blevesearch/zapx/v12 v12.4.0 h1:o/RSGBQ37EsVS0u3aokQACr1F12+ihyYOL+TucDqHWc= +github.com/blevesearch/zapx/v12 v12.4.0/go.mod h1:fhHJ0LhPfYlDqarCiRNKv62hrcX+qIJ9HIsSNEjdzX0= +github.com/blevesearch/zapx/v13 v13.4.0 h1:K4CblDmM1zRsNrTmMDJWLXOF4tXpf/tMzfco0Y7VtX8= +github.com/blevesearch/zapx/v13 v13.4.0/go.mod h1:gZ9iu86laefXlZC+ZQmjfbKq0xQnjf+OKBTAjAqv5ZE= +github.com/blevesearch/zapx/v14 v14.4.0 h1:kinrh1o8PRia2Nu5zCYC/SmY2ZDZ9M8Q6/6bAmkWd/c= +github.com/blevesearch/zapx/v14 v14.4.0/go.mod h1:w7L46G3x5sjyrc33aHxWSQ4YNPo3s6nqXSN+CaauCkM= +github.com/blevesearch/zapx/v15 v15.4.0 h1:HgL5xrJYRT3CKkV53hApidnmVxvJZY5JQ1avL4RkGUI= +github.com/blevesearch/zapx/v15 v15.4.0/go.mod h1:KJ7FcWZ7IYUeQ5uWU8O8dDIoDBiD8Yuz0/aYEWoLkqs= +github.com/blevesearch/zapx/v16 v16.2.0 h1:c+yMDEQwSy9KCOMUm8tlghKLlEGPdGowcZxNb8YXUU0= +github.com/blevesearch/zapx/v16 v16.2.0/go.mod h1:OgSxAaH4G5/IKY+yBYsy+/shSTQ2Am9KIUj3QsljPNA= github.com/couchbase/ghistogram v0.1.0 h1:b95QcQTCzjTUocDXp/uMgSNQi8oj1tGwnJ4bODWZnps= github.com/couchbase/ghistogram v0.1.0/go.mod h1:s1Jhy76zqfEecpNWJfWUiKZookAFaiGOEoyzgHt9i7k= github.com/couchbase/moss v0.2.0 h1:VCYrMzFwEryyhRSeI+/b3tRBSeTpi/8gn5Kf6dxqn+o= @@ -64,6 +64,8 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +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/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -111,5 +113,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/index/scorch/builder.go b/index/scorch/builder.go index 04e5bd1b2..81372f175 100644 --- a/index/scorch/builder.go +++ b/index/scorch/builder.go @@ -19,7 +19,7 @@ import ( "os" "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" bolt "go.etcd.io/bbolt" diff --git a/index/scorch/introducer.go b/index/scorch/introducer.go index 2cb1398ec..7f39f09d3 100644 --- a/index/scorch/introducer.go +++ b/index/scorch/introducer.go @@ -19,7 +19,7 @@ import ( "path/filepath" "sync/atomic" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" index "github.com/blevesearch/bleve_index_api" segment "github.com/blevesearch/scorch_segment_api/v2" ) diff --git a/index/scorch/merge.go b/index/scorch/merge.go index b74504ca1..426183918 100644 --- a/index/scorch/merge.go +++ b/index/scorch/merge.go @@ -22,7 +22,7 @@ import ( "sync/atomic" "time" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/blevesearch/bleve/v2/index/scorch/mergeplan" "github.com/blevesearch/bleve/v2/util" segment "github.com/blevesearch/scorch_segment_api/v2" diff --git a/index/scorch/optimize.go b/index/scorch/optimize.go index 968a744ac..389d582b7 100644 --- a/index/scorch/optimize.go +++ b/index/scorch/optimize.go @@ -18,7 +18,7 @@ import ( "fmt" "sync/atomic" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" index "github.com/blevesearch/bleve_index_api" segment "github.com/blevesearch/scorch_segment_api/v2" ) diff --git a/index/scorch/optimize_knn.go b/index/scorch/optimize_knn.go index ca179574c..a685bb7f8 100644 --- a/index/scorch/optimize_knn.go +++ b/index/scorch/optimize_knn.go @@ -23,7 +23,7 @@ import ( "sync" "sync/atomic" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/blevesearch/bleve/v2/search" index "github.com/blevesearch/bleve_index_api" segment_api "github.com/blevesearch/scorch_segment_api/v2" diff --git a/index/scorch/persister.go b/index/scorch/persister.go index d59f733df..9e1dd7d18 100644 --- a/index/scorch/persister.go +++ b/index/scorch/persister.go @@ -30,7 +30,7 @@ import ( "sync/atomic" "time" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/blevesearch/bleve/v2/util" index "github.com/blevesearch/bleve_index_api" segment "github.com/blevesearch/scorch_segment_api/v2" diff --git a/index/scorch/scorch.go b/index/scorch/scorch.go index 429d1daa9..f8d532e03 100644 --- a/index/scorch/scorch.go +++ b/index/scorch/scorch.go @@ -23,7 +23,7 @@ import ( "sync/atomic" "time" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/blevesearch/bleve/v2/registry" index "github.com/blevesearch/bleve_index_api" segment "github.com/blevesearch/scorch_segment_api/v2" diff --git a/index/scorch/segment_plugin.go b/index/scorch/segment_plugin.go index b3b9ba01f..fe639d097 100644 --- a/index/scorch/segment_plugin.go +++ b/index/scorch/segment_plugin.go @@ -17,9 +17,8 @@ package scorch import ( "fmt" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" index "github.com/blevesearch/bleve_index_api" - "github.com/blevesearch/bleve/v2/geo" segment "github.com/blevesearch/scorch_segment_api/v2" diff --git a/index/scorch/snapshot_index.go b/index/scorch/snapshot_index.go index ece32eee6..ddca76ec3 100644 --- a/index/scorch/snapshot_index.go +++ b/index/scorch/snapshot_index.go @@ -26,7 +26,7 @@ import ( "sync" "sync/atomic" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/blevesearch/bleve/v2/document" index "github.com/blevesearch/bleve_index_api" segment "github.com/blevesearch/scorch_segment_api/v2" diff --git a/index/scorch/snapshot_index_doc.go b/index/scorch/snapshot_index_doc.go index fe174e7e3..0a979bfb5 100644 --- a/index/scorch/snapshot_index_doc.go +++ b/index/scorch/snapshot_index_doc.go @@ -18,7 +18,7 @@ import ( "bytes" "reflect" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/blevesearch/bleve/v2/size" index "github.com/blevesearch/bleve_index_api" ) diff --git a/index/scorch/snapshot_index_vr.go b/index/scorch/snapshot_index_vr.go index 320364bc7..1e071dbf3 100644 --- a/index/scorch/snapshot_index_vr.go +++ b/index/scorch/snapshot_index_vr.go @@ -24,7 +24,7 @@ import ( "fmt" "reflect" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/blevesearch/bleve/v2/size" index "github.com/blevesearch/bleve_index_api" segment_api "github.com/blevesearch/scorch_segment_api/v2" diff --git a/index/scorch/snapshot_segment.go b/index/scorch/snapshot_segment.go index 96e59a31d..ec65bf800 100644 --- a/index/scorch/snapshot_segment.go +++ b/index/scorch/snapshot_segment.go @@ -20,7 +20,7 @@ import ( "sync" "sync/atomic" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/blevesearch/bleve/v2/size" index "github.com/blevesearch/bleve_index_api" segment "github.com/blevesearch/scorch_segment_api/v2" diff --git a/index/scorch/unadorned.go b/index/scorch/unadorned.go index 8221b23e3..411ef2a35 100644 --- a/index/scorch/unadorned.go +++ b/index/scorch/unadorned.go @@ -18,7 +18,7 @@ import ( "math" "reflect" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" segment "github.com/blevesearch/scorch_segment_api/v2" )