opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 06:02:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

SQL Engine: Revert session changes (#64594)

Browse Source 
Revert session changes
This commit is contained in:
Kyle Cunningham
2023-03-29 15:04:28 +07:00
committed by GitHub
parent aedcbf2a4f
commit d8ac2e97a0
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/tsdb/sqleng/sql_engine.go
View File

@ -101,7 +101,6 @@ type DataSourceHandler struct {
log log.Logger log log.Logger
dsInfo DataSourceInfo dsInfo DataSourceInfo
rowLimit int64 rowLimit int64
session *xorm.Session
} }
type QueryJson struct { type QueryJson struct {
@ -151,7 +150,6 @@ func NewQueryDataHandler(config DataPluginConfiguration, queryResultTransformer
queryDataHandler.metricColumnTypes = config.MetricColumnTypes queryDataHandler.metricColumnTypes = config.MetricColumnTypes
} }
// Create the xorm engine
engine, err := NewXormEngine(config.DriverName, config.ConnectionString) engine, err := NewXormEngine(config.DriverName, config.ConnectionString)
if err != nil { if err != nil {
return nil, err return nil, err
@ -162,11 +160,6 @@ func NewQueryDataHandler(config DataPluginConfiguration, queryResultTransformer
engine.SetConnMaxLifetime(time.Duration(config.DSInfo.JsonData.ConnMaxLifetime) * time.Second) engine.SetConnMaxLifetime(time.Duration(config.DSInfo.JsonData.ConnMaxLifetime) * time.Second)
queryDataHandler.engine = engine queryDataHandler.engine = engine
// Create the xorm session
session := engine.NewSession()
queryDataHandler.session = session
return &queryDataHandler, nil return &queryDataHandler, nil
} }
@ -277,7 +270,9 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
return return
} }
db := e.session.DB() session := e.engine.NewSession()
defer session.Close()
db := session.DB()
rows, err := db.QueryContext(queryContext, interpolatedQuery) rows, err := db.QueryContext(queryContext, interpolatedQuery)
if err != nil { if err != nil {