From 80d656ae9c9b93c4a53996d5215190ea8bac9a82 Mon Sep 17 00:00:00 2001 From: Travis Turner Date: Tue, 5 Jun 2018 16:56:16 -0500 Subject: [PATCH] final removal of field instances --- ctl/import.go | 10 +++++----- executor_test.go | 20 ++++++++++---------- fragment_test.go | 32 ++++++++++++++++---------------- frame_test.go | 4 ++-- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ctl/import.go b/ctl/import.go index c6c0f0188..45bf81d42 100644 --- a/ctl/import.go +++ b/ctl/import.go @@ -358,7 +358,7 @@ func (cmd *ImportCommand) importBitsK(ctx context.Context, bits []pilosa.Bit) er return nil } -// bufferValues buffers slices of fieldValues to be imported as a batch. +// bufferValues buffers slices of FieldValues to be imported as a batch. func (cmd *ImportCommand) bufferValues(ctx context.Context, path string) error { a := make([]pilosa.FieldValue, 0, cmd.BufferSize) @@ -407,7 +407,7 @@ func (cmd *ImportCommand) bufferValues(ctx context.Context, path string) error { } val.ColumnID = columnID - // Parse field value. + // Parse FieldValue. value, err := strconv.ParseInt(record[1], 10, 64) if err != nil { return fmt.Errorf("invalid value on row %d: %q", rnum, record[1]) @@ -416,7 +416,7 @@ func (cmd *ImportCommand) bufferValues(ctx context.Context, path string) error { a = append(a, val) - // If we've reached the buffer size then import field values. + // If we've reached the buffer size then import FieldValues. if len(a) == cmd.BufferSize { if err := cmd.importValues(ctx, a); err != nil { return err @@ -433,7 +433,7 @@ func (cmd *ImportCommand) bufferValues(ctx context.Context, path string) error { return nil } -// importValues sends batches of fieldValues to the server. +// importValues sends batches of FieldValues to the server. func (cmd *ImportCommand) importValues(ctx context.Context, vals []pilosa.FieldValue) error { logger := log.New(cmd.Stderr, "", log.LstdFlags) @@ -441,7 +441,7 @@ func (cmd *ImportCommand) importValues(ctx context.Context, vals []pilosa.FieldV logger.Printf("grouping %d vals", len(vals)) valsBySlice := pilosa.FieldValues(vals).GroupBySlice() - // Parse path into field values. + // Parse path into FieldValues. for slice, vals := range valsBySlice { if cmd.Sort { sort.Sort(pilosa.FieldValues(vals)) diff --git a/executor_test.go b/executor_test.go index f042d3f8f..89e54a1de 100644 --- a/executor_test.go +++ b/executor_test.go @@ -281,7 +281,7 @@ func TestExecutor_Execute_SetValue(t *testing.T) { t.Fatal(err) } - // Set field values. + // Set bsiGroup values. e := test.NewExecutor(hldr.Holder, test.NewCluster(1)) if _, err := e.Execute(context.Background(), "i", test.MustParse(`SetValue(col=10, f=25)`), nil, nil); err != nil { t.Fatal(err) @@ -355,8 +355,8 @@ func TestExecutor_Execute_SetRowAttrs(t *testing.T) { t.Fatal(err) } - // Set two fields on f/10. - // Also set fields on other bitmaps and frames to test isolation. + // Set two attrs on f/10. + // Also set attrs on other bitmaps and frames to test isolation. e := test.NewExecutor(hldr.Holder, test.NewCluster(1)) if _, err := e.Execute(context.Background(), "i", test.MustParse(`SetRowAttrs(row=10, frame=f, foo="bar")`), nil, nil); err != nil { t.Fatal(err) @@ -617,9 +617,9 @@ func TestExecutor_Execute_MinMax(t *testing.T) { for i, tt := range tests { var pql string if tt.filter == "" { - pql = `Min(frame=f, field=f)` + pql = `Min(frame=f)` } else { - pql = fmt.Sprintf(`Min(%s, frame=f, field=f)`, tt.filter) + pql = fmt.Sprintf(`Min(%s, frame=f)`, tt.filter) } if result, err := e.Execute(context.Background(), "i", test.MustParse(pql), nil, nil); err != nil { t.Fatal(err) @@ -643,9 +643,9 @@ func TestExecutor_Execute_MinMax(t *testing.T) { for i, tt := range tests { var pql string if tt.filter == "" { - pql = `Max(frame=f, field=f)` + pql = `Max(frame=f)` } else { - pql = fmt.Sprintf(`Max(%s, frame=f, field=f)`, tt.filter) + pql = fmt.Sprintf(`Max(%s, frame=f)`, tt.filter) } if result, err := e.Execute(context.Background(), "i", test.MustParse(pql), nil, nil); err != nil { t.Fatal(err) @@ -711,7 +711,7 @@ func TestExecutor_Execute_Sum(t *testing.T) { } t.Run("NoFilter", func(t *testing.T) { - if result, err := e.Execute(context.Background(), "i", test.MustParse(`Sum(frame=foo, field=foo)`), nil, nil); err != nil { + if result, err := e.Execute(context.Background(), "i", test.MustParse(`Sum(frame=foo)`), nil, nil); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(result[0], pilosa.ValCount{Val: 200, Count: 5}) { t.Fatalf("unexpected result: %s", spew.Sdump(result)) @@ -719,7 +719,7 @@ func TestExecutor_Execute_Sum(t *testing.T) { }) t.Run("WithFilter", func(t *testing.T) { - if result, err := e.Execute(context.Background(), "i", test.MustParse(`Sum(Bitmap(frame=x, row=0), frame=foo, field=foo)`), nil, nil); err != nil { + if result, err := e.Execute(context.Background(), "i", test.MustParse(`Sum(Bitmap(frame=x, row=0), frame=foo)`), nil, nil); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(result[0], pilosa.ValCount{Val: 80, Count: 2}) { t.Fatalf("unexpected result: %s", spew.Sdump(result)) @@ -769,7 +769,7 @@ func TestExecutor_Execute_BSIGroupRange(t *testing.T) { }) } -// Ensure a Range(field) query can be executed. +// Ensure a Range(bsiGroup) query can be executed. func TestExecutor_Execute_Range(t *testing.T) { hldr := test.MustOpenHolder() defer hldr.Close() diff --git a/fragment_test.go b/fragment_test.go index 6a96fb677..b72450fbb 100644 --- a/fragment_test.go +++ b/fragment_test.go @@ -96,7 +96,7 @@ func TestFragment_ClearBit(t *testing.T) { } } -// Ensure a fragment can set & read a field value. +// Ensure a fragment can set & read a value. func TestFragment_SetValue(t *testing.T) { t.Run("OK", func(t *testing.T) { f := test.MustOpenFragment("i", "f", pilosa.ViewStandard, 0, "") @@ -219,7 +219,7 @@ func TestFragment_SetValue(t *testing.T) { }) } -// Ensure a fragment can sum field values. +// Ensure a fragment can sum values. func TestFragment_Sum(t *testing.T) { const bitDepth = 16 @@ -258,7 +258,7 @@ func TestFragment_Sum(t *testing.T) { }) } -// Ensure a fragment can find the min and max of field values. +// Ensure a fragment can find the min and max of values. func TestFragment_MinMax(t *testing.T) { const bitDepth = 16 @@ -331,7 +331,7 @@ func TestFragment_MinMax(t *testing.T) { }) } -// Ensure a fragment query for matching fields. +// Ensure a fragment query for matching values. func TestFragment_Range(t *testing.T) { const bitDepth = 16 @@ -400,28 +400,28 @@ func TestFragment_Range(t *testing.T) { t.Fatal(err) } - // Query for fields less than (ending with set column). + // Query for values less than (ending with set column). if b, err := f.RangeOp(pql.LT, bitDepth, 301); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{2000, 5000, 6000}) { t.Fatalf("unexpected columns: %+v", b.Columns()) } - // Query for fields less than (ending with unset column). + // Query for values less than (ending with unset column). if b, err := f.RangeOp(pql.LT, bitDepth, 300); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{5000, 6000}) { t.Fatalf("unexpected columns: %+v", b.Columns()) } - // Query for fields less than or equal to (ending with set column). + // Query for values less than or equal to (ending with set column). if b, err := f.RangeOp(pql.LTE, bitDepth, 301); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{2000, 4000, 5000, 6000}) { t.Fatalf("unexpected columns: %+v", b.Columns()) } - // Query for fields less than or equal to (ending with unset column). + // Query for values less than or equal to (ending with unset column). if b, err := f.RangeOp(pql.LTE, bitDepth, 300); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{2000, 5000, 6000}) { @@ -448,28 +448,28 @@ func TestFragment_Range(t *testing.T) { t.Fatal(err) } - // Query for fields greater than (ending with unset bit). + // Query for values greater than (ending with unset bit). if b, err := f.RangeOp(pql.GT, bitDepth, 300); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{1000, 3000, 4000}) { t.Fatalf("unexpected columns: %+v", b.Columns()) } - // Query for fields greater than (ending with set bit). + // Query for values greater than (ending with set bit). if b, err := f.RangeOp(pql.GT, bitDepth, 301); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{1000, 3000}) { t.Fatalf("unexpected columns: %+v", b.Columns()) } - // Query for fields greater than or equal to (ending with unset bit). + // Query for values greater than or equal to (ending with unset bit). if b, err := f.RangeOp(pql.GTE, bitDepth, 300); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{1000, 2000, 3000, 4000}) { t.Fatalf("unexpected columns: %+v", b.Columns()) } - // Query for fields greater than or equal to (ending with set bit). + // Query for values greater than or equal to (ending with set bit). if b, err := f.RangeOp(pql.GTE, bitDepth, 301); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{1000, 3000, 4000}) { @@ -496,28 +496,28 @@ func TestFragment_Range(t *testing.T) { t.Fatal(err) } - // Query for fields greater than (ending with unset column). + // Query for values greater than (ending with unset column). if b, err := f.RangeBetween(bitDepth, 300, 2817); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{1000, 2000, 3000, 4000}) { t.Fatalf("unexpected columns: %+v", b.Columns()) } - // Query for fields greater than (ending with set column). + // Query for values greater than (ending with set column). if b, err := f.RangeBetween(bitDepth, 301, 2817); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{1000, 3000, 4000}) { t.Fatalf("unexpected columns: %+v", b.Columns()) } - // Query for fields greater than or equal to (ending with unset column). + // Query for values greater than or equal to (ending with unset column). if b, err := f.RangeBetween(bitDepth, 301, 2816); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{1000, 4000}) { t.Fatalf("unexpected columns: %+v", b.Columns()) } - // Query for fields greater than or equal to (ending with set column). + // Query for values greater than or equal to (ending with set column). if b, err := f.RangeBetween(bitDepth, 300, 2816); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(b.Columns(), []uint64{1000, 2000, 4000}) { diff --git a/frame_test.go b/frame_test.go index 739b34ed8..3964af785 100644 --- a/frame_test.go +++ b/frame_test.go @@ -71,7 +71,7 @@ func TestFrame_SetTimeQuantum(t *testing.T) { } } -// Ensure a frame can set & read a field value. +// Ensure a frame can set & read a bsiGroup value. func TestFrame_SetValue(t *testing.T) { t.Run("OK", func(t *testing.T) { idx := test.MustOpenIndex() @@ -86,7 +86,7 @@ func TestFrame_SetValue(t *testing.T) { t.Fatal(err) } - // Set value on field. + // Set value on frame. if changed, err := f.SetValue(100, 21); err != nil { t.Fatal(err) } else if !changed {