public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: dashboard version cleanup

Browse Source
This commit is contained in:
Alexander Zobnin
2018-03-21 21:01:15 +03:00
parent f976b690ca
commit 3f85fcce2d
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/dashboard_version.go
+14 -12
View File
@@ -81,7 +81,7 @@ func DeleteExpiredVersions(cmd *m.DeleteExpiredVersionsCommand) error {
// min_version_to_keep = min_version + (versions_count - versions_to_keep) // min_version_to_keep = min_version + (versions_count - versions_to_keep)
// where version stats is processed for each dashboard. This guarantees that we keep at least versions_to_keep // where version stats is processed for each dashboard. This guarantees that we keep at least versions_to_keep
// versions, but in some cases (when versions are sparse) this number may be more. // versions, but in some cases (when versions are sparse) this number may be more.
versionIdsToDeleteSybqueryTemplate := `SELECT id versionIdsToDeleteSubqueryTemplate := `SELECT id
FROM dashboard_version, ( FROM dashboard_version, (
SELECT dashboard_id, count(version) as count, min(version) as min SELECT dashboard_id, count(version) as count, min(version) as min
FROM dashboard_version FROM dashboard_version
@@ -90,26 +90,28 @@ func DeleteExpiredVersions(cmd *m.DeleteExpiredVersionsCommand) error {
WHERE dashboard_version.dashboard_id=vtd.dashboard_id WHERE dashboard_version.dashboard_id=vtd.dashboard_id
AND version < vtd.min + vtd.count - %v` AND version < vtd.min + vtd.count - %v`
versionIdsToDeleteSubquery := fmt.Sprintf(versionIdsToDeleteSybqueryTemplate, versionsToKeep) versionIdsToDeleteSubquery := fmt.Sprintf(versionIdsToDeleteSubqueryTemplate, versionsToKeep)
versions := []string{} var versionIdsToDelete []interface{}
err := sess.SQL(versionIdsToDeleteSubquery).Find(&versions) err := sess.SQL(versionIdsToDeleteSubquery).Find(&versionIdsToDelete)
if err != nil { if err != nil {
return err return err
} }
// Don't delete more than MAX_VERSIONS_TO_DELETE version per time // Don't delete more than MAX_VERSIONS_TO_DELETE version per time
limit := MAX_VERSIONS_TO_DELETE limit := MAX_VERSIONS_TO_DELETE
if len(versions) < MAX_VERSIONS_TO_DELETE { if len(versionIdsToDelete) < MAX_VERSIONS_TO_DELETE {
limit = len(versions) limit = len(versionIdsToDelete)
} }
versions = versions[:limit] versionIdsToDelete = versionIdsToDelete[:limit]
deleteExpiredSql := fmt.Sprintf(`DELETE FROM dashboard_version WHERE id IN (%s)`, strings.Join(versions, `,`)) if len(versionIdsToDelete) > 0 {
expiredResponse, err := sess.Exec(deleteExpiredSql) deleteExpiredSql := `DELETE FROM dashboard_version WHERE id IN (?` + strings.Repeat(",?", len(versionIdsToDelete)-1) + `)`
if err != nil { expiredResponse, err := sess.Exec(deleteExpiredSql, versionIdsToDelete...)
return err if err != nil {
return err
}
cmd.DeletedRows, _ = expiredResponse.RowsAffected()
} }
cmd.DeletedRows, _ = expiredResponse.RowsAffected()
return nil return nil
}) })