Make tsdb dataframes response able to carry encoded/decoded frames (#25454)

Make tsdb dataframes response able to carry encoded and/or decoded frames
This commit is contained in:
Marcus Efraimsson
2020-06-09 13:13:06 +02:00
committed by GitHub
parent de1dc57242
commit 53175a41c9
10 changed files with 104 additions and 56 deletions
@@ -98,7 +98,7 @@ func (tw *DatasourcePluginWrapperV2) Query(ctx context.Context, ds *models.DataS
for refID, pRes := range pbRes.Responses {
qr := &tsdb.QueryResult{
RefId: refID,
Dataframes: pRes.Frames,
Dataframes: tsdb.NewEncodedDataFrames(pRes.Frames),
}
if len(pRes.JsonMeta) != 0 {
qr.Meta = simplejson.NewFromAny(pRes.JsonMeta)
+6 -2
View File
@@ -111,7 +111,7 @@ func (tw *TransformWrapper) Transform(ctx context.Context, query *tsdb.TsdbQuery
for refID, res := range pbRes.Responses {
tRes := &tsdb.QueryResult{
RefId: refID,
Dataframes: res.Frames,
Dataframes: tsdb.NewEncodedDataFrames(res.Frames),
}
if len(res.JsonMeta) != 0 {
tRes.Meta = simplejson.NewFromAny(res.JsonMeta)
@@ -190,7 +190,11 @@ func (s *transformCallback) QueryData(ctx context.Context, req *pluginv2.QueryDa
}
if res.Dataframes != nil {
pRes.Frames = res.Dataframes
encoded, err := res.Dataframes.Encoded()
if err != nil {
return nil, err
}
pRes.Frames = encoded
responses[refID] = pRes
continue
}