From 9ea300da2048edd82ec81b318950fce3f1143746 Mon Sep 17 00:00:00 2001 From: Matt Jaffee Date: Mon, 2 Jul 2018 08:34:58 -0500 Subject: [PATCH] unexport broadcaster --- broadcast.go | 18 ++++++------------ cluster.go | 4 ++-- field.go | 2 +- holder.go | 2 +- index.go | 2 +- server.go | 2 +- view.go | 2 +- 7 files changed, 13 insertions(+), 19 deletions(-) diff --git a/broadcast.go b/broadcast.go index 57f0bb496..37452292a 100644 --- a/broadcast.go +++ b/broadcast.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" ) -// Broadcaster is an interface for broadcasting messages. -type Broadcaster interface { +// broadcaster is an interface for broadcasting messages. +type broadcaster interface { SendSync(pb proto.Message) error SendAsync(pb proto.Message) error SendTo(to *Node, pb proto.Message) error @@ -35,24 +35,18 @@ func init() { } // NopBroadcaster represents a Broadcaster that doesn't do anything. -var NopBroadcaster Broadcaster +var NopBroadcaster broadcaster type nopBroadcaster struct{} // SendSync A no-op implementation of Broadcaster SendSync method. -func (n *nopBroadcaster) SendSync(pb proto.Message) error { - return nil -} +func (n nopBroadcaster) SendSync(pb proto.Message) error { return nil } // SendAsync A no-op implementation of Broadcaster SendAsync method. -func (n *nopBroadcaster) SendAsync(pb proto.Message) error { - return nil -} +func (n nopBroadcaster) SendAsync(pb proto.Message) error { return nil } // SendTo is a no-op implementation of Broadcaster SendTo method. -func (c *nopBroadcaster) SendTo(to *Node, pb proto.Message) error { - return nil -} +func (c nopBroadcaster) SendTo(to *Node, pb proto.Message) error { return nil } // Broadcast message types. const ( diff --git a/cluster.go b/cluster.go index 920c06d8d..f084da33c 100644 --- a/cluster.go +++ b/cluster.go @@ -240,7 +240,7 @@ type cluster struct { state string Coordinator string holder *Holder - broadcaster Broadcaster + broadcaster broadcaster joiningLeavingNodes chan nodeAction @@ -1310,7 +1310,7 @@ type resizeJob struct { ID int64 IDs map[string]bool Instructions []*internal.ResizeInstruction - Broadcaster Broadcaster + Broadcaster broadcaster action string result chan string diff --git a/field.go b/field.go index ed8d1811b..d68b26971 100644 --- a/field.go +++ b/field.go @@ -64,7 +64,7 @@ type Field struct { // Row attribute storage and cache rowAttrStore AttrStore - broadcaster Broadcaster + broadcaster broadcaster Stats StatsClient // Field options. diff --git a/holder.go b/holder.go index e4462519b..5d125b0fd 100644 --- a/holder.go +++ b/holder.go @@ -50,7 +50,7 @@ type Holder struct { // opened channel is closed once Open() completes. opened chan struct{} - Broadcaster Broadcaster + Broadcaster broadcaster NewAttrStore func(string) AttrStore diff --git a/index.go b/index.go index 79ffd69c0..19e28c760 100644 --- a/index.go +++ b/index.go @@ -46,7 +46,7 @@ type Index struct { // Column attribute storage and cache. columnAttrStore AttrStore - broadcaster Broadcaster + broadcaster broadcaster Stats StatsClient Logger Logger diff --git a/server.go b/server.go index fc85f890f..43af168ba 100644 --- a/server.go +++ b/server.go @@ -40,7 +40,7 @@ const ( ) // Ensure Server implements interfaces. -var _ Broadcaster = &Server{} +var _ broadcaster = &Server{} var _ MemberServer = &Server{} // Server represents a holder wrapped by a running HTTP server. diff --git a/view.go b/view.go index fab7d7e1b..c2ee45ea8 100644 --- a/view.go +++ b/view.go @@ -52,7 +52,7 @@ type View struct { // prevent sending multiple `CreateShardMessage` messages maxShard uint64 - broadcaster Broadcaster + broadcaster broadcaster stats StatsClient RowAttrStore AttrStore Logger Logger