IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor: sqlstore inTransaction consolidated to one version, fixes #8376

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-23 10:56:23 +02:00
parent 5e33b5fcfa
commit 359421b5e8
18 changed files with 70 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/services/sqlstore/alert.go
View File

@ -6,7 +6,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )
@ -48,7 +47,7 @@ func GetAllAlertQueryHandler(query *m.GetAllAlertsQuery) error {
return nil return nil
} }
func deleteAlertByIdInternal(alertId int64, reason string, sess *xorm.Session) error { func deleteAlertByIdInternal(alertId int64, reason string, sess *DBSession) error {
sqlog.Debug("Deleting alert", "id", alertId, "reason", reason) sqlog.Debug("Deleting alert", "id", alertId, "reason", reason)
if _, err := sess.Exec("DELETE FROM alert WHERE id = ?", alertId); err != nil { if _, err := sess.Exec("DELETE FROM alert WHERE id = ?", alertId); err != nil {
@ -63,7 +62,7 @@ func deleteAlertByIdInternal(alertId int64, reason string, sess *xorm.Session) e
} }
func DeleteAlertById(cmd *m.DeleteAlertCommand) error { func DeleteAlertById(cmd *m.DeleteAlertCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
return deleteAlertByIdInternal(cmd.AlertId, "DeleteAlertCommand", sess) return deleteAlertByIdInternal(cmd.AlertId, "DeleteAlertCommand", sess)
}) })
} }
@ -123,7 +122,7 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
return nil return nil
} }
func DeleteAlertDefinition(dashboardId int64, sess *xorm.Session) error { func DeleteAlertDefinition(dashboardId int64, sess *DBSession) error {
alerts := make([]*m.Alert, 0) alerts := make([]*m.Alert, 0)
sess.Where("dashboard_id = ?", dashboardId).Find(&alerts) sess.Where("dashboard_id = ?", dashboardId).Find(&alerts)
@ -135,7 +134,7 @@ func DeleteAlertDefinition(dashboardId int64, sess *xorm.Session) error {
} }
func SaveAlerts(cmd *m.SaveAlertsCommand) error { func SaveAlerts(cmd *m.SaveAlertsCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
existingAlerts, err := GetAlertsByDashboardId2(cmd.DashboardId, sess) existingAlerts, err := GetAlertsByDashboardId2(cmd.DashboardId, sess)
if err != nil { if err != nil {
return err return err
@ -153,7 +152,7 @@ func SaveAlerts(cmd *m.SaveAlertsCommand) error {
}) })
} }
func upsertAlerts(existingAlerts []*m.Alert, cmd *m.SaveAlertsCommand, sess *xorm.Session) error { func upsertAlerts(existingAlerts []*m.Alert, cmd *m.SaveAlertsCommand, sess *DBSession) error {
for _, alert := range cmd.Alerts { for _, alert := range cmd.Alerts {
update := false update := false
var alertToUpdate *m.Alert var alertToUpdate *m.Alert
@ -197,7 +196,7 @@ func upsertAlerts(existingAlerts []*m.Alert, cmd *m.SaveAlertsCommand, sess *xor
return nil return nil
} }
func deleteMissingAlerts(alerts []*m.Alert, cmd *m.SaveAlertsCommand, sess *xorm.Session) error { func deleteMissingAlerts(alerts []*m.Alert, cmd *m.SaveAlertsCommand, sess *DBSession) error {
for _, missingAlert := range alerts { for _, missingAlert := range alerts {
missing := true missing := true
@ -216,7 +215,7 @@ func deleteMissingAlerts(alerts []*m.Alert, cmd *m.SaveAlertsCommand, sess *xorm
return nil return nil
} }
func GetAlertsByDashboardId2(dashboardId int64, sess *xorm.Session) ([]*m.Alert, error) { func GetAlertsByDashboardId2(dashboardId int64, sess *DBSession) ([]*m.Alert, error) {
alerts := make([]*m.Alert, 0) alerts := make([]*m.Alert, 0)
err := sess.Where("dashboard_id = ?", dashboardId).Find(&alerts) err := sess.Where("dashboard_id = ?", dashboardId).Find(&alerts)
@ -228,7 +227,7 @@ func GetAlertsByDashboardId2(dashboardId int64, sess *xorm.Session) ([]*m.Alert,
} }
func SetAlertState(cmd *m.SetAlertStateCommand) error { func SetAlertState(cmd *m.SetAlertStateCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
alert := m.Alert{} alert := m.Alert{}
if has, err := sess.Id(cmd.AlertId).Get(&alert); err != nil { if has, err := sess.Id(cmd.AlertId).Get(&alert); err != nil {
@ -262,7 +261,7 @@ func SetAlertState(cmd *m.SetAlertStateCommand) error {
} }
func PauseAlert(cmd *m.PauseAlertCommand) error { func PauseAlert(cmd *m.PauseAlertCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
if len(cmd.AlertIds) == 0 { if len(cmd.AlertIds) == 0 {
return fmt.Errorf("command contains no alertids") return fmt.Errorf("command contains no alertids")
} }
@ -292,7 +291,7 @@ func PauseAlert(cmd *m.PauseAlertCommand) error {
} }
func PauseAllAlerts(cmd *m.PauseAllAlertCommand) error { func PauseAllAlerts(cmd *m.PauseAllAlertCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
var newState string var newState string
if cmd.Paused { if cmd.Paused {
newState = string(m.AlertStatePaused) newState = string(m.AlertStatePaused)

11
pkg/services/sqlstore/alert_notification.go
View File

@ -6,7 +6,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )
@ -21,7 +20,7 @@ func init() {
} }
func DeleteAlertNotification(cmd *m.DeleteAlertNotificationCommand) error { func DeleteAlertNotification(cmd *m.DeleteAlertNotificationCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
sql := "DELETE FROM alert_notification WHERE alert_notification.org_id = ? AND alert_notification.id = ?" sql := "DELETE FROM alert_notification WHERE alert_notification.org_id = ? AND alert_notification.id = ?"
_, err := sess.Exec(sql, cmd.OrgId, cmd.Id) _, err := sess.Exec(sql, cmd.OrgId, cmd.Id)
@ -34,7 +33,7 @@ func DeleteAlertNotification(cmd *m.DeleteAlertNotificationCommand) error {
} }
func GetAlertNotifications(query *m.GetAlertNotificationsQuery) error { func GetAlertNotifications(query *m.GetAlertNotificationsQuery) error {
return getAlertNotificationInternal(query, x.NewSession()) return getAlertNotificationInternal(query, newSession())
} }
func GetAllAlertNotifications(query *m.GetAllAlertNotificationsQuery) error { func GetAllAlertNotifications(query *m.GetAllAlertNotificationsQuery) error {
@ -85,7 +84,7 @@ func GetAlertNotificationsToSend(query *m.GetAlertNotificationsToSendQuery) erro
return nil return nil
} }
func getAlertNotificationInternal(query *m.GetAlertNotificationsQuery, sess *xorm.Session) error { func getAlertNotificationInternal(query *m.GetAlertNotificationsQuery, sess *DBSession) error {
var sql bytes.Buffer var sql bytes.Buffer
params := make([]interface{}, 0) params := make([]interface{}, 0)
@ -131,7 +130,7 @@ func getAlertNotificationInternal(query *m.GetAlertNotificationsQuery, sess *xor
} }
func CreateAlertNotificationCommand(cmd *m.CreateAlertNotificationCommand) error { func CreateAlertNotificationCommand(cmd *m.CreateAlertNotificationCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
existingQuery := &m.GetAlertNotificationsQuery{OrgId: cmd.OrgId, Name: cmd.Name} existingQuery := &m.GetAlertNotificationsQuery{OrgId: cmd.OrgId, Name: cmd.Name}
err := getAlertNotificationInternal(existingQuery, sess) err := getAlertNotificationInternal(existingQuery, sess)
@ -163,7 +162,7 @@ func CreateAlertNotificationCommand(cmd *m.CreateAlertNotificationCommand) error
} }
func UpdateAlertNotification(cmd *m.UpdateAlertNotificationCommand) error { func UpdateAlertNotification(cmd *m.UpdateAlertNotificationCommand) error {
return inTransaction(func(sess *xorm.Session) (err error) { return inTransaction(func(sess *DBSession) (err error) {
current := m.AlertNotification{} current := m.AlertNotification{}
if _, err = sess.Id(cmd.Id).Get(&current); err != nil { if _, err = sess.Id(cmd.Id).Get(&current); err != nil {

7
pkg/services/sqlstore/annotation.go
View File

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/services/annotations" "github.com/grafana/grafana/pkg/services/annotations"
) )
@ -13,7 +12,7 @@ type SqlAnnotationRepo struct {
} }
func (r *SqlAnnotationRepo) Save(item *annotations.Item) error { func (r *SqlAnnotationRepo) Save(item *annotations.Item) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
if _, err := sess.Table("annotation").Insert(item); err != nil { if _, err := sess.Table("annotation").Insert(item); err != nil {
return err return err
@ -24,7 +23,7 @@ func (r *SqlAnnotationRepo) Save(item *annotations.Item) error {
} }
func (r *SqlAnnotationRepo) Update(item *annotations.Item) error { func (r *SqlAnnotationRepo) Update(item *annotations.Item) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
if _, err := sess.Table("annotation").Id(item.Id).Update(item); err != nil { if _, err := sess.Table("annotation").Id(item.Id).Update(item); err != nil {
return err return err
@ -97,7 +96,7 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I
} }
func (r *SqlAnnotationRepo) Delete(params *annotations.DeleteParams) error { func (r *SqlAnnotationRepo) Delete(params *annotations.DeleteParams) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
sql := "DELETE FROM annotation WHERE dashboard_id = ? AND panel_id = ?" sql := "DELETE FROM annotation WHERE dashboard_id = ? AND panel_id = ?"

5
pkg/services/sqlstore/apikey.go
View File

@ -3,7 +3,6 @@ package sqlstore
import ( import (
"time" "time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )
@ -24,7 +23,7 @@ func GetApiKeys(query *m.GetApiKeysQuery) error {
} }
func DeleteApiKey(cmd *m.DeleteApiKeyCommand) error { func DeleteApiKey(cmd *m.DeleteApiKeyCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
var rawSql = "DELETE FROM api_key WHERE id=? and org_id=?" var rawSql = "DELETE FROM api_key WHERE id=? and org_id=?"
_, err := sess.Exec(rawSql, cmd.Id, cmd.OrgId) _, err := sess.Exec(rawSql, cmd.Id, cmd.OrgId)
return err return err
@ -32,7 +31,7 @@ func DeleteApiKey(cmd *m.DeleteApiKeyCommand) error {
} }
func AddApiKey(cmd *m.AddApiKeyCommand) error { func AddApiKey(cmd *m.AddApiKeyCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
t := m.ApiKey{ t := m.ApiKey{
OrgId: cmd.OrgId, OrgId: cmd.OrgId,
Name: cmd.Name, Name: cmd.Name,

7
pkg/services/sqlstore/dashboard.go
View File

@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/metrics"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
@ -23,7 +22,7 @@ func init() {
} }
func SaveDashboard(cmd *m.SaveDashboardCommand) error { func SaveDashboard(cmd *m.SaveDashboardCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
dash := cmd.GetDashboardModel() dash := cmd.GetDashboardModel()
// try get existing dashboard // try get existing dashboard
@ -220,7 +219,7 @@ func GetDashboardTags(query *m.GetDashboardTagsQuery) error {
} }
func DeleteDashboard(cmd *m.DeleteDashboardCommand) error { func DeleteDashboard(cmd *m.DeleteDashboardCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
dashboard := m.Dashboard{Slug: cmd.Slug, OrgId: cmd.OrgId} dashboard := m.Dashboard{Slug: cmd.Slug, OrgId: cmd.OrgId}
has, err := sess.Get(&dashboard) has, err := sess.Get(&dashboard)
if err != nil { if err != nil {
@ -243,7 +242,7 @@ func DeleteDashboard(cmd *m.DeleteDashboardCommand) error {
} }
} }
if err := DeleteAlertDefinition(dashboard.Id, sess.Session); err != nil { if err := DeleteAlertDefinition(dashboard.Id, sess); err != nil {
return nil return nil
} }

7
pkg/services/sqlstore/dashboard_snapshot.go
View File

@ -3,7 +3,6 @@ package sqlstore
import ( import (
"time" "time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
@ -18,7 +17,7 @@ func init() {
} }
func DeleteExpiredSnapshots(cmd *m.DeleteExpiredSnapshotsCommand) error { func DeleteExpiredSnapshots(cmd *m.DeleteExpiredSnapshotsCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
var expiredCount int64 = 0 var expiredCount int64 = 0
if setting.SnapShotRemoveExpired { if setting.SnapShotRemoveExpired {
@ -36,7 +35,7 @@ func DeleteExpiredSnapshots(cmd *m.DeleteExpiredSnapshotsCommand) error {
} }
func CreateDashboardSnapshot(cmd *m.CreateDashboardSnapshotCommand) error { func CreateDashboardSnapshot(cmd *m.CreateDashboardSnapshotCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
// never // never
var expires = time.Now().Add(time.Hour * 24 * 365 * 50) var expires = time.Now().Add(time.Hour * 24 * 365 * 50)
@ -65,7 +64,7 @@ func CreateDashboardSnapshot(cmd *m.CreateDashboardSnapshotCommand) error {
} }
func DeleteDashboardSnapshot(cmd *m.DeleteDashboardSnapshotCommand) error { func DeleteDashboardSnapshot(cmd *m.DeleteDashboardSnapshotCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
var rawSql = "DELETE FROM dashboard_snapshot WHERE delete_key=?" var rawSql = "DELETE FROM dashboard_snapshot WHERE delete_key=?"
_, err := sess.Exec(rawSql, cmd.DeleteKey) _, err := sess.Exec(rawSql, cmd.DeleteKey)
return err return err

12
pkg/services/sqlstore/datasource.go
View File

@ -6,8 +6,6 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/securejsondata" "github.com/grafana/grafana/pkg/components/securejsondata"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/go-xorm/xorm"
) )
func init() { func init() {
@ -52,7 +50,7 @@ func GetDataSources(query *m.GetDataSourcesQuery) error {
} }
func DeleteDataSourceById(cmd *m.DeleteDataSourceByIdCommand) error { func DeleteDataSourceById(cmd *m.DeleteDataSourceByIdCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
var rawSql = "DELETE FROM data_source WHERE id=? and org_id=?" var rawSql = "DELETE FROM data_source WHERE id=? and org_id=?"
_, err := sess.Exec(rawSql, cmd.Id, cmd.OrgId) _, err := sess.Exec(rawSql, cmd.Id, cmd.OrgId)
return err return err
@ -60,7 +58,7 @@ func DeleteDataSourceById(cmd *m.DeleteDataSourceByIdCommand) error {
} }
func DeleteDataSourceByName(cmd *m.DeleteDataSourceByNameCommand) error { func DeleteDataSourceByName(cmd *m.DeleteDataSourceByNameCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
var rawSql = "DELETE FROM data_source WHERE name=? and org_id=?" var rawSql = "DELETE FROM data_source WHERE name=? and org_id=?"
_, err := sess.Exec(rawSql, cmd.Name, cmd.OrgId) _, err := sess.Exec(rawSql, cmd.Name, cmd.OrgId)
return err return err
@ -69,7 +67,7 @@ func DeleteDataSourceByName(cmd *m.DeleteDataSourceByNameCommand) error {
func AddDataSource(cmd *m.AddDataSourceCommand) error { func AddDataSource(cmd *m.AddDataSourceCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
existing := m.DataSource{OrgId: cmd.OrgId, Name: cmd.Name} existing := m.DataSource{OrgId: cmd.OrgId, Name: cmd.Name}
has, _ := sess.Get(&existing) has, _ := sess.Get(&existing)
@ -109,7 +107,7 @@ func AddDataSource(cmd *m.AddDataSourceCommand) error {
}) })
} }
func updateIsDefaultFlag(ds *m.DataSource, sess *xorm.Session) error { func updateIsDefaultFlag(ds *m.DataSource, sess *DBSession) error {
// Handle is default flag // Handle is default flag
if ds.IsDefault { if ds.IsDefault {
rawSql := "UPDATE data_source SET is_default=? WHERE org_id=? AND id <> ?" rawSql := "UPDATE data_source SET is_default=? WHERE org_id=? AND id <> ?"
@ -122,7 +120,7 @@ func updateIsDefaultFlag(ds *m.DataSource, sess *xorm.Session) error {
func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error { func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
ds := &m.DataSource{ ds := &m.DataSource{
Id: cmd.Id, Id: cmd.Id,
OrgId: cmd.OrgId, OrgId: cmd.OrgId,

10
pkg/services/sqlstore/org.go
View File

@ -63,7 +63,7 @@ func GetOrgByName(query *m.GetOrgByNameQuery) error {
return nil return nil
} }
func isOrgNameTaken(name string, existingId int64, sess *session) (bool, error) { func isOrgNameTaken(name string, existingId int64, sess *DBSession) (bool, error) {
// check if org name is taken // check if org name is taken
var org m.Org var org m.Org
exists, err := sess.Where("name=?", name).Get(&org) exists, err := sess.Where("name=?", name).Get(&org)
@ -80,7 +80,7 @@ func isOrgNameTaken(name string, existingId int64, sess *session) (bool, error)
} }
func CreateOrg(cmd *m.CreateOrgCommand) error { func CreateOrg(cmd *m.CreateOrgCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
if isNameTaken, err := isOrgNameTaken(cmd.Name, 0, sess); err != nil { if isNameTaken, err := isOrgNameTaken(cmd.Name, 0, sess); err != nil {
return err return err
@ -120,7 +120,7 @@ func CreateOrg(cmd *m.CreateOrgCommand) error {
} }
func UpdateOrg(cmd *m.UpdateOrgCommand) error { func UpdateOrg(cmd *m.UpdateOrgCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
if isNameTaken, err := isOrgNameTaken(cmd.Name, cmd.OrgId, sess); err != nil { if isNameTaken, err := isOrgNameTaken(cmd.Name, cmd.OrgId, sess); err != nil {
return err return err
@ -154,7 +154,7 @@ func UpdateOrg(cmd *m.UpdateOrgCommand) error {
} }
func UpdateOrgAddress(cmd *m.UpdateOrgAddressCommand) error { func UpdateOrgAddress(cmd *m.UpdateOrgAddressCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
org := m.Org{ org := m.Org{
Address1: cmd.Address1, Address1: cmd.Address1,
Address2: cmd.Address2, Address2: cmd.Address2,
@ -181,7 +181,7 @@ func UpdateOrgAddress(cmd *m.UpdateOrgAddressCommand) error {
} }
func DeleteOrg(cmd *m.DeleteOrgCommand) error { func DeleteOrg(cmd *m.DeleteOrgCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
if res, err := sess.Query("SELECT 1 from org WHERE id=?", cmd.Id); err != nil { if res, err := sess.Query("SELECT 1 from org WHERE id=?", cmd.Id); err != nil {
return err return err
} else if len(res) != 1 { } else if len(res) != 1 {

10
pkg/services/sqlstore/org_users.go
View File

@ -4,8 +4,6 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )
@ -18,7 +16,7 @@ func init() {
} }
func AddOrgUser(cmd *m.AddOrgUserCommand) error { func AddOrgUser(cmd *m.AddOrgUserCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
// check if user exists // check if user exists
if res, err := sess.Query("SELECT 1 from org_user WHERE org_id=? and user_id=?", cmd.OrgId, cmd.UserId); err != nil { if res, err := sess.Query("SELECT 1 from org_user WHERE org_id=? and user_id=?", cmd.OrgId, cmd.UserId); err != nil {
return err return err
@ -46,7 +44,7 @@ func AddOrgUser(cmd *m.AddOrgUserCommand) error {
} }
func UpdateOrgUser(cmd *m.UpdateOrgUserCommand) error { func UpdateOrgUser(cmd *m.UpdateOrgUserCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
var orgUser m.OrgUser var orgUser m.OrgUser
exists, err := sess.Where("org_id=? AND user_id=?", cmd.OrgId, cmd.UserId).Get(&orgUser) exists, err := sess.Where("org_id=? AND user_id=?", cmd.OrgId, cmd.UserId).Get(&orgUser)
if err != nil { if err != nil {
@ -81,7 +79,7 @@ func GetOrgUsers(query *m.GetOrgUsersQuery) error {
} }
func RemoveOrgUser(cmd *m.RemoveOrgUserCommand) error { func RemoveOrgUser(cmd *m.RemoveOrgUserCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
var rawSql = "DELETE FROM org_user WHERE org_id=? and user_id=?" var rawSql = "DELETE FROM org_user WHERE org_id=? and user_id=?"
_, err := sess.Exec(rawSql, cmd.OrgId, cmd.UserId) _, err := sess.Exec(rawSql, cmd.OrgId, cmd.UserId)
if err != nil { if err != nil {
@ -92,7 +90,7 @@ func RemoveOrgUser(cmd *m.RemoveOrgUserCommand) error {
}) })
} }
func validateOneAdminLeftInOrg(orgId int64, sess *xorm.Session) error { func validateOneAdminLeftInOrg(orgId int64, sess *DBSession) error {
// validate that there is an admin user left // validate that there is an admin user left
res, err := sess.Query("SELECT 1 from org_user WHERE org_id=? and role='Admin'", orgId) res, err := sess.Query("SELECT 1 from org_user WHERE org_id=? and role='Admin'", orgId)
if err != nil { if err != nil {

4
pkg/services/sqlstore/playlist.go
View File

@ -3,8 +3,6 @@ package sqlstore
import ( import (
"fmt" "fmt"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )
@ -118,7 +116,7 @@ func DeletePlaylist(cmd *m.DeletePlaylistCommand) error {
return m.ErrCommandValidationFailed return m.ErrCommandValidationFailed
} }
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
var rawPlaylistSql = "DELETE FROM playlist WHERE id = ? and org_id = ?" var rawPlaylistSql = "DELETE FROM playlist WHERE id = ? and org_id = ?"
_, err := sess.Exec(rawPlaylistSql, cmd.Id, cmd.OrgId) _, err := sess.Exec(rawPlaylistSql, cmd.Id, cmd.OrgId)

4
pkg/services/sqlstore/plugin_setting.go
View File

@ -44,7 +44,7 @@ func GetPluginSettingById(query *m.GetPluginSettingByIdQuery) error {
} }
func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error { func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
var pluginSetting m.PluginSetting var pluginSetting m.PluginSetting
exists, err := sess.Where("org_id=? and plugin_id=?", cmd.OrgId, cmd.PluginId).Get(&pluginSetting) exists, err := sess.Where("org_id=? and plugin_id=?", cmd.OrgId, cmd.PluginId).Get(&pluginSetting)
@ -104,7 +104,7 @@ func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error {
} }
func UpdatePluginSettingVersion(cmd *m.UpdatePluginSettingVersionCmd) error { func UpdatePluginSettingVersion(cmd *m.UpdatePluginSettingVersionCmd) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
_, err := sess.Exec("UPDATE plugin_setting SET plugin_version=? WHERE org_id=? AND plugin_id=?", cmd.PluginVersion, cmd.OrgId, cmd.PluginId) _, err := sess.Exec("UPDATE plugin_setting SET plugin_version=? WHERE org_id=? AND plugin_id=?", cmd.PluginVersion, cmd.OrgId, cmd.PluginId)
return err return err

2
pkg/services/sqlstore/preferences.go
View File

@ -68,7 +68,7 @@ func GetPreferences(query *m.GetPreferencesQuery) error {
} }
func SavePreferences(cmd *m.SavePreferencesCommand) error { func SavePreferences(cmd *m.SavePreferencesCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
var prefs m.Preferences var prefs m.Preferences
exists, err := sess.Where("org_id=? AND user_id=?", cmd.OrgId, cmd.UserId).Get(&prefs) exists, err := sess.Where("org_id=? AND user_id=?", cmd.OrgId, cmd.UserId).Get(&prefs)

5
pkg/services/sqlstore/quota.go
View File

@ -2,6 +2,7 @@ package sqlstore
import ( import (
"fmt" "fmt"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
@ -94,7 +95,7 @@ func GetOrgQuotas(query *m.GetOrgQuotasQuery) error {
} }
func UpdateOrgQuota(cmd *m.UpdateOrgQuotaCmd) error { func UpdateOrgQuota(cmd *m.UpdateOrgQuotaCmd) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
//Check if quota is already defined in the DB //Check if quota is already defined in the DB
quota := m.Quota{ quota := m.Quota{
Target: cmd.Target, Target: cmd.Target,
@ -194,7 +195,7 @@ func GetUserQuotas(query *m.GetUserQuotasQuery) error {
} }
func UpdateUserQuota(cmd *m.UpdateUserQuotaCmd) error { func UpdateUserQuota(cmd *m.UpdateUserQuotaCmd) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
//Check if quota is already defined in the DB //Check if quota is already defined in the DB
quota := m.Quota{ quota := m.Quota{
Target: cmd.Target, Target: cmd.Target,

37
pkg/services/sqlstore/shared.go
View File

@ -9,18 +9,21 @@ import (
sqlite3 "github.com/mattn/go-sqlite3" sqlite3 "github.com/mattn/go-sqlite3"
) )
type dbTransactionFunc func(sess *xorm.Session) error type DBSession struct {
type dbTransactionFunc2 func(sess *session) error
type session struct {
*xorm.Session *xorm.Session
events []interface{} events []interface{}
} }
func (sess *session) publishAfterCommit(msg interface{}) { type dbTransactionFunc func(sess *DBSession) error
func (sess *DBSession) publishAfterCommit(msg interface{}) {
sess.events = append(sess.events, msg) sess.events = append(sess.events, msg)
} }
func newSession() *DBSession {
return &DBSession{Session: x.NewSession()}
}
func inTransaction(callback dbTransactionFunc) error { func inTransaction(callback dbTransactionFunc) error {
return inTransactionWithRetry(callback, 0) return inTransactionWithRetry(callback, 0)
} }
@ -28,7 +31,7 @@ func inTransaction(callback dbTransactionFunc) error {
func inTransactionWithRetry(callback dbTransactionFunc, retry int) error { func inTransactionWithRetry(callback dbTransactionFunc, retry int) error {
var err error var err error
sess := x.NewSession() sess := newSession()
defer sess.Close() defer sess.Close()
if err = sess.Begin(); err != nil { if err = sess.Begin(); err != nil {
@ -54,28 +57,6 @@ func inTransactionWithRetry(callback dbTransactionFunc, retry int) error {
return err return err
} }
return nil
}
func inTransaction2(callback dbTransactionFunc2) error {
var err error
sess := session{Session: x.NewSession()}
defer sess.Close()
if err = sess.Begin(); err != nil {
return err
}
err = callback(&sess)
if err != nil {
sess.Rollback()
return err
} else if err = sess.Commit(); err != nil {
return err
}
if len(sess.events) > 0 { if len(sess.events) > 0 {
for _, e := range sess.events { for _, e := range sess.events {
if err = bus.Publish(e); err != nil { if err = bus.Publish(e); err != nil {

4
pkg/services/sqlstore/sql_test_data.go
View File

@ -12,7 +12,7 @@ func init() {
bus.AddHandler("sql", InsertSqlTestData) bus.AddHandler("sql", InsertSqlTestData)
} }
func sqlRandomWalk(m1 string, m2 string, intWalker int64, floatWalker float64, sess *session) error { func sqlRandomWalk(m1 string, m2 string, intWalker int64, floatWalker float64, sess *DBSession) error {
timeWalker := time.Now().UTC().Add(time.Hour * -200) timeWalker := time.Now().UTC().Add(time.Hour * -200)
now := time.Now().UTC() now := time.Now().UTC()
@ -45,7 +45,7 @@ func sqlRandomWalk(m1 string, m2 string, intWalker int64, floatWalker float64, s
} }
func InsertSqlTestData(cmd *m.InsertSqlTestDataCommand) error { func InsertSqlTestData(cmd *m.InsertSqlTestDataCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
var err error var err error
sqlog.Info("SQL TestData: Clearing previous test data") sqlog.Info("SQL TestData: Clearing previous test data")

6
pkg/services/sqlstore/star.go
View File

@ -1,8 +1,6 @@
package sqlstore package sqlstore
import ( import (
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )
@ -36,7 +34,7 @@ func StarDashboard(cmd *m.StarDashboardCommand) error {
return m.ErrCommandValidationFailed return m.ErrCommandValidationFailed
} }
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
entity := m.Star{ entity := m.Star{
UserId: cmd.UserId, UserId: cmd.UserId,
@ -53,7 +51,7 @@ func UnstarDashboard(cmd *m.UnstarDashboardCommand) error {
return m.ErrCommandValidationFailed return m.ErrCommandValidationFailed
} }
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
var rawSql = "DELETE FROM star WHERE user_id=? and dashboard_id=?" var rawSql = "DELETE FROM star WHERE user_id=? and dashboard_id=?"
_, err := sess.Exec(rawSql, cmd.UserId, cmd.DashboardId) _, err := sess.Exec(rawSql, cmd.UserId, cmd.DashboardId)
return err return err

5
pkg/services/sqlstore/temp_user.go
View File

@ -3,7 +3,6 @@ package sqlstore
import ( import (
"time" "time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )
@ -16,7 +15,7 @@ func init() {
} }
func UpdateTempUserStatus(cmd *m.UpdateTempUserStatusCommand) error { func UpdateTempUserStatus(cmd *m.UpdateTempUserStatusCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
var rawSql = "UPDATE temp_user SET status=? WHERE code=?" var rawSql = "UPDATE temp_user SET status=? WHERE code=?"
_, err := sess.Exec(rawSql, string(cmd.Status), cmd.Code) _, err := sess.Exec(rawSql, string(cmd.Status), cmd.Code)
return err return err
@ -24,7 +23,7 @@ func UpdateTempUserStatus(cmd *m.UpdateTempUserStatusCommand) error {
} }
func CreateTempUser(cmd *m.CreateTempUserCommand) error { func CreateTempUser(cmd *m.CreateTempUserCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
// create user // create user
user := &m.TempUser{ user := &m.TempUser{

18
pkg/services/sqlstore/user.go
View File

@ -5,8 +5,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/go-xorm/xorm"
"fmt" "fmt"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
@ -34,7 +32,7 @@ func init() {
bus.AddHandler("sql", SetUserHelpFlag) bus.AddHandler("sql", SetUserHelpFlag)
} }
func getOrgIdForNewUser(cmd *m.CreateUserCommand, sess *session) (int64, error) { func getOrgIdForNewUser(cmd *m.CreateUserCommand, sess *DBSession) (int64, error) {
if cmd.SkipOrgSetup { if cmd.SkipOrgSetup {
return -1, nil return -1, nil
} }
@ -77,7 +75,7 @@ func getOrgIdForNewUser(cmd *m.CreateUserCommand, sess *session) (int64, error)
} }
func CreateUser(cmd *m.CreateUserCommand) error { func CreateUser(cmd *m.CreateUserCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
orgId, err := getOrgIdForNewUser(cmd, sess) orgId, err := getOrgIdForNewUser(cmd, sess)
if err != nil { if err != nil {
return err return err
@ -220,7 +218,7 @@ func GetUserByEmail(query *m.GetUserByEmailQuery) error {
} }
func UpdateUser(cmd *m.UpdateUserCommand) error { func UpdateUser(cmd *m.UpdateUserCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
user := m.User{ user := m.User{
Name: cmd.Name, Name: cmd.Name,
@ -247,7 +245,7 @@ func UpdateUser(cmd *m.UpdateUserCommand) error {
} }
func ChangeUserPassword(cmd *m.ChangeUserPasswordCommand) error { func ChangeUserPassword(cmd *m.ChangeUserPasswordCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
user := m.User{ user := m.User{
Password: cmd.NewPassword, Password: cmd.NewPassword,
@ -277,7 +275,7 @@ func SetUsingOrg(cmd *m.SetUsingOrgCommand) error {
return fmt.Errorf("user does not belong to org") return fmt.Errorf("user does not belong to org")
} }
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
user := m.User{} user := m.User{}
sess.Id(cmd.UserId).Get(&user) sess.Id(cmd.UserId).Get(&user)
@ -394,7 +392,7 @@ func SearchUsers(query *m.SearchUsersQuery) error {
} }
func DeleteUser(cmd *m.DeleteUserCommand) error { func DeleteUser(cmd *m.DeleteUserCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
deletes := []string{ deletes := []string{
"DELETE FROM star WHERE user_id = ?", "DELETE FROM star WHERE user_id = ?",
"DELETE FROM " + dialect.Quote("user") + " WHERE id = ?", "DELETE FROM " + dialect.Quote("user") + " WHERE id = ?",
@ -412,7 +410,7 @@ func DeleteUser(cmd *m.DeleteUserCommand) error {
} }
func UpdateUserPermissions(cmd *m.UpdateUserPermissionsCommand) error { func UpdateUserPermissions(cmd *m.UpdateUserPermissionsCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *DBSession) error {
user := m.User{} user := m.User{}
sess.Id(cmd.UserId).Get(&user) sess.Id(cmd.UserId).Get(&user)
@ -424,7 +422,7 @@ func UpdateUserPermissions(cmd *m.UpdateUserPermissionsCommand) error {
} }
func SetUserHelpFlag(cmd *m.SetUserHelpFlagCommand) error { func SetUserHelpFlag(cmd *m.SetUserHelpFlagCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction(func(sess *DBSession) error {
user := m.User{ user := m.User{
Id: cmd.UserId, Id: cmd.UserId,