JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/accounting/tally: simplify code

Browse Source 
Change-Id: I50bdecad5d85e07fdc0dfbd11bb03f8f6bbba56e
This commit is contained in:
Egon Elbre 2023-11-27 17:01:47 +02:00
parent 89dad05c65
commit 4620d6d4cc
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
satellite/accounting/tally/tally.go
View File

@ -335,10 +335,7 @@ func (observer *BucketTallyCollector) fillBucketTallies(ctx context.Context, sta
}
for _, tally := range tallies {
bucket := observer.ensureBucket(metabase.ObjectLocation{
ProjectID: tally.ProjectID,
BucketName: tally.BucketName,
})
bucket := observer.ensureBucket(tally.BucketLocation)
bucket.TotalSegments = tally.TotalSegments
bucket.TotalBytes = tally.TotalBytes
bucket.MetadataSize = tally.MetadataSize
@ -361,13 +358,12 @@ func (observer *BucketTallyCollector) fillBucketTallies(ctx context.Context, sta
}
// ensureBucket returns bucket corresponding to the passed in path.
func (observer *BucketTallyCollector) ensureBucket(location metabase.ObjectLocation) *accounting.BucketTally {
bucketLocation := location.Bucket()
bucket, exists := observer.Bucket[bucketLocation]
func (observer *BucketTallyCollector) ensureBucket(location metabase.BucketLocation) *accounting.BucketTally {
bucket, exists := observer.Bucket[location]
if !exists {
bucket = &accounting.BucketTally{}
bucket.BucketLocation = bucketLocation
observer.Bucket[bucketLocation] = bucket
bucket.BucketLocation = location
observer.Bucket[location] = bucket
}
return bucket