provider: batch reprovide

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/gammazero/deque v1.0.0
 	github.com/google/gopacket v1.1.19
 	github.com/google/uuid v1.6.0
+	github.com/guillaumemichel/reservedpool v0.1.0
 	github.com/hashicorp/golang-lru v1.0.2
 	github.com/ipfs/boxo v0.31.0
 	github.com/ipfs/go-cid v0.5.0

go.sum

@@ -136,6 +136,8 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
+github.com/guillaumemichel/reservedpool v0.1.0 h1:QOG3bsExi+Erk2TBzGan87uqA48Ns27uhhnwgCJup+Y=
+github.com/guillaumemichel/reservedpool v0.1.0/go.mod h1:sXSDIaef81TFdAJglsCFCMfgF5E5Z5xK1tFhjDhvbUc=
 github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
 github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

provider/internal/keyspace/trie.go

@@ -318,9 +318,9 @@ type Region struct {
 	Keys   *trie.Trie[bit256.Key, mh.Multihash]
 }
 
-// RegionsFromPeers returns the keyspace regions of size `regionSize` from the
-// given `peers` sorted according to `order` along with the Common Prefix
-// shared by all peers.
+// RegionsFromPeers returns the keyspace regions of size at least `regionSize`
+// from the given `peers` sorted according to `order` along with the Common
+// Prefix shared by all peers.
 func RegionsFromPeers(peers []peer.ID, regionSize int, order bit256.Key) ([]Region, bitstr.Key) {
 	if len(peers) == 0 {
 		return []Region{}, ""
@@ -339,14 +339,14 @@ func RegionsFromPeers(peers []peer.ID, regionSize int, order bit256.Key) ([]Regi
 }
 
 // extractMinimalRegions returns the list of all non-overlapping subtries of
-// `t` having strictly more than `size` elements, sorted according to `order`.
-// Every element is included in exactly one region.
+// `t` having at least `size` elements, sorted according to `order`. Every
+// element is included in exactly one region.
 func extractMinimalRegions(t *trie.Trie[bit256.Key, peer.ID], path bitstr.Key, size int, order bit256.Key) []Region {
 	if t.IsEmptyLeaf() {
 		return nil
 	}
 	branch0, branch1 := t.Branch(0), t.Branch(1)
-	if branch0 != nil && branch1 != nil && branch0.Size() > size && branch1.Size() > size {
+	if branch0 != nil && branch1 != nil && branch0.Size() >= size && branch1.Size() >= size {
 		b := int(order.Bit(len(path)))
 		return append(extractMinimalRegions(t.Branch(b), path+bitstr.Key(byte('0'+b)), size, order),
 			extractMinimalRegions(t.Branch(1-b), path+bitstr.Key(byte('1'-b)), size, order)...)

provider/internal/keyspace/trie_test.go

@@ -580,15 +580,15 @@ func TestRegionsFromPeers(t *testing.T) {
 
 	// Two peers
 	p1 := genRandPeerID(t)
-	regions, commonPrefix = RegionsFromPeers([]peer.ID{p0, p1}, 1, bit256.ZeroKey())
+	regions, commonPrefix = RegionsFromPeers([]peer.ID{p0, p1}, 2, bit256.ZeroKey())
 	require.Len(t, regions, 1)
 	cpl := key.CommonPrefixLength(bstrPid0, PeerIDToBit256(p1))
 	common := bstrPid0[:cpl]
 	require.Equal(t, common, commonPrefix)
 
 	// Three peers
 	p2 := genRandPeerID(t)
-	regions, commonPrefix = RegionsFromPeers([]peer.ID{p0, p1, p2}, 1, bit256.ZeroKey())
+	regions, commonPrefix = RegionsFromPeers([]peer.ID{p0, p1, p2}, 2, bit256.ZeroKey())
 	require.Len(t, regions, 1)
 	cpl = key.CommonPrefixLength(common, PeerIDToBit256(p2))
 	common = common[:cpl]