diff --git a/api.go b/api.go index 2c25dcd66..ed0a925a6 100644 --- a/api.go +++ b/api.go @@ -337,7 +337,7 @@ func (api *API) ExportCSV(ctx context.Context, indexName string, fieldName strin } // Find the fragment. - f := api.holder.Fragment(indexName, fieldName, ViewStandard, shard) + f := api.holder.fragment(indexName, fieldName, ViewStandard, shard) if f == nil { return ErrFragmentNotFound } @@ -379,7 +379,7 @@ func (api *API) MarshalFragment(ctx context.Context, indexName string, fieldName } // Retrieve fragment from holder. - f := api.holder.Fragment(indexName, fieldName, ViewStandard, shard) + f := api.holder.fragment(indexName, fieldName, ViewStandard, shard) if f == nil { return nil, ErrFragmentNotFound } @@ -437,7 +437,7 @@ func (api *API) FragmentBlockData(ctx context.Context, body io.Reader) ([]byte, } // Retrieve fragment from holder. - f := api.holder.Fragment(req.Index, req.Field, ViewStandard, req.Shard) + f := api.holder.fragment(req.Index, req.Field, ViewStandard, req.Shard) if f == nil { return nil, ErrFragmentNotFound } @@ -461,7 +461,7 @@ func (api *API) FragmentBlocks(ctx context.Context, indexName string, fieldName } // Retrieve fragment from holder. - f := api.holder.Fragment(indexName, fieldName, ViewStandard, shard) + f := api.holder.fragment(indexName, fieldName, ViewStandard, shard) if f == nil { return nil, ErrFragmentNotFound } diff --git a/cluster.go b/cluster.go index 907d42c0d..a5108a2f9 100644 --- a/cluster.go +++ b/cluster.go @@ -450,7 +450,7 @@ func (c *cluster) setState(state string) { // been removed. // It's safe to do a cleanup after state changes back to normal. if doCleanup { - var cleaner HolderCleaner + var cleaner holderCleaner cleaner.Node = c.Node cleaner.Holder = c.holder cleaner.Cluster = c diff --git a/executor.go b/executor.go index 4194e7b4e..5b4e12351 100644 --- a/executor.go +++ b/executor.go @@ -427,7 +427,7 @@ func (e *executor) executeSumCountShard(ctx context.Context, index string, c *pq return ValCount{}, nil } - fragment := e.Holder.Fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) + fragment := e.Holder.fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) if fragment == nil { return ValCount{}, nil } @@ -465,7 +465,7 @@ func (e *executor) executeMinShard(ctx context.Context, index string, c *pql.Cal return ValCount{}, nil } - fragment := e.Holder.Fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) + fragment := e.Holder.fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) if fragment == nil { return ValCount{}, nil } @@ -503,7 +503,7 @@ func (e *executor) executeMaxShard(ctx context.Context, index string, c *pql.Cal return ValCount{}, nil } - fragment := e.Holder.Fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) + fragment := e.Holder.fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) if fragment == nil { return ValCount{}, nil } @@ -623,7 +623,7 @@ func (e *executor) executeTopNShard(ctx context.Context, index string, c *pql.Ca field = defaultField } - f := e.Holder.Fragment(index, field, ViewStandard, shard) + f := e.Holder.fragment(index, field, ViewStandard, shard) if f == nil { return nil, nil } @@ -693,7 +693,7 @@ func (e *executor) executeBitmapShard(ctx context.Context, index string, c *pql. return nil, fmt.Errorf("Row() must specify %v", rowLabel) } - frag := e.Holder.Fragment(index, fieldName, ViewStandard, shard) + frag := e.Holder.fragment(index, fieldName, ViewStandard, shard) if frag == nil { return NewRow(), nil } @@ -785,7 +785,7 @@ func (e *executor) executeRangeShard(ctx context.Context, index string, c *pql.C // Union bitmaps across all time-based views. row := &Row{} for _, view := range viewsByTimeRange(ViewStandard, startTime, endTime, q) { - f := e.Holder.Fragment(index, fieldName, view, shard) + f := e.Holder.fragment(index, fieldName, view, shard) if f == nil { continue } @@ -836,7 +836,7 @@ func (e *executor) executeBSIGroupRangeShard(ctx context.Context, index string, } // Retrieve fragment. - frag := e.Holder.Fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) + frag := e.Holder.fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) if frag == nil { return NewRow(), nil } @@ -871,7 +871,7 @@ func (e *executor) executeBSIGroupRangeShard(ctx context.Context, index string, } // Retrieve fragment. - frag := e.Holder.Fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) + frag := e.Holder.fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) if frag == nil { return NewRow(), nil } @@ -904,7 +904,7 @@ func (e *executor) executeBSIGroupRangeShard(ctx context.Context, index string, } // Retrieve fragment. - frag := e.Holder.Fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) + frag := e.Holder.fragment(index, fieldName, viewBSIGroupPrefix+fieldName, shard) if frag == nil { return NewRow(), nil } diff --git a/holder.go b/holder.go index e02daebb3..bad001787 100644 --- a/holder.go +++ b/holder.go @@ -411,8 +411,8 @@ func (h *Holder) view(index, field, name string) *View { return f.view(name) } -// Fragment returns the fragment for an index, field & shard. -func (h *Holder) Fragment(index, field, view string, shard uint64) *Fragment { +// fragment returns the fragment for an index, field & shard. +func (h *Holder) fragment(index, field, view string, shard uint64) *Fragment { v := h.view(index, field, view) if v == nil { return nil @@ -561,9 +561,9 @@ func (h *Holder) logStartup() error { return nil } -// HolderSyncer is an active anti-entropy tool that compares the local holder +// holderSyncer is an active anti-entropy tool that compares the local holder // with a remote holder based on block checksums and resolves differences. -type HolderSyncer struct { +type holderSyncer struct { mu sync.Mutex Holder *Holder @@ -579,7 +579,7 @@ type HolderSyncer struct { } // IsClosing returns true if the syncer has been marked to close. -func (s *HolderSyncer) IsClosing() bool { +func (s *holderSyncer) IsClosing() bool { select { case <-s.Closing: return true @@ -589,7 +589,7 @@ func (s *HolderSyncer) IsClosing() bool { } // SyncHolder compares the holder on host with the local holder and resolves differences. -func (s *HolderSyncer) SyncHolder() error { +func (s *holderSyncer) SyncHolder() error { s.mu.Lock() // only allow one instance of SyncHolder to be running at a time defer s.mu.Unlock() ti := time.Now() @@ -651,7 +651,7 @@ func (s *HolderSyncer) SyncHolder() error { } // syncIndex synchronizes index attributes with the rest of the cluster. -func (s *HolderSyncer) syncIndex(index string) error { +func (s *holderSyncer) syncIndex(index string) error { // Retrieve index reference. idx := s.Holder.Index(index) if idx == nil { @@ -694,7 +694,7 @@ func (s *HolderSyncer) syncIndex(index string) error { } // syncField synchronizes field attributes with the rest of the cluster. -func (s *HolderSyncer) syncField(index, name string) error { +func (s *holderSyncer) syncField(index, name string) error { // Retrieve field reference. f := s.Holder.Field(index, name) if f == nil { @@ -740,7 +740,7 @@ func (s *HolderSyncer) syncField(index, name string) error { } // syncFragment synchronizes a fragment with the rest of the cluster. -func (s *HolderSyncer) syncFragment(index, field, view string, shard uint64) error { +func (s *holderSyncer) syncFragment(index, field, view string, shard uint64) error { // Retrieve local field. f := s.Holder.Field(index, field) if f == nil { @@ -773,8 +773,8 @@ func (s *HolderSyncer) syncFragment(index, field, view string, shard uint64) err return nil } -// HolderCleaner removes fragments and data files that are no longer used. -type HolderCleaner struct { +// holderCleaner removes fragments and data files that are no longer used. +type holderCleaner struct { Node *Node Holder *Holder @@ -785,7 +785,7 @@ type HolderCleaner struct { } // IsClosing returns true if the cleaner has been marked to close. -func (c *HolderCleaner) IsClosing() bool { +func (c *holderCleaner) IsClosing() bool { select { case <-c.Closing: return true @@ -796,7 +796,7 @@ func (c *HolderCleaner) IsClosing() bool { // CleanHolder compares the holder with the cluster state and removes // any unnecessary fragments and files. -func (c *HolderCleaner) CleanHolder() error { +func (c *holderCleaner) CleanHolder() error { for _, index := range c.Holder.Indexes() { // Verify cleaner has not closed. if c.IsClosing() { diff --git a/holder_internal_test.go b/holder_internal_test.go index fb725fe0a..d7953b9ee 100644 --- a/holder_internal_test.go +++ b/holder_internal_test.go @@ -218,7 +218,7 @@ func TestHolderCleaner_CleanHolder(t *testing.T) { cluster.ReplicaN = 2 // Set up cleaner for replication 2. - cleaner2 := HolderCleaner{ + cleaner2 := holderCleaner{ Node: cluster.Nodes[0], Holder: hldr0.Holder, Cluster: cluster, @@ -255,7 +255,7 @@ func TestHolderCleaner_CleanHolder(t *testing.T) { cluster.ReplicaN = 1 // Set up cleaner for replication 1. - cleaner1 := HolderCleaner{ + cleaner1 := holderCleaner{ Node: cluster.Nodes[0], Holder: hldr0.Holder, Cluster: cluster, @@ -279,7 +279,7 @@ func TestHolderCleaner_CleanHolder(t *testing.T) { t.Fatalf("unexpected columns(%d/200): %+v", i, a) } - f := hldr.Fragment("i", "f0", ViewStandard, 1) + f := hldr.fragment("i", "f0", ViewStandard, 1) if f != nil { t.Fatalf("expected fragment to be deleted: (%d/i/f0): %+v", i, f) } diff --git a/server.go b/server.go index d14e3c37d..0e03365ae 100644 --- a/server.go +++ b/server.go @@ -70,7 +70,7 @@ type Server struct { diagnosticInterval time.Duration maxWritesPerRequest int isCoordinator bool - syncer HolderSyncer + syncer holderSyncer primaryTranslateStore TranslateStore diff --git a/utils_internal_test.go b/utils_internal_test.go index 939e8e04c..f7309961c 100644 --- a/utils_internal_test.go +++ b/utils_internal_test.go @@ -368,8 +368,8 @@ func (t *ClusterCluster) FollowResizeInstruction(instr *internal.ResizeInstructi srcNode := DecodeNode(src.Node) srcCluster := t.clusterByID(srcNode.ID) - srcFragment := srcCluster.holder.Fragment(src.Index, src.Field, src.View, src.Shard) - destFragment := destCluster.holder.Fragment(src.Index, src.Field, src.View, src.Shard) + srcFragment := srcCluster.holder.fragment(src.Index, src.Field, src.View, src.Shard) + destFragment := destCluster.holder.fragment(src.Index, src.Field, src.View, src.Shard) if destFragment == nil { // Create fragment on destination if it doesn't exist. f := destCluster.holder.Field(src.Index, src.Field)