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

Chore: Use jsoniter in influxdb from grafana-plugin-sdk-go (#82360)

Browse Source 
use jsoniter from grafana-plugin-sdk-go
This commit is contained in:
ismail simsek 2024-02-13 17:47:00 +01:00 committed by GitHub
parent dcbc3aa46a
commit 3f940f4da1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/tsdb/influxdb/influxql/converter/converter.go
View File

@ -7,11 +7,11 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data" "github.com/grafana/grafana-plugin-sdk-go/data"
sdkjsoniter "github.com/grafana/grafana-plugin-sdk-go/data/utils/jsoniter"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
"github.com/grafana/grafana/pkg/tsdb/influxdb/influxql/util" "github.com/grafana/grafana/pkg/tsdb/influxdb/influxql/util"
"github.com/grafana/grafana/pkg/tsdb/influxdb/models" "github.com/grafana/grafana/pkg/tsdb/influxdb/models"
"github.com/grafana/grafana/pkg/util/converter/jsonitere"
) )
func rspErr(e error) *backend.DataResponse { func rspErr(e error) *backend.DataResponse {
@ -19,7 +19,7 @@ func rspErr(e error) *backend.DataResponse {
} }
func ReadInfluxQLStyleResult(jIter *jsoniter.Iterator, query *models.Query) *backend.DataResponse { func ReadInfluxQLStyleResult(jIter *jsoniter.Iterator, query *models.Query) *backend.DataResponse {
iter := jsonitere.NewIterator(jIter) iter := sdkjsoniter.NewIterator(jIter)
var rsp *backend.DataResponse var rsp *backend.DataResponse
l1Fields: l1Fields:
@ -51,7 +51,7 @@ l1Fields:
return rsp return rsp
} }
func readResults(iter *jsonitere.Iterator, query *models.Query) *backend.DataResponse { func readResults(iter *sdkjsoniter.Iterator, query *models.Query) *backend.DataResponse {
rsp := &backend.DataResponse{Frames: make(data.Frames, 0)} rsp := &backend.DataResponse{Frames: make(data.Frames, 0)}
l1Fields: l1Fields:
for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() { for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
@ -79,7 +79,7 @@ l1Fields:
return rsp return rsp
} }
func readSeries(iter *jsonitere.Iterator, query *models.Query) *backend.DataResponse { func readSeries(iter *sdkjsoniter.Iterator, query *models.Query) *backend.DataResponse {
var ( var (
measurement string measurement string
tags map[string]string tags map[string]string
@ -179,7 +179,7 @@ func readSeries(iter *jsonitere.Iterator, query *models.Query) *backend.DataResp
return rsp return rsp
} }
func readTags(iter *jsonitere.Iterator) (map[string]string, error) { func readTags(iter *sdkjsoniter.Iterator) (map[string]string, error) {
tags := make(map[string]string) tags := make(map[string]string)
for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() { for l1Field, err := iter.ReadObject(); l1Field != ""; l1Field, err = iter.ReadObject() {
if err != nil { if err != nil {
@ -194,7 +194,7 @@ func readTags(iter *jsonitere.Iterator) (map[string]string, error) {
return tags, nil return tags, nil
} }
func readColumns(iter *jsonitere.Iterator) (columns []string, err error) { func readColumns(iter *sdkjsoniter.Iterator) (columns []string, err error) {
for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() { for more, err := iter.ReadArray(); more; more, err = iter.ReadArray() {
if err != nil { if err != nil {
return nil, err return nil, err
@ -209,7 +209,7 @@ func readColumns(iter *jsonitere.Iterator) (columns []string, err error) {
return columns, nil return columns, nil
} }
func readValues(iter *jsonitere.Iterator, hasTimeColumn bool) (valueFields data.Fields, err error) { func readValues(iter *sdkjsoniter.Iterator, hasTimeColumn bool) (valueFields data.Fields, err error) {
if hasTimeColumn { if hasTimeColumn {
valueFields = append(valueFields, data.NewField("Time", nil, make([]time.Time, 0))) valueFields = append(valueFields, data.NewField("Time", nil, make([]time.Time, 0)))
} }