Commit 2ade0881 by Alexander Zobnin

minor refactor of dashboard version cleanup

parent 3f85fcce
package sqlstore package sqlstore
import ( import (
"fmt"
"strings" "strings"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
...@@ -81,18 +80,17 @@ func DeleteExpiredVersions(cmd *m.DeleteExpiredVersionsCommand) error { ...@@ -81,18 +80,17 @@ 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.
versionIdsToDeleteSubqueryTemplate := `SELECT id versionIdsToDeleteSubquery := `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
GROUP BY dashboard_id GROUP BY dashboard_id
) AS vtd ) AS vtd
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 - ?`
versionIdsToDeleteSubquery := fmt.Sprintf(versionIdsToDeleteSubqueryTemplate, versionsToKeep)
var versionIdsToDelete []interface{} var versionIdsToDelete []interface{}
err := sess.SQL(versionIdsToDeleteSubquery).Find(&versionIdsToDelete) err := sess.SQL(versionIdsToDeleteSubquery, versionsToKeep).Find(&versionIdsToDelete)
if err != nil { if err != nil {
return err return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment