opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 16:43:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

SQL data sources: Use correct error source for sql processing errors (#100872)

Browse Source 
* SQL data sources: Use correct error source for sql processing errors

* Fix lint

* Fix  cyclomatic complexity

* Nit rename variable to make it more clear what those errors are
This commit is contained in:
Ivana Huckova
2025-02-18 18:24:44 +01:00
committed by GitHub
parent 08000eeece
commit 67d8610e31
3 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/tsdb/mysql/sqleng/sql_engine.go
View File

@ -231,7 +231,7 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
emptyFrame.SetMeta(&data.FrameMeta{
ExecutedQueryString: query,
})
if backend.IsDownstreamError(err) {
if isDownstreamError(err) {
source = backend.ErrorSourceDownstream
}
queryResult.dataResponse.Error = fmt.Errorf("%s: %w", frameErr, err)
@ -642,3 +642,20 @@ func epochPrecisionToMS(value float64) float64 {
return value
}
func isDownstreamError(err error) bool {
if backend.IsDownstreamError(err) {
return true
}
resultProcessingDownstreamErrors := []error{
data.ErrorInputFieldsWithoutRows,
data.ErrorSeriesUnsorted,
data.ErrorNullTimeValues,
}
for _, e := range resultProcessingDownstreamErrors {
if errors.Is(err, e) {
return true
}
}
return false
}