scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 02:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename a lot of *Field cases to *BSIGroup

Browse source
This commit is contained in:
Travis Turner 2018-06-04 16:47:08 -05:00
parent b10463485e
commit dcf4daf24e
No known key found for this signature in database
GPG key ID: 7F08008DFD9314C9
6 changed files with 71 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
executor.go
View file

@ -386,7 +386,7 @@ func (e *Executor) executeSumCountSlice(ctx context.Context, index string, c *pq
return ValCount{}, nil
}
fragment := e.Holder.Fragment(index, frameName, ViewFieldPrefix+fieldName, slice)
fragment := e.Holder.Fragment(index, frameName, viewBSIGroupPrefix+fieldName, slice)
if fragment == nil {
return ValCount{}, nil
}
@ -425,7 +425,7 @@ func (e *Executor) executeFieldMinSlice(ctx context.Context, index string, c *pq
return ValCount{}, nil
}
fragment := e.Holder.Fragment(index, frameName, ViewFieldPrefix+fieldName, slice)
fragment := e.Holder.Fragment(index, frameName, viewBSIGroupPrefix+fieldName, slice)
if fragment == nil {
return ValCount{}, nil
}
@ -464,7 +464,7 @@ func (e *Executor) executeFieldMaxSlice(ctx context.Context, index string, c *pq
return ValCount{}, nil
}
fragment := e.Holder.Fragment(index, frameName, ViewFieldPrefix+fieldName, slice)
fragment := e.Holder.Fragment(index, frameName, viewBSIGroupPrefix+fieldName, slice)
if fragment == nil {
return ValCount{}, nil
}
@ -802,11 +802,11 @@ func (e *Executor) executeFieldRangeSlice(ctx context.Context, index string, c *
// Find field.
field := f.bsiGroup(fieldName)
if field == nil {
return nil, ErrFieldNotFound
return nil, ErrBSIGroupNotFound
}
// Retrieve fragment.
frag := e.Holder.Fragment(index, frame, ViewFieldPrefix+fieldName, slice)
frag := e.Holder.Fragment(index, frame, viewBSIGroupPrefix+fieldName, slice)
if frag == nil {
return NewRow(), nil
}
@ -832,7 +832,7 @@ func (e *Executor) executeFieldRangeSlice(ctx context.Context, index string, c *
// Find field.
field := f.bsiGroup(fieldName)
if field == nil {
return nil, ErrFieldNotFound
return nil, ErrBSIGroupNotFound
}
baseValueMin, baseValueMax, outOfRange := field.BaseValueBetween(predicates[0], predicates[1])
@ -841,7 +841,7 @@ func (e *Executor) executeFieldRangeSlice(ctx context.Context, index string, c *
}
// Retrieve fragment.
frag := e.Holder.Fragment(index, frame, ViewFieldPrefix+fieldName, slice)
frag := e.Holder.Fragment(index, frame, viewBSIGroupPrefix+fieldName, slice)
if frag == nil {
return NewRow(), nil
}
@ -865,7 +865,7 @@ func (e *Executor) executeFieldRangeSlice(ctx context.Context, index string, c *
// Find field.
field := f.bsiGroup(fieldName)
if field == nil {
return nil, ErrFieldNotFound
return nil, ErrBSIGroupNotFound
}
baseValue, outOfRange := field.BaseValue(cond.Op, value)
@ -874,7 +874,7 @@ func (e *Executor) executeFieldRangeSlice(ctx context.Context, index string, c *
}
// Retrieve fragment.
frag := e.Holder.Fragment(index, frame, ViewFieldPrefix+fieldName, slice)
frag := e.Holder.Fragment(index, frame, viewBSIGroupPrefix+fieldName, slice)
if frag == nil {
return NewRow(), nil
}
@ -1137,7 +1137,7 @@ func (e *Executor) executeSetValue(ctx context.Context, index string, c *pql.Cal
return err
}
default:
return ErrInvalidFieldValueType
return ErrInvalidBSIGroupValueType
}
frame.Stats.Count("SetValue", 1, 1.0)
}

2
executor_test.go
View file

@ -951,7 +951,7 @@ func TestExecutor_Execute_FieldRange(t *testing.T) {
})
t.Run("ErrFieldNotFound", func(t *testing.T) {
if _, err := e.Execute(context.Background(), "i", test.MustParse(`Range(frame=foo, bad_field >= 20)`), nil, nil); err != pilosa.ErrFieldNotFound {
if _, err := e.Execute(context.Background(), "i", test.MustParse(`Range(frame=foo, bad_field >= 20)`), nil, nil); err != pilosa.ErrBSIGroupNotFound {
t.Fatal(err)
}
})

89
frame.go
View file

@ -378,7 +378,7 @@ func (f *Frame) Close() error {
return nil
}
// bsiGroup returns a field by name.
// bsiGroup returns a bsiGroup by name.
func (f *Frame) bsiGroup(name string) *bsiGroup {
f.mu.RLock()
defer f.mu.RUnlock()
@ -390,8 +390,8 @@ func (f *Frame) bsiGroup(name string) *bsiGroup {
return nil
}
// hasField returns true if a field exists on the frame.
func (f *Frame) hasField(name string) bool {
// hasBSIGroup returns true if a bsiGroup exists on the frame.
func (f *Frame) hasBSIGroup(name string) bool {
for _, bsig := range f.bsiGroups {
if bsig.Name == name {
return true
@ -400,25 +400,25 @@ func (f *Frame) hasField(name string) bool {
return false
}
// createBSIGroup creates a new field on the frame.
// createBSIGroup creates a new bsiGroup on the frame.
func (f *Frame) createBSIGroup(bsig *bsiGroup) error {
f.mu.Lock()
defer f.mu.Unlock()
// Append bsiGroup.
if err := f.addField(bsig); err != nil {
if err := f.addBSIGroup(bsig); err != nil {
return err
}
f.saveMeta()
return nil
}
// addField adds a single field to fields.
func (f *Frame) addField(bsig *bsiGroup) error {
// addBSIGroup adds a single bsiGroup to bsiGroups.
func (f *Frame) addBSIGroup(bsig *bsiGroup) error {
if err := bsig.validate(); err != nil {
return errors.Wrap(err, "validating bsigroup")
} else if f.hasField(bsig.Name) {
return ErrFieldExists
} else if f.hasBSIGroup(bsig.Name) {
return ErrBSIGroupExists
}
// Add bsiGroup to list.
@ -432,18 +432,19 @@ func (f *Frame) addField(bsig *bsiGroup) error {
return nil
}
// TODO: merge this into the un-exported deleteBSIGroup.
// DeleteField deletes an existing field on the schema.
func (f *Frame) DeleteField(name string) error {
f.mu.Lock()
defer f.mu.Unlock()
// Remove field.
if err := f.deleteField(name); err != nil {
if err := f.deleteBSIGroup(name); err != nil {
return err
}
// Remove views.
viewName := ViewFieldPrefix + name
viewName := viewBSIGroupPrefix + name
if view := f.views[viewName]; view != nil {
delete(f.views, viewName)
@ -457,8 +458,8 @@ func (f *Frame) DeleteField(name string) error {
return nil
}
// deleteField removes a single field from fields.
func (f *Frame) deleteField(name string) error {
// deleteBSIGroup removes a single bsiGroup from bsiGroups.
func (f *Frame) deleteBSIGroup(name string) error {
for i, bsig := range f.bsiGroups {
if bsig.Name == name {
copy(f.bsiGroups[i:], f.bsiGroups[i+1:])
@ -466,7 +467,7 @@ func (f *Frame) deleteField(name string) error {
return nil
}
}
return ErrFieldNotFound
return ErrBSIGroupNotFound
}
// TimeQuantum returns the time quantum for the frame.
@ -708,11 +709,11 @@ func (f *Frame) ClearBit(name string, rowID, colID uint64, t *time.Time) (change
func (f *Frame) FieldValue(columnID uint64, name string) (value int64, exists bool, err error) {
field := f.bsiGroup(name)
if field == nil {
return 0, false, ErrFieldNotFound
return 0, false, ErrBSIGroupNotFound
}
// Fetch target view.
view := f.View(ViewFieldPrefix + name)
view := f.View(viewBSIGroupPrefix + name)
if view == nil {
return 0, false, nil
}
@ -731,15 +732,15 @@ func (f *Frame) SetValue(columnID uint64, value int64) (changed bool, err error)
// Fetch field and validate value.
field := f.bsiGroup(f.name)
if field == nil {
return false, ErrFieldNotFound
return false, ErrBSIGroupNotFound
} else if value < field.Min {
return false, ErrFieldValueTooLow
return false, ErrBSIGroupValueTooLow
} else if value > field.Max {
return false, ErrFieldValueTooHigh
return false, ErrBSIGroupValueTooHigh
}
// Fetch target view.
view, err := f.CreateViewIfNotExists(ViewFieldPrefix + f.name)
view, err := f.CreateViewIfNotExists(viewBSIGroupPrefix + f.name)
if err != nil {
return false, errors.Wrap(err, "creating view")
}
@ -755,10 +756,10 @@ func (f *Frame) SetValue(columnID uint64, value int64) (changed bool, err error)
func (f *Frame) FieldSum(filter *Row, name string) (sum, count int64, err error) {
field := f.bsiGroup(name)
if field == nil {
return 0, 0, ErrFieldNotFound
return 0, 0, ErrBSIGroupNotFound
}
view := f.View(ViewFieldPrefix + name)
view := f.View(viewBSIGroupPrefix + name)
if view == nil {
return 0, 0, nil
}
@ -770,24 +771,24 @@ func (f *Frame) FieldSum(filter *Row, name string) (sum, count int64, err error)
return int64(vsum) + (int64(vcount) * field.Min), int64(vcount), nil
}
// FieldMin returns the min for a field.
// FieldMin returns the min for a bsiGroup.
// An optional filtering row can be provided.
func (f *Frame) FieldMin(filter *Row, name string) (min, count int64, err error) {
field := f.bsiGroup(name)
if field == nil {
return 0, 0, ErrFieldNotFound
bsig := f.bsiGroup(name)
if bsig == nil {
return 0, 0, ErrBSIGroupNotFound
}
view := f.View(ViewFieldPrefix + name)
view := f.View(viewBSIGroupPrefix + name)
if view == nil {
return 0, 0, nil
}
vmin, vcount, err := view.FieldMin(filter, field.BitDepth())
vmin, vcount, err := view.FieldMin(filter, bsig.BitDepth())
if err != nil {
return 0, 0, err
}
return int64(vmin) + field.Min, int64(vcount), nil
return int64(vmin) + bsig.Min, int64(vcount), nil
}
// FieldMax returns the max for a field.
@ -795,10 +796,10 @@ func (f *Frame) FieldMin(filter *Row, name string) (min, count int64, err error)
func (f *Frame) FieldMax(filter *Row, name string) (max, count int64, err error) {
field := f.bsiGroup(name)
if field == nil {
return 0, 0, ErrFieldNotFound
return 0, 0, ErrBSIGroupNotFound
}
view := f.View(ViewFieldPrefix + name)
view := f.View(viewBSIGroupPrefix + name)
if view == nil {
return 0, 0, nil
}
@ -814,13 +815,13 @@ func (f *Frame) FieldRange(name string, op pql.Token, predicate int64) (*Row, er
// Retrieve and validate field.
field := f.bsiGroup(name)
if field == nil {
return nil, ErrFieldNotFound
return nil, ErrBSIGroupNotFound
} else if predicate < field.Min || predicate > field.Max {
return nil, nil
}
// Retrieve field's view.
view := f.View(ViewFieldPrefix + name)
view := f.View(viewBSIGroupPrefix + name)
if view == nil {
return nil, nil
}
@ -837,13 +838,13 @@ func (f *Frame) FieldRangeBetween(name string, predicateMin, predicateMax int64)
// Retrieve and validate field.
field := f.bsiGroup(name)
if field == nil {
return nil, ErrFieldNotFound
return nil, ErrBSIGroupNotFound
} else if predicateMin > predicateMax {
return nil, ErrInvalidBetweenValue
}
// Retrieve field's view.
view := f.View(ViewFieldPrefix + name)
view := f.View(viewBSIGroupPrefix + name)
if view == nil {
return nil, nil
}
@ -915,7 +916,7 @@ func (f *Frame) Import(rowIDs, columnIDs []uint64, timestamps []*time.Time) erro
// ImportValue bulk imports range-encoded value data.
func (f *Frame) ImportValue(fieldName string, columnIDs []uint64, values []int64) error {
viewName := ViewFieldPrefix + fieldName
viewName := viewBSIGroupPrefix + fieldName
// Get the field so we know bitDepth.
field := f.bsiGroup(fieldName)
if field == nil {
@ -927,9 +928,9 @@ func (f *Frame) ImportValue(fieldName string, columnIDs []uint64, values []int64
for i := range columnIDs {
columnID, value := columnIDs[i], values[i]
if int64(value) > field.Max {
return fmt.Errorf("%v, columnID=%v, value=%v", ErrFieldValueTooHigh, columnID, value)
return fmt.Errorf("%v, columnID=%v, value=%v", ErrBSIGroupValueTooHigh, columnID, value)
} else if int64(value) < field.Min {
return fmt.Errorf("%v, columnID=%v, value=%v", ErrFieldValueTooLow, columnID, value)
return fmt.Errorf("%v, columnID=%v, value=%v", ErrBSIGroupValueTooLow, columnID, value)
}
// Attach value to each field view.
@ -1025,7 +1026,7 @@ func (o *FrameOptions) Validate() error {
// TODO: cacheType, cacheSize validation
case FrameTypeInt:
if o.Min > o.Max {
return ErrInvalidFieldRange
return ErrInvalidBSIGroupRange
}
case FrameTypeTime:
if o.TimeQuantum == "" || !o.TimeQuantum.Valid() {
@ -1075,7 +1076,7 @@ const (
bsiGroupTypeInt = "int"
)
func IsValidFieldType(v string) bool {
func isValidBSIGroupType(v string) bool {
switch v {
case bsiGroupTypeInt:
return true
@ -1158,11 +1159,11 @@ func (b *bsiGroup) BaseValueBetween(min, max int64) (baseValueMin, baseValueMax
func (b *bsiGroup) validate() error {
if b.Name == "" {
return ErrFieldNameRequired
} else if !IsValidFieldType(b.Type) {
return ErrInvalidFieldType
return ErrBSIGroupNameRequired
} else if !isValidBSIGroupType(b.Type) {
return ErrInvalidBSIGroupType
} else if b.Min > b.Max {
return ErrInvalidFieldRange
return ErrInvalidBSIGroupRange
}
return nil
}

6
frame_test.go
View file

@ -159,7 +159,7 @@ func TestFrame_SetValue(t *testing.T) {
}
// Set value.
if _, err := f.SetValue(100, 21); err != pilosa.ErrFieldNotFound {
if _, err := f.SetValue(100, 21); err != pilosa.ErrBSIGroupNotFound {
t.Fatalf("unexpected error: %s", err)
}
})
@ -178,7 +178,7 @@ func TestFrame_SetValue(t *testing.T) {
}
// Set value.
if _, err := f.SetValue(100, 15); err != pilosa.ErrFieldValueTooLow {
if _, err := f.SetValue(100, 15); err != pilosa.ErrBSIGroupValueTooLow {
t.Fatalf("unexpected error: %s", err)
}
})
@ -197,7 +197,7 @@ func TestFrame_SetValue(t *testing.T) {
}
// Set value.
if _, err := f.SetValue(100, 31); err != pilosa.ErrFieldValueTooHigh {
if _, err := f.SetValue(100, 31); err != pilosa.ErrBSIGroupValueTooHigh {
t.Fatalf("unexpected error: %s", err)
}
})

20
pilosa.go
View file

@ -36,16 +36,16 @@ var (
ErrFrameExists = errors.New("frame already exists")
ErrFrameNotFound = errors.New("frame not found")
ErrFieldNotFound = errors.New("field not found")
ErrFieldExists = errors.New("field already exists")
ErrFieldNameRequired = errors.New("field name required")
ErrInvalidFieldType = errors.New("invalid field type")
ErrInvalidFieldRange = errors.New("invalid field range")
ErrInvalidFieldValueType = errors.New("invalid field value type")
ErrFieldValueTooLow = errors.New("field value too low")
ErrFieldValueTooHigh = errors.New("field value too high")
ErrInvalidRangeOperation = errors.New("invalid range operation")
ErrInvalidBetweenValue = errors.New("invalid value for between operation")
ErrBSIGroupNotFound = errors.New("bsigroup not found")
ErrBSIGroupExists = errors.New("bsigroup already exists")
ErrBSIGroupNameRequired = errors.New("bsigroup name required")
ErrInvalidBSIGroupType = errors.New("invalid bsigroup type")
ErrInvalidBSIGroupRange = errors.New("invalid bsigroup range")
ErrInvalidBSIGroupValueType = errors.New("invalid bsigroup value type")
ErrBSIGroupValueTooLow = errors.New("bsigroup value too low")
ErrBSIGroupValueTooHigh = errors.New("bsigroup value too high")
ErrInvalidRangeOperation = errors.New("invalid range operation")
ErrInvalidBetweenValue = errors.New("invalid value for between operation")
ErrInvalidView = errors.New("invalid view")
ErrInvalidCacheType = errors.New("invalid cache type")

4
view.go
View file

@ -31,7 +31,7 @@ import (
const (
ViewStandard = "standard"
ViewFieldPrefix = "field_"
viewBSIGroupPrefix = "bsig_"
)
// IsValidView returns true if name is valid.
@ -98,7 +98,7 @@ func (v *View) Path() string { return v.path }
func (v *View) Open() error {
// Never keep a cache for field views.
if strings.HasPrefix(v.name, ViewFieldPrefix) {
if strings.HasPrefix(v.name, viewBSIGroupPrefix) {
v.cacheType = CacheTypeNone
}