From 90add3f64d0acf05e21c2d2ef8a6831407183f67 Mon Sep 17 00:00:00 2001 From: Yuce Tekol Date: Wed, 13 Sep 2017 17:07:57 +0300 Subject: [PATCH] Renamed SumReduce back to Sum --- executor.go | 14 +++++++------- executor_test.go | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/executor.go b/executor.go index 8aaac05dc..018728f53 100644 --- a/executor.go +++ b/executor.go @@ -161,9 +161,9 @@ func (e *Executor) executeCall(ctx context.Context, index string, c *pql.Call, s indexTag := fmt.Sprintf("index:%s", index) // Special handling for mutation and top-n calls. switch c.Name { - case "SumReduce": + case "Sum": e.Holder.Stats.CountWithCustomTags(c.Name, 1, 1.0, []string{indexTag}) - return e.executeSumReduce(ctx, index, c, slices, opt) + return e.executeSum(ctx, index, c, slices, opt) case "ClearBit": return e.executeClearBit(ctx, index, c, opt) case "Count": @@ -205,16 +205,16 @@ func (e *Executor) validateCallArgs(c *pql.Call) error { return nil } -// executeSumReduce executes a SumCount() call. -func (e *Executor) executeSumReduce(ctx context.Context, index string, c *pql.Call, slices []uint64, opt *ExecOptions) (SumCount, error) { +// executeSum executes a Sum() call. +func (e *Executor) executeSum(ctx context.Context, index string, c *pql.Call, slices []uint64, opt *ExecOptions) (SumCount, error) { if frame, _ := c.Args["frame"]; frame == "" { - return SumCount{}, errors.New("SumReduce(): frame required") + return SumCount{}, errors.New("Sum(): frame required") } else if field, _ := c.Args["field"]; field == "" { - return SumCount{}, errors.New("SumReduce(): field required") + return SumCount{}, errors.New("Sum(): field required") } if len(c.Children) > 1 { - return SumCount{}, errors.New("SumReduce() only accepts a single bitmap input") + return SumCount{}, errors.New("Sum() only accepts a single bitmap input") } // Execute calls in bulk on each remote node and merge. diff --git a/executor_test.go b/executor_test.go index 896c7f7b8..6f576e72e 100644 --- a/executor_test.go +++ b/executor_test.go @@ -645,7 +645,7 @@ func TestExecutor_Execute_SumReduce(t *testing.T) { } t.Run("NoFilter", func(t *testing.T) { - if result, err := e.Execute(context.Background(), "i", test.MustParse(`SumReduce(frame=f, field=foo)`), nil, nil); err != nil { + if result, err := e.Execute(context.Background(), "i", test.MustParse(`Sum(frame=f, field=foo)`), nil, nil); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(result[0], pilosa.SumCount{Sum: 200, Count: 5}) { t.Fatalf("unexpected result: %s", spew.Sdump(result)) @@ -653,7 +653,7 @@ func TestExecutor_Execute_SumReduce(t *testing.T) { }) t.Run("WithFilter", func(t *testing.T) { - if result, err := e.Execute(context.Background(), "i", test.MustParse(`SumReduce(Bitmap(frame=f, rowID=0), frame=f, field=foo)`), nil, nil); err != nil { + if result, err := e.Execute(context.Background(), "i", test.MustParse(`Sum(Bitmap(frame=f, rowID=0), frame=f, field=foo)`), nil, nil); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(result[0], pilosa.SumCount{Sum: 80, Count: 2}) { t.Fatalf("unexpected result: %s", spew.Sdump(result))