Fix invalid reference usage
This commit is contained in:
+20
-20
@@ -25,7 +25,7 @@ type Options struct {
|
||||
|
||||
// ReadPrometheusStyleResult will read results from a prometheus or loki server and return data frames
|
||||
func ReadPrometheusStyleResult(iter *jsoniter.Iterator, opt Options) backend.DataResponse {
|
||||
var rsp *backend.DataResponse
|
||||
var rsp backend.DataResponse
|
||||
status := "unknown"
|
||||
errorType := ""
|
||||
err := ""
|
||||
@@ -69,7 +69,7 @@ func ReadPrometheusStyleResult(iter *jsoniter.Iterator, opt Options) backend.Dat
|
||||
}
|
||||
}
|
||||
|
||||
return *rsp
|
||||
return rsp
|
||||
}
|
||||
|
||||
func readWarnings(iter *jsoniter.Iterator) []data.Notice {
|
||||
@@ -91,20 +91,20 @@ func readWarnings(iter *jsoniter.Iterator) []data.Notice {
|
||||
return warnings
|
||||
}
|
||||
|
||||
func readPrometheusData(iter *jsoniter.Iterator, opt Options) *backend.DataResponse {
|
||||
func readPrometheusData(iter *jsoniter.Iterator, opt Options) backend.DataResponse {
|
||||
t := iter.WhatIsNext()
|
||||
if t == jsoniter.ArrayValue {
|
||||
return readArrayData(iter)
|
||||
}
|
||||
|
||||
if t != jsoniter.ObjectValue {
|
||||
return &backend.DataResponse{
|
||||
return backend.DataResponse{
|
||||
Error: fmt.Errorf("expected object type"),
|
||||
}
|
||||
}
|
||||
|
||||
resultType := ""
|
||||
var rsp *backend.DataResponse
|
||||
var rsp backend.DataResponse
|
||||
|
||||
for l1Field := iter.ReadObject(); l1Field != ""; l1Field = iter.ReadObject() {
|
||||
switch l1Field {
|
||||
@@ -133,7 +133,7 @@ func readPrometheusData(iter *jsoniter.Iterator, opt Options) *backend.DataRespo
|
||||
rsp = readScalar(iter)
|
||||
default:
|
||||
iter.Skip()
|
||||
rsp = &backend.DataResponse{
|
||||
rsp = backend.DataResponse{
|
||||
Error: fmt.Errorf("unknown result type: %s", resultType),
|
||||
}
|
||||
}
|
||||
@@ -161,11 +161,11 @@ func readPrometheusData(iter *jsoniter.Iterator, opt Options) *backend.DataRespo
|
||||
}
|
||||
|
||||
// will return strings or exemplars
|
||||
func readArrayData(iter *jsoniter.Iterator) *backend.DataResponse {
|
||||
func readArrayData(iter *jsoniter.Iterator) backend.DataResponse {
|
||||
lookup := make(map[string]*data.Field)
|
||||
|
||||
var labelFrame *data.Frame
|
||||
rsp := &backend.DataResponse{}
|
||||
rsp := backend.DataResponse{}
|
||||
stringField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
|
||||
stringField.Name = "Value"
|
||||
for iter.ReadArray() {
|
||||
@@ -311,7 +311,7 @@ func readLabelsOrExemplars(iter *jsoniter.Iterator) (*data.Frame, [][2]string) {
|
||||
return frame, pairs
|
||||
}
|
||||
|
||||
func readString(iter *jsoniter.Iterator) *backend.DataResponse {
|
||||
func readString(iter *jsoniter.Iterator) backend.DataResponse {
|
||||
timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
|
||||
timeField.Name = data.TimeSeriesTimeFieldName
|
||||
valueField := data.NewFieldFromFieldType(data.FieldTypeString, 0)
|
||||
@@ -334,12 +334,12 @@ func readString(iter *jsoniter.Iterator) *backend.DataResponse {
|
||||
Custom: resultTypeToCustomMeta("string"),
|
||||
}
|
||||
|
||||
return &backend.DataResponse{
|
||||
return backend.DataResponse{
|
||||
Frames: []*data.Frame{frame},
|
||||
}
|
||||
}
|
||||
|
||||
func readScalar(iter *jsoniter.Iterator) *backend.DataResponse {
|
||||
func readScalar(iter *jsoniter.Iterator) backend.DataResponse {
|
||||
timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
|
||||
timeField.Name = data.TimeSeriesTimeFieldName
|
||||
valueField := data.NewFieldFromFieldType(data.FieldTypeFloat64, 0)
|
||||
@@ -358,12 +358,12 @@ func readScalar(iter *jsoniter.Iterator) *backend.DataResponse {
|
||||
Custom: resultTypeToCustomMeta("scalar"),
|
||||
}
|
||||
|
||||
return &backend.DataResponse{
|
||||
return backend.DataResponse{
|
||||
Frames: []*data.Frame{frame},
|
||||
}
|
||||
}
|
||||
|
||||
func readMatrixOrVectorWide(iter *jsoniter.Iterator, resultType string) *backend.DataResponse {
|
||||
func readMatrixOrVectorWide(iter *jsoniter.Iterator, resultType string) backend.DataResponse {
|
||||
rowIdx := 0
|
||||
timeMap := map[int64]int{}
|
||||
timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
|
||||
@@ -373,7 +373,7 @@ func readMatrixOrVectorWide(iter *jsoniter.Iterator, resultType string) *backend
|
||||
Type: data.FrameTypeTimeSeriesWide,
|
||||
Custom: resultTypeToCustomMeta(resultType),
|
||||
}
|
||||
rsp := &backend.DataResponse{
|
||||
rsp := backend.DataResponse{
|
||||
Frames: []*data.Frame{},
|
||||
}
|
||||
|
||||
@@ -471,8 +471,8 @@ func addValuePairToFrame(frame *data.Frame, timeMap map[int64]int, rowIdx int, i
|
||||
return timeMap, rowIdx
|
||||
}
|
||||
|
||||
func readMatrixOrVectorMulti(iter *jsoniter.Iterator, resultType string) *backend.DataResponse {
|
||||
rsp := &backend.DataResponse{}
|
||||
func readMatrixOrVectorMulti(iter *jsoniter.Iterator, resultType string) backend.DataResponse {
|
||||
rsp := backend.DataResponse{}
|
||||
|
||||
for iter.ReadArray() {
|
||||
timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
|
||||
@@ -669,8 +669,8 @@ func appendValueFromString(iter *jsoniter.Iterator, field *data.Field) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func readStream(iter *jsoniter.Iterator) *backend.DataResponse {
|
||||
rsp := &backend.DataResponse{}
|
||||
func readStream(iter *jsoniter.Iterator) backend.DataResponse {
|
||||
rsp := backend.DataResponse{}
|
||||
|
||||
labelsField := data.NewFieldFromFieldType(data.FieldTypeJSON, 0)
|
||||
labelsField.Name = "__labels" // avoid automatically spreading this by labels
|
||||
@@ -688,7 +688,7 @@ func readStream(iter *jsoniter.Iterator) *backend.DataResponse {
|
||||
labels := data.Labels{}
|
||||
labelJson, err := labelsToRawJson(labels)
|
||||
if err != nil {
|
||||
return &backend.DataResponse{Error: err}
|
||||
return backend.DataResponse{Error: err}
|
||||
}
|
||||
|
||||
for iter.ReadArray() {
|
||||
@@ -701,7 +701,7 @@ func readStream(iter *jsoniter.Iterator) *backend.DataResponse {
|
||||
iter.ReadVal(&labels)
|
||||
labelJson, err = labelsToRawJson(labels)
|
||||
if err != nil {
|
||||
return &backend.DataResponse{Error: err}
|
||||
return backend.DataResponse{Error: err}
|
||||
}
|
||||
|
||||
case "values":
|
||||
|
||||
Reference in New Issue
Block a user