Parcourir la source

minor refactor of dashboard version cleanup

Alexander Zobnin il y a 7 ans
Parent
commit
2ade0881b1
1 fichiers modifiés avec 3 ajouts et 5 suppressions
  1. 3 5
      pkg/services/sqlstore/dashboard_version.go

+ 3 - 5
pkg/services/sqlstore/dashboard_version.go

@@ -1,7 +1,6 @@
 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 {
 		// 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
 		}
 		}