func BlockSetFromSlice(digests []int) (bs BlockSet) {
bs = make(BlockSet)
for _, digest := range digests {
- bs.Insert(blockdigest.MakeTestBlockDigest(digest))
+ bs.Insert(blockdigest.MakeTestDigestWithSize(digest))
}
return
}
return
}
+// Helper method to meet interface expected by older tests.
+func SummarizeReplication(readCollections collection.ReadCollections,
+ keepServerInfo keep.ReadServers) (rs ReplicationSummary) {
+ return BucketReplication(readCollections, keepServerInfo).
+ SummarizeBuckets(readCollections)
+}
+
// Takes a map from block digest to replication level and represents
// it in a keep.ReadServers structure.
func SpecifyReplication(digestToReplication map[int]int) (rs keep.ReadServers) {
- rs.BlockToServers = make(map[blockdigest.BlockDigest][]keep.BlockServerInfo)
+ rs.BlockToServers = make(map[blockdigest.DigestWithSize][]keep.BlockServerInfo)
for digest, replication := range digestToReplication {
- rs.BlockToServers[blockdigest.MakeTestBlockDigest(digest)] =
+ rs.BlockToServers[blockdigest.MakeTestDigestWithSize(digest)] =
make([]keep.BlockServerInfo, replication)
}
return
expected := CollectionIndexSetFromSlice(expectedCollections)
rc := collection.ReadCollections{
- BlockToCollectionIndices: map[blockdigest.BlockDigest][]int{},
+ BlockToCollectionIndices: map[blockdigest.DigestWithSize][]int{},
}
for digest, indices := range blockToCollectionIndices {
- rc.BlockToCollectionIndices[blockdigest.MakeTestBlockDigest(digest)] = indices
+ rc.BlockToCollectionIndices[blockdigest.MakeTestDigestWithSize(digest)] = indices
}
returned := make(CollectionIndexSet)
rc := collection.MakeTestReadCollections([]collection.TestCollectionSpec{
collection.TestCollectionSpec{ReplicationLevel: 1, Blocks: []int{1, 2}},
})
- rc.Summarize()
+ rc.Summarize(nil)
cIndex := rc.CollectionIndicesForTesting()
keepInfo := SpecifyReplication(map[int]int{1: 1, 2: 1})
rc := collection.MakeTestReadCollections([]collection.TestCollectionSpec{
collection.TestCollectionSpec{ReplicationLevel: 1, Blocks: []int{1, 2}},
})
- rc.Summarize()
+ rc.Summarize(nil)
cIndex := rc.CollectionIndicesForTesting()
keepInfo := SpecifyReplication(map[int]int{1: 1})
rc := collection.MakeTestReadCollections([]collection.TestCollectionSpec{
collection.TestCollectionSpec{ReplicationLevel: 2, Blocks: []int{1, 2}},
})
- rc.Summarize()
+ rc.Summarize(nil)
cIndex := rc.CollectionIndicesForTesting()
keepInfo := SpecifyReplication(map[int]int{1: 1, 2: 3})
collection.TestCollectionSpec{ReplicationLevel: 1, Blocks: []int{3, 4}},
collection.TestCollectionSpec{ReplicationLevel: 2, Blocks: []int{5, 6}},
})
- rc.Summarize()
+ rc.Summarize(nil)
cIndex := rc.CollectionIndicesForTesting()
keepInfo := SpecifyReplication(map[int]int{1: 1, 2: 1, 3: 1, 5: 1, 6: 3, 7: 2})
returnedSummary := SummarizeReplication(rc, keepInfo)
if !reflect.DeepEqual(returnedSummary, expectedSummary) {
- t.Fatalf("Expected returnedSummary to look like: \n%+v but instead it is: \n%+v. Index to UUID is %v. BlockToCollectionIndices is %v.", expectedSummary, returnedSummary, rc.CollectionIndexToUuid, rc.BlockToCollectionIndices)
+ t.Fatalf("Expected returnedSummary to look like: \n%+v but instead it is: \n%+v. Index to UUID is %v. BlockToCollectionIndices is %v.", expectedSummary, returnedSummary, rc.CollectionIndexToUUID, rc.BlockToCollectionIndices)
}
}