BackendPlugins: update to sdk v0.42.0

misc cleanup

pkg/plugins/transform_plugin.go

@@ -7,7 +7,6 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -198,7 +197,7 @@ func (s *transformCallback) QueryData(ctx context.Context, req *pluginv2.QueryDa
 			if err != nil {
 				return nil, err
 			}
-			encFrame, err := data.MarshalArrow(frame)
+			encFrame, err := frame.MarshalArrow()
 			if err != nil {
 				return nil, err
 			}
@@ -207,7 +206,7 @@ func (s *transformCallback) QueryData(ctx context.Context, req *pluginv2.QueryDa
 		if res.Meta != nil {
 			b, err := res.Meta.MarshalJSON()
 			if err != nil {
-				s.logger.Error("failed to marhsal json metadata", err)
+				s.logger.Error("failed to marshal json metadata", err)
 			}
 			pRes.JsonMeta = b
 		}

pkg/services/alerting/conditions/query.go

@@ -7,6 +7,7 @@ import (
 
 	gocontext "context"
 
+	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/null"
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -173,7 +174,7 @@ func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange *
 		useDataframes := v.Dataframes != nil && (v.Series == nil || len(v.Series) == 0)
 
 		if useDataframes { // convert the dataframes to tsdb.TimeSeries
-			frames, err := tsdb.FramesFromBytes(v.Dataframes)
+			frames, err := data.UnmarshalArrowFrames(v.Dataframes)
 			if err != nil {
 				return nil, errutil.Wrap("tsdb.HandleRequest() failed to unmarshal arrow dataframes from bytes", err)
 			}

pkg/services/alerting/conditions/query_test.go

@@ -198,7 +198,7 @@ func (ctx *queryConditionTestContext) exec() (*alerting.ConditionResult, error)
 	}
 
 	if ctx.frame != nil {
-		bFrame, err := data.MarshalArrow(ctx.frame)
+		bFrame, err := ctx.frame.MarshalArrow()
 		if err != nil {
 			return nil, err
 		}

pkg/tsdb/frame_util.go

@@ -94,16 +94,3 @@ func FrameToSeriesSlice(frame *data.Frame) (TimeSeriesSlice, error) {
 	return seriesSlice, nil
 
 }
-
-// FramesFromBytes returns a data.Frame slice from marshalled arrow dataframes.
-func FramesFromBytes(bFrames [][]byte) ([]*data.Frame, error) {
-	frames := make([]*data.Frame, len(bFrames))
-	for i, bFrame := range bFrames {
-		var err error
-		frames[i], err = data.UnmarshalArrow(bFrame)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return frames, nil
-}