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

rename CreateField to createBSIGroup

Browse source
This commit is contained in:
Travis Turner 2018-06-04 16:03:42 -05:00
parent 5d39ba25df
commit 54d94f1aca
No known key found for this signature in database
GPG key ID: 7F08008DFD9314C9
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api.go
View file

@ -501,7 +501,7 @@ func (api *API) CreateField(ctx context.Context, indexName string, frameName str
}
// Create new bsiGroup.
if err := f.CreateField(bsig); err != nil {
if err := f.createBSIGroup(bsig); err != nil {
return errors.Wrap(err, "creating bsigroup")
}

12
frame.go
View file

@ -333,10 +333,10 @@ func (f *Frame) applyOptions(opt FrameOptions) error {
Max: opt.Max,
}
// Validate bsiGroup.
if err := ValidateField(bsig); err != nil {
if err := bsig.validate(); err != nil {
return err
}
if err := f.CreateField(bsig); err != nil {
if err := f.createBSIGroup(bsig); err != nil {
return errors.Wrap(err, "creating bsigroup")
}
case FrameTypeTime:
@ -400,8 +400,8 @@ func (f *Frame) hasField(name string) bool {
return false
}
// CreateField creates a new field on the frame.
func (f *Frame) CreateField(bsig *bsiGroup) error {
// createBSIGroup creates a new field on the frame.
func (f *Frame) createBSIGroup(bsig *bsiGroup) error {
f.mu.Lock()
defer f.mu.Unlock()
@ -415,7 +415,7 @@ func (f *Frame) CreateField(bsig *bsiGroup) error {
// addField adds a single field to fields.
func (f *Frame) addField(bsig *bsiGroup) error {
if err := ValidateField(bsig); err != nil {
if err := bsig.validate(); err != nil {
return errors.Wrap(err, "validating bsigroup")
} else if f.hasField(bsig.Name) {
return ErrFieldExists
@ -1156,7 +1156,7 @@ func (b *bsiGroup) BaseValueBetween(min, max int64) (baseValueMin, baseValueMax
return baseValueMin, baseValueMax, false
}
func ValidateField(b *bsiGroup) error {
func (b *bsiGroup) validate() error {
if b.Name == "" {
return ErrFieldNameRequired
} else if !IsValidFieldType(b.Type) {

2
server.go
View file

@ -473,7 +473,7 @@ func (s *Server) ReceiveMessage(pb proto.Message) error {
case *internal.CreateFieldMessage:
f := s.Holder.Frame(obj.Index, obj.Frame)
field := decodeField(obj.Field)
if err := f.CreateField(field); err != nil {
if err := f.createBSIGroup(field); err != nil {
return err
}
case *internal.DeleteFieldMessage: