diff --git a/api.go b/api.go index d47ba1ff4..9bd3abdf4 100644 --- a/api.go +++ b/api.go @@ -355,7 +355,7 @@ func (api *API) UnmarshalFragment(ctx context.Context, indexName string, frameNa } // Retrieve frame. - f := api.Holder.Frame(indexName, frameName) + f := api.Holder.Field(indexName, frameName) if f == nil { return ErrFieldNotFound } @@ -495,7 +495,7 @@ func (api *API) Views(ctx context.Context, indexName string, frameName string) ( } // Retrieve views. - f := api.Holder.Frame(indexName, frameName) + f := api.Holder.Field(indexName, frameName) if f == nil { return nil, ErrFieldNotFound } @@ -512,7 +512,7 @@ func (api *API) DeleteView(ctx context.Context, indexName string, frameName stri } // Retrieve frame. - f := api.Holder.Frame(indexName, frameName) + f := api.Holder.Field(indexName, frameName) if f == nil { return ErrFieldNotFound } @@ -580,7 +580,7 @@ func (api *API) FrameAttrDiff(ctx context.Context, indexName string, frameName s } // Retrieve index from holder. - f := api.Holder.Frame(indexName, frameName) + f := api.Holder.Field(indexName, frameName) if f == nil { return nil, ErrFieldNotFound } diff --git a/cluster.go b/cluster.go index deabf2d06..a8f3573c5 100644 --- a/cluster.go +++ b/cluster.go @@ -1240,7 +1240,7 @@ func (c *Cluster) FollowResizeInstruction(instr *internal.ResizeInstruction) err srcURI := decodeURI(src.Node.URI) // Retrieve frame. - f := c.Holder.Frame(src.Index, src.Frame) + f := c.Holder.Field(src.Index, src.Frame) if f == nil { return ErrFieldNotFound } diff --git a/cluster_test.go b/cluster_test.go index f8903aafd..c0de34250 100644 --- a/cluster_test.go +++ b/cluster_test.go @@ -424,7 +424,7 @@ func TestCluster_ResizeStates(t *testing.T) { // Before starting the resize, get the CheckSum to use for // comparison later. - node0Frame := node0.Holder.Frame("i", "f") + node0Frame := node0.Holder.Field("i", "f") node0View := node0Frame.View("standard") node0Fragment := node0View.Fragment(1) node0Checksum := node0Fragment.Checksum() @@ -453,7 +453,7 @@ func TestCluster_ResizeStates(t *testing.T) { // Bits // Verify that node-1 contains the fragment (i/f/standard/1) transferred from node-0. - node1Frame := node1.Holder.Frame("i", "f") + node1Frame := node1.Holder.Field("i", "f") node1View := node1Frame.View("standard") node1Fragment := node1View.Fragment(1) diff --git a/executor.go b/executor.go index b3e4f5aad..d1e40d808 100644 --- a/executor.go +++ b/executor.go @@ -369,7 +369,7 @@ func (e *Executor) executeSumCountSlice(ctx context.Context, index string, c *pq frameName, _ := c.Args["frame"].(string) - frame := e.Holder.Frame(index, frameName) + frame := e.Holder.Field(index, frameName) if frame == nil { return ValCount{}, nil } @@ -407,7 +407,7 @@ func (e *Executor) executeMinSlice(ctx context.Context, index string, c *pql.Cal frameName, _ := c.Args["frame"].(string) - frame := e.Holder.Frame(index, frameName) + frame := e.Holder.Field(index, frameName) if frame == nil { return ValCount{}, nil } @@ -445,7 +445,7 @@ func (e *Executor) executeMaxSlice(ctx context.Context, index string, c *pql.Cal frameName, _ := c.Args["frame"].(string) - frame := e.Holder.Frame(index, frameName) + frame := e.Holder.Field(index, frameName) if frame == nil { return ValCount{}, nil } @@ -632,7 +632,7 @@ func (e *Executor) executeBitmapSlice(ctx context.Context, index string, c *pql. if frame == "" { frame = DefaultFrame } - f := e.Holder.Frame(index, frame) + f := e.Holder.Field(index, frame) if f == nil { return nil, ErrFieldNotFound } @@ -767,7 +767,7 @@ func (e *Executor) executeBSIGroupRangeSlice(ctx context.Context, index string, frameName, cond = k, vv } - f := e.Holder.Frame(index, frameName) + f := e.Holder.Field(index, frameName) if f == nil { return nil, ErrFieldNotFound } @@ -1108,7 +1108,7 @@ func (e *Executor) executeSetValue(ctx context.Context, index string, c *pql.Cal // Set values. for name, value := range args { // Retrieve frame. - frame := e.Holder.Frame(index, name) + frame := e.Holder.Field(index, name) if frame == nil { return ErrFieldNotFound } @@ -1157,7 +1157,7 @@ func (e *Executor) executeSetRowAttrs(ctx context.Context, index string, c *pql. } // Retrieve frame. - frame := e.Holder.Frame(index, frameName) + frame := e.Holder.Field(index, frameName) if frame == nil { return ErrFieldNotFound } @@ -1217,7 +1217,7 @@ func (e *Executor) executeBulkSetRowAttrs(ctx context.Context, index string, cal } // Retrieve frame. - f := e.Holder.Frame(index, frame) + f := e.Holder.Field(index, frame) if f == nil { return nil, ErrFieldNotFound } @@ -1255,7 +1255,7 @@ func (e *Executor) executeBulkSetRowAttrs(ctx context.Context, index string, cal // Bulk insert attributes by frame. for name, frameMap := range m { // Retrieve frame. - frame := e.Holder.Frame(index, name) + frame := e.Holder.Field(index, name) if frame == nil { return nil, ErrFieldNotFound } diff --git a/executor_test.go b/executor_test.go index b8f7aa317..af4278849 100644 --- a/executor_test.go +++ b/executor_test.go @@ -289,7 +289,7 @@ func TestExecutor_Execute_SetValue(t *testing.T) { t.Fatal(err) } - f := hldr.Frame("i", "f") + f := hldr.Field("i", "f") if value, exists, err := f.Value(10); err != nil { t.Fatal(err) } else if !exists { @@ -371,7 +371,7 @@ func TestExecutor_Execute_SetRowAttrs(t *testing.T) { t.Fatal(err) } - f := hldr.Frame("i", "f") + f := hldr.Field("i", "f") if m, err := f.RowAttrStore().Attrs(10); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(m, map[string]interface{}{"foo": "bar", "baz": int64(123), "bat": true}) { @@ -525,7 +525,7 @@ func TestExecutor_Execute_TopN_Attr(t *testing.T) { hldr.MustCreateRankedFragmentIfNotExists("i", "f", pilosa.ViewStandard, 0).SetBit(0, 1) hldr.MustCreateRankedFragmentIfNotExists("i", "f", pilosa.ViewStandard, 1).SetBit(10, SliceWidth) - if err := hldr.Frame("i", "f").RowAttrStore().SetAttrs(10, map[string]interface{}{"category": int64(123)}); err != nil { + if err := hldr.Field("i", "f").RowAttrStore().SetAttrs(10, map[string]interface{}{"category": int64(123)}); err != nil { t.Fatal(err) } e := test.NewExecutor(hldr.Holder, test.NewCluster(1)) @@ -548,7 +548,7 @@ func TestExecutor_Execute_TopN_Attr_Src(t *testing.T) { hldr.MustCreateRankedFragmentIfNotExists("i", "f", pilosa.ViewStandard, 0).SetBit(0, 1) hldr.MustCreateRankedFragmentIfNotExists("i", "f", pilosa.ViewStandard, 1).SetBit(10, SliceWidth) - if err := hldr.Frame("i", "f").RowAttrStore().SetAttrs(10, map[string]interface{}{"category": uint64(123)}); err != nil { + if err := hldr.Field("i", "f").RowAttrStore().SetAttrs(10, map[string]interface{}{"category": uint64(123)}); err != nil { t.Fatal(err) } e := test.NewExecutor(hldr.Holder, test.NewCluster(1)) diff --git a/holder.go b/holder.go index f0c6d027c..f4e47e3d0 100644 --- a/holder.go +++ b/holder.go @@ -390,8 +390,8 @@ func (h *Holder) DeleteIndex(name string) error { return nil } -// Frame returns the frame for an index and name. -func (h *Holder) Frame(index, name string) *Field { +// Field returns the field for an index and name. +func (h *Holder) Field(index, name string) *Field { idx := h.Index(index) if idx == nil { return nil @@ -401,7 +401,7 @@ func (h *Holder) Frame(index, name string) *Field { // View returns the view for an index, frame, and name. func (h *Holder) View(index, frame, name string) *View { - f := h.Frame(index, frame) + f := h.Field(index, frame) if f == nil { return nil } @@ -607,7 +607,7 @@ func (s *HolderSyncer) SyncHolder() error { } // Sync frame row attributes. - if err := s.syncFrame(di.Name, fi.Name); err != nil { + if err := s.syncField(di.Name, fi.Name); err != nil { return fmt.Errorf("frame sync error: index=%s, frame=%s, err=%s", di.Name, fi.Name, err) } @@ -634,7 +634,7 @@ func (s *HolderSyncer) SyncHolder() error { } } } - s.Stats.Histogram("syncFrame", float64(time.Since(tf)), 1.0) + s.Stats.Histogram("syncField", float64(time.Since(tf)), 1.0) tf = time.Now() // reset tf } s.Stats.Histogram("syncIndex", float64(time.Since(ti)), 1.0) @@ -689,10 +689,10 @@ func (s *HolderSyncer) syncIndex(index string) error { return nil } -// syncFrame synchronizes frame attributes with the rest of the cluster. -func (s *HolderSyncer) syncFrame(index, name string) error { +// syncField synchronizes field attributes with the rest of the cluster. +func (s *HolderSyncer) syncField(index, name string) error { // Retrieve frame reference. - f := s.Holder.Frame(index, name) + f := s.Holder.Field(index, name) if f == nil { return nil } @@ -740,7 +740,7 @@ func (s *HolderSyncer) syncFrame(index, name string) error { // syncFragment synchronizes a fragment with the rest of the cluster. func (s *HolderSyncer) syncFragment(index, frame, view string, slice uint64) error { // Retrieve local frame. - f := s.Holder.Frame(index, frame) + f := s.Holder.Field(index, frame) if f == nil { return ErrFieldNotFound } diff --git a/server.go b/server.go index d92c5949e..541ff12c6 100644 --- a/server.go +++ b/server.go @@ -471,7 +471,7 @@ func (s *Server) ReceiveMessage(pb proto.Message) error { return err } case *internal.CreateViewMessage: - f := s.Holder.Frame(obj.Index, obj.Frame) + f := s.Holder.Field(obj.Index, obj.Frame) if f == nil { return fmt.Errorf("Local Frame not found: %s", obj.Frame) } @@ -480,7 +480,7 @@ func (s *Server) ReceiveMessage(pb proto.Message) error { return err } case *internal.DeleteViewMessage: - f := s.Holder.Frame(obj.Index, obj.Frame) + f := s.Holder.Field(obj.Index, obj.Frame) if f == nil { return fmt.Errorf("Local Frame not found: %s", obj.Frame) } diff --git a/stats_test.go b/stats_test.go index 992055166..7f71cfabb 100644 --- a/stats_test.go +++ b/stats_test.go @@ -155,7 +155,7 @@ func TestStatsCount_SetColumnAttrs(t *testing.T) { called := false e := test.NewExecutor(hldr.Holder, test.NewCluster(1)) - frame := e.Holder.Frame("d", "f") + frame := e.Holder.Field("d", "f") if frame == nil { t.Fatal("frame not found") } diff --git a/test/cluster.go b/test/cluster.go index e293764ad..26ef44d30 100644 --- a/test/cluster.go +++ b/test/cluster.go @@ -137,7 +137,7 @@ func (t *TestCluster) SetBit(index, frame, view string, rowID, colID uint64, x * if c == nil { continue } - f := c.Holder.Frame(index, frame) + f := c.Holder.Field(index, frame) if f == nil { return fmt.Errorf("index/frame does not exist: %s/%s", index, frame) } @@ -384,7 +384,7 @@ func (t *TestCluster) FollowResizeInstruction(instr *internal.ResizeInstruction) destFragment := destCluster.Holder.Fragment(src.Index, src.Frame, src.View, src.Slice) if destFragment == nil { // Create fragment on destination if it doesn't exist. - f := destCluster.Holder.Frame(src.Index, src.Frame) + f := destCluster.Holder.Field(src.Index, src.Frame) v := f.View(src.View) var err error destFragment, err = v.CreateFragmentIfNotExists(src.Slice) diff --git a/utils_test.go b/utils_test.go index ccb39ef54..34b4f2967 100644 --- a/utils_test.go +++ b/utils_test.go @@ -128,7 +128,7 @@ func (t *ClusterCluster) SetBit(index, frame, view string, rowID, colID uint64, if c == nil { continue } - f := c.Holder.Frame(index, frame) + f := c.Holder.Field(index, frame) if f == nil { return fmt.Errorf("index/frame does not exist: %s/%s", index, frame) } @@ -373,7 +373,7 @@ func (t *ClusterCluster) FollowResizeInstruction(instr *internal.ResizeInstructi destFragment := destCluster.Holder.Fragment(src.Index, src.Frame, src.View, src.Slice) if destFragment == nil { // Create fragment on destination if it doesn't exist. - f := destCluster.Holder.Frame(src.Index, src.Frame) + f := destCluster.Holder.Field(src.Index, src.Frame) v := f.View(src.View) var err error destFragment, err = v.CreateFragmentIfNotExists(src.Slice)