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

satellitedb/accounting: fixed query (#3672)

Browse Source
This commit is contained in:
Yehor Butko 2019-11-29 17:53:57 +02:00 committed by GitHub
parent d9a23b8727
commit ae05fa0874
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
satellite/satellitedb/projectaccounting.go
View File

@ -252,11 +252,9 @@ func (db *ProjectAccounting) GetProjectTotal(ctx context.Context, projectID uuid
bucketsTallies := make(map[string][]*accounting.BucketStorageTally) bucketsTallies := make(map[string][]*accounting.BucketStorageTally)
var storageTalliesRows *sql.Rows = nil
for _, bucket := range bucketNames { for _, bucket := range bucketNames {
storageTallies := make([]*accounting.BucketStorageTally, 0) storageTallies := make([]*accounting.BucketStorageTally, 0)
storageTalliesRows, err = db.db.QueryContext(ctx, storageQuery, projectID[:], []byte(bucket), since, before) storageTalliesRows, err := db.db.QueryContext(ctx, storageQuery, projectID[:], []byte(bucket), since, before)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -273,11 +271,14 @@ func (db *ProjectAccounting) GetProjectTotal(ctx context.Context, projectID uuid
storageTallies = append(storageTallies, &tally) storageTallies = append(storageTallies, &tally)
} }
err = storageTalliesRows.Close()
if err != nil {
return nil, err
}
bucketsTallies[bucket] = storageTallies bucketsTallies[bucket] = storageTallies
} }
defer func() { err = errs.Combine(err, storageTalliesRows.Close()) }()
totalEgress, err := db.getTotalEgress(ctx, projectID, since, before) totalEgress, err := db.getTotalEgress(ctx, projectID, since, before)
if err != nil { if err != nil {
return nil, err return nil, err
@ -310,7 +311,7 @@ func (db *ProjectAccounting) GetProjectTotal(ctx context.Context, projectID uuid
func (db *ProjectAccounting) getTotalEgress(ctx context.Context, projectID uuid.UUID, since, before time.Time) (totalEgress int64, err error) { func (db *ProjectAccounting) getTotalEgress(ctx context.Context, projectID uuid.UUID, since, before time.Time) (totalEgress int64, err error) {
totalEgressQuery := db.db.Rebind(fmt.Sprintf(` totalEgressQuery := db.db.Rebind(fmt.Sprintf(`
SELECT SELECT
SUM(settled) + SUM(inline) COALESCE(SUM(settled) + SUM(inline), 0)
FROM FROM
bucket_bandwidth_rollups bucket_bandwidth_rollups
WHERE WHERE