From d8ac2e97a003d8fb0484603d214ec9aa1af8efdb Mon Sep 17 00:00:00 2001 From: Kyle Cunningham Date: Wed, 29 Mar 2023 15:04:28 +0700 Subject: [PATCH] SQL Engine: Revert session changes (#64594) Revert session changes --- pkg/tsdb/sqleng/sql_engine.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkg/tsdb/sqleng/sql_engine.go b/pkg/tsdb/sqleng/sql_engine.go index 3960aef8f1f..8e53d77dd8e 100644 --- a/pkg/tsdb/sqleng/sql_engine.go +++ b/pkg/tsdb/sqleng/sql_engine.go @@ -101,7 +101,6 @@ type DataSourceHandler struct { log log.Logger dsInfo DataSourceInfo rowLimit int64 - session *xorm.Session } type QueryJson struct { @@ -151,7 +150,6 @@ func NewQueryDataHandler(config DataPluginConfiguration, queryResultTransformer queryDataHandler.metricColumnTypes = config.MetricColumnTypes } - // Create the xorm engine engine, err := NewXormEngine(config.DriverName, config.ConnectionString) if err != nil { return nil, err @@ -162,11 +160,6 @@ func NewQueryDataHandler(config DataPluginConfiguration, queryResultTransformer engine.SetConnMaxLifetime(time.Duration(config.DSInfo.JsonData.ConnMaxLifetime) * time.Second) queryDataHandler.engine = engine - - // Create the xorm session - session := engine.NewSession() - queryDataHandler.session = session - return &queryDataHandler, nil } @@ -277,7 +270,9 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG return } - db := e.session.DB() + session := e.engine.NewSession() + defer session.Close() + db := session.DB() rows, err := db.QueryContext(queryContext, interpolatedQuery) if err != nil {