From e63908c391003d050c9df4a213cc5bdf388b758a Mon Sep 17 00:00:00 2001 From: Anis Elleuch Date: Thu, 27 May 2021 16:02:39 +0100 Subject: [PATCH] Update bloom module (#12383) To fix dependency import issues when importing madmin-go v0.7.1 --- CREDITS | 8 ++++---- cmd/data-scanner.go | 2 +- cmd/data-update-tracker.go | 2 +- cmd/notification.go | 2 +- go.mod | 2 +- go.sum | 6 ++++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CREDITS b/CREDITS index fbf5e9a90..522d956ec 100644 --- a/CREDITS +++ b/CREDITS @@ -16159,8 +16159,8 @@ SOFTWARE. ================================================================ -github.com/willf/bitset -https://github.com/willf/bitset +github.com/bits-and-blooms/bitset +https://github.com/bits-and-blooms/bitset ---------------------------------------------------------------- Copyright (c) 2014 Will Fitzgerald. All rights reserved. @@ -16192,8 +16192,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================ -github.com/willf/bloom -https://github.com/willf/bloom +github.com/bits-and-blooms/bloom +https://github.com/bits-and-blooms/bloom ---------------------------------------------------------------- Copyright (c) 2014 Will Fitzgerald. All rights reserved. diff --git a/cmd/data-scanner.go b/cmd/data-scanner.go index 932223612..b70342e50 100644 --- a/cmd/data-scanner.go +++ b/cmd/data-scanner.go @@ -31,6 +31,7 @@ import ( "sync" "time" + "github.com/bits-and-blooms/bloom/v3" "github.com/minio/madmin-go" "github.com/minio/minio/cmd/config/heal" "github.com/minio/minio/cmd/logger" @@ -41,7 +42,6 @@ import ( "github.com/minio/minio/pkg/console" "github.com/minio/minio/pkg/event" "github.com/minio/minio/pkg/hash" - "github.com/willf/bloom" ) const ( diff --git a/cmd/data-update-tracker.go b/cmd/data-update-tracker.go index 058ca39e8..add8d9c97 100644 --- a/cmd/data-update-tracker.go +++ b/cmd/data-update-tracker.go @@ -32,10 +32,10 @@ import ( "sync" "time" + "github.com/bits-and-blooms/bloom/v3" "github.com/minio/minio/cmd/logger" "github.com/minio/minio/pkg/color" "github.com/minio/minio/pkg/console" - "github.com/willf/bloom" ) const ( diff --git a/cmd/notification.go b/cmd/notification.go index 4b47ad14d..9f371201b 100644 --- a/cmd/notification.go +++ b/cmd/notification.go @@ -31,6 +31,7 @@ import ( "sync" "time" + "github.com/bits-and-blooms/bloom/v3" "github.com/cespare/xxhash/v2" "github.com/klauspost/compress/zip" "github.com/minio/madmin-go" @@ -43,7 +44,6 @@ import ( "github.com/minio/minio/pkg/event" xnet "github.com/minio/minio/pkg/net" "github.com/minio/minio/pkg/sync/errgroup" - "github.com/willf/bloom" ) // NotificationSys - notification system. diff --git a/go.mod b/go.mod index 55768eaee..b53c29c46 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/alecthomas/participle v0.2.1 github.com/bcicen/jstream v1.0.1 github.com/beevik/ntp v0.3.0 + github.com/bits-and-blooms/bloom/v3 v3.0.1 github.com/cespare/xxhash/v2 v2.1.1 github.com/cheggaaa/pb v1.0.29 github.com/colinmarc/hdfs/v2 v2.2.0 @@ -80,7 +81,6 @@ require ( github.com/tinylib/msgp v1.1.6-0.20210521143832-0becd170c402 github.com/valyala/bytebufferpool v1.0.0 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a - github.com/willf/bloom v2.0.3+incompatible github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c go.etcd.io/etcd v0.0.0-20201125193152-8a03d2e9614b go.uber.org/zap v1.14.1 diff --git a/go.sum b/go.sum index 1c8fd6257..b468e96e3 100644 --- a/go.sum +++ b/go.sum @@ -105,6 +105,10 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +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/bits-and-blooms/bloom/v3 v3.0.1 h1:Inlf0YXbgehxVjMPmCGv86iMCKMGPPrPSHtBF5yRHwA= +github.com/bits-and-blooms/bloom/v3 v3.0.1/go.mod h1:MC8muvBzzPOFsrcdND/A7kU7kMhkqb9KI70JlZCP+C8= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= @@ -702,9 +706,7 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a h1:0R4NLDRDZX6JcmhJgXi5E4b8Wg84ihbmUKp/GvSPEzc= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= -github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= -github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX8Wdm2/JPA= github.com/willf/bloom v2.0.3+incompatible/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=