From 7a05f32a172991edfb3a8bf1ef01bc1c982e77e0 Mon Sep 17 00:00:00 2001 From: Matt Jaffee Date: Wed, 20 Jun 2018 11:14:09 -0500 Subject: [PATCH] remove NewAttrStore field on Server - unused --- server.go | 4 ---- test/pilosa.go | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/server.go b/server.go index 14d9bb2b6..c544ae6fc 100644 --- a/server.go +++ b/server.go @@ -66,7 +66,6 @@ type Server struct { BroadcastReceiver BroadcastReceiver systemInfo SystemInfo gcNotifier GCNotifier - NewAttrStore func(string) AttrStore logger Logger ln net.Listener @@ -109,7 +108,6 @@ func OptServerDataDir(dir string) ServerOption { func OptServerAttrStoreFunc(af func(string) AttrStore) ServerOption { return func(s *Server) error { - s.NewAttrStore = af s.Holder.NewAttrStore = af return nil } @@ -232,8 +230,6 @@ func NewServer(opts ...ServerOption) (*Server, error) { gcNotifier: NopGCNotifier, - NewAttrStore: NewNopAttrStore, - antiEntropyInterval: time.Minute * 10, metricInterval: 0, diagnosticInterval: 0, diff --git a/test/pilosa.go b/test/pilosa.go index dca6243fb..a65207c91 100644 --- a/test/pilosa.go +++ b/test/pilosa.go @@ -164,8 +164,7 @@ func (m *Main) Reopen() error { return errors.Wrap(err, "setting up server") } - m.Server.NewAttrStore = boltdb.NewAttrStore - m.Server.Holder.NewAttrStore = m.Server.NewAttrStore + m.Server.Holder.NewAttrStore = boltdb.NewAttrStore // Run new program. if err := m.Start(); err != nil {