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

storagnode/storagenodedb: fix database queries

Browse Source 
Change-Id: Ic5036c30aed7f68b9c28d6190650028461503465
This commit is contained in:
Egon Elbre 2023-03-01 15:57:08 +02:00
parent faeea88265
commit 71e42ac2a6
1 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
storagenode/storagenodedb/storageusage.go
View File

@ -57,19 +57,19 @@ func (db *storageUsageDB) GetDaily(ctx context.Context, satelliteID storj.NodeID
query := `SELECT su1.satellite_id, query := `SELECT su1.satellite_id,
su1.at_rest_total, su1.at_rest_total,
COALESCE( COALESCE(
( (
CAST(strftime('%s', su1.interval_end_time) AS NUMERIC) CAST(strftime('%s', su1.interval_end_time) AS NUMERIC)
- -
CAST(strftime('%s', ( CAST(strftime('%s', (
SELECT interval_end_time SELECT interval_end_time
FROM storage_usage FROM storage_usage
WHERE satellite_id = su1.satellite_id WHERE satellite_id = su1.satellite_id
AND timestamp < su1.timestamp AND timestamp < su1.timestamp
ORDER BY timestamp DESC ORDER BY timestamp DESC
LIMIT 1 LIMIT 1
)) AS NUMERIC) )) AS NUMERIC)
) / 3600, ) / 3600,
24 24
) AS hour_interval, ) AS hour_interval,
su1.timestamp su1.timestamp
FROM storage_usage su1 FROM storage_usage su1
@ -123,19 +123,19 @@ func (db *storageUsageDB) GetDailyTotal(ctx context.Context, from, to time.Time)
SELECT SELECT
su1.at_rest_total, su1.at_rest_total,
su1.at_rest_total / COALESCE( su1.at_rest_total / COALESCE(
( (
CAST(strftime('%s', su1.interval_end_time) AS NUMERIC) CAST(strftime('%s', su1.interval_end_time) AS NUMERIC)
- -
CAST(strftime('%s', ( CAST(strftime('%s', (
SELECT interval_end_time SELECT interval_end_time
FROM storage_usage su2 FROM storage_usage su2
WHERE su2.satellite_id = su1.satellite_id WHERE su2.satellite_id = su1.satellite_id
AND su2.timestamp < su1.timestamp AND su2.timestamp < su1.timestamp
ORDER BY su2.timestamp DESC ORDER BY su2.timestamp DESC
LIMIT 1 LIMIT 1
)) AS NUMERIC) )) AS NUMERIC)
) / 3600, ) / 3600,
24 24
) AS at_rest_total_bytes, ) AS at_rest_total_bytes,
su1.timestamp su1.timestamp
FROM storage_usage su1 FROM storage_usage su1
@ -180,23 +180,23 @@ func (db *storageUsageDB) Summary(ctx context.Context, from, to time.Time) (_, _
query := `SELECT SUM(at_rest_total), AVG(at_rest_total_bytes) query := `SELECT SUM(at_rest_total), AVG(at_rest_total_bytes)
FROM ( FROM (
SELECT SELECT
SUM(su1.at_rest_total) AS at_rest_total, SUM(su1.at_rest_total) AS at_rest_total,
SUM( SUM(
su1.at_rest_total / ( su1.at_rest_total / (
COALESCE( COALESCE(
( (
CAST(strftime('%s', su1.interval_end_time) AS NUMERIC) CAST(strftime('%s', su1.interval_end_time) AS NUMERIC)
- -
CAST(strftime('%s', ( CAST(strftime('%s', (
SELECT interval_end_time SELECT interval_end_time
FROM storage_usage su2 FROM storage_usage su2
WHERE su2.satellite_id = su1.satellite_id WHERE su2.satellite_id = su1.satellite_id
AND su2.timestamp < su1.timestamp AND su2.timestamp < su1.timestamp
ORDER BY su2.timestamp DESC ORDER BY su2.timestamp DESC
LIMIT 1 LIMIT 1
)) AS NUMERIC) )) AS NUMERIC)
) / 3600, ) / 3600,
24 24
) )
) )
) AS at_rest_total_bytes, ) AS at_rest_total_bytes,
@ -222,19 +222,19 @@ func (db *storageUsageDB) SatelliteSummary(ctx context.Context, satelliteID stor
( (
su1.at_rest_total / ( su1.at_rest_total / (
COALESCE( COALESCE(
( (
CAST(strftime('%s', su1.interval_end_time) AS NUMERIC) CAST(strftime('%s', su1.interval_end_time) AS NUMERIC)
- -
CAST(strftime('%s', ( CAST(strftime('%s', (
SELECT interval_end_time SELECT interval_end_time
FROM storage_usage su2 FROM storage_usage su2
WHERE su2.satellite_id = su1.satellite_id WHERE su2.satellite_id = su1.satellite_id
AND su2.timestamp < su1.timestamp AND su2.timestamp < su1.timestamp
ORDER BY su2.timestamp DESC ORDER BY su2.timestamp DESC
LIMIT 1 LIMIT 1
)) AS NUMERIC) )) AS NUMERIC)
) / 3600, ) / 3600,
24 24
) )
) )
) AS at_rest_total_bytes ) AS at_rest_total_bytes