From a0f4c613a2de1a1ba78078f5ad941b5348761b59 Mon Sep 17 00:00:00 2001 From: Matt Jaffee Date: Tue, 15 May 2018 10:58:33 -0500 Subject: [PATCH] remove uneccessary underscores when accessing map values --- executor.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/executor.go b/executor.go index 42fa52005..329a571aa 100644 --- a/executor.go +++ b/executor.go @@ -122,7 +122,7 @@ func (e *Executor) Execute(ctx context.Context, index string, q *pql.Query, slic for _, call := range q.Calls { if call.SupportsInverse() && needsSlices { // Fetch frame & row label based on argument. - frame, _ := call.Args["frame"].(string) + frame := call.Args["frame"].(string) if frame == "" { frame = DefaultFrame } @@ -206,9 +206,9 @@ func (e *Executor) validateCallArgs(c *pql.Call) error { // executeSum executes a Sum() call. func (e *Executor) executeSum(ctx context.Context, index string, c *pql.Call, slices []uint64, opt *ExecOptions) (ValCount, error) { - if frame, _ := c.Args["frame"]; frame == "" { + if frame := c.Args["frame"]; frame == "" { return ValCount{}, errors.New("Sum(): frame required") - } else if field, _ := c.Args["field"]; field == "" { + } else if field := c.Args["field"]; field == "" { return ValCount{}, errors.New("Sum(): field required") } @@ -241,9 +241,9 @@ func (e *Executor) executeSum(ctx context.Context, index string, c *pql.Call, sl // executeFieldMin executes a Min() call. func (e *Executor) executeFieldMin(ctx context.Context, index string, c *pql.Call, slices []uint64, opt *ExecOptions) (ValCount, error) { - if frame, _ := c.Args["frame"]; frame == "" { + if frame := c.Args["frame"]; frame == "" { return ValCount{}, errors.New("Min(): frame required") - } else if field, _ := c.Args["field"]; field == "" { + } else if field := c.Args["field"]; field == "" { return ValCount{}, errors.New("Min(): field required") } @@ -276,9 +276,9 @@ func (e *Executor) executeFieldMin(ctx context.Context, index string, c *pql.Cal // executeFieldMax executes a Max() call. func (e *Executor) executeFieldMax(ctx context.Context, index string, c *pql.Call, slices []uint64, opt *ExecOptions) (ValCount, error) { - if frame, _ := c.Args["frame"]; frame == "" { + if frame := c.Args["frame"]; frame == "" { return ValCount{}, errors.New("Max(): frame required") - } else if field, _ := c.Args["field"]; field == "" { + } else if field := c.Args["field"]; field == "" { return ValCount{}, errors.New("Max(): field required") }