Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

renaming

pull/3379/head
chrislu 3 years ago
parent
21b6b07dd8
commit
ac66227798
4 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      weed/mq/broker/broker_append.go
  2. 4
      weed/mq/broker/broker_grpc_server_subscribe.go
  3. 16
      weed/mq/broker/broker_server.go
  4. 4
      weed/mq/broker/topic_manager.go

10
weed/mq/broker/broker_append.go
View File

@ -14,7 +14,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
) )
func (broker *MessageBroker) appendToFile(targetFile string, topicConfig *mq_pb.TopicConfiguration, data []byte) error {
func (broker *MessageQueueBroker) appendToFile(targetFile string, topicConfig *mq_pb.TopicConfiguration, data []byte) error {
assignResult, uploadResult, err2 := broker.assignAndUpload(topicConfig, data) assignResult, uploadResult, err2 := broker.assignAndUpload(topicConfig, data)
if err2 != nil { if err2 != nil {
@ -46,7 +46,7 @@ func (broker *MessageBroker) appendToFile(targetFile string, topicConfig *mq_pb.
return nil return nil
} }
func (broker *MessageBroker) assignAndUpload(topicConfig *mq_pb.TopicConfiguration, data []byte) (*operation.AssignResult, *operation.UploadResult, error) {
func (broker *MessageQueueBroker) assignAndUpload(topicConfig *mq_pb.TopicConfiguration, data []byte) (*operation.AssignResult, *operation.UploadResult, error) {
var assignResult = &operation.AssignResult{} var assignResult = &operation.AssignResult{}
@ -106,9 +106,9 @@ func (broker *MessageBroker) assignAndUpload(topicConfig *mq_pb.TopicConfigurati
return assignResult, uploadResult, nil return assignResult, uploadResult, nil
} }
var _ = filer_pb.FilerClient(&MessageBroker{})
var _ = filer_pb.FilerClient(&MessageQueueBroker{})
func (broker *MessageBroker) WithFilerClient(streamingMode bool, fn func(filer_pb.SeaweedFilerClient) error) (err error) {
func (broker *MessageQueueBroker) WithFilerClient(streamingMode bool, fn func(filer_pb.SeaweedFilerClient) error) (err error) {
for _, filer := range broker.option.Filers { for _, filer := range broker.option.Filers {
if err = pb.WithFilerClient(streamingMode, filer, broker.grpcDialOption, fn); err != nil { if err = pb.WithFilerClient(streamingMode, filer, broker.grpcDialOption, fn); err != nil {
@ -125,6 +125,6 @@ func (broker *MessageBroker) WithFilerClient(streamingMode bool, fn func(filer_p
} }
func (broker *MessageBroker) AdjustedUrl(location *filer_pb.Location) string {
func (broker *MessageQueueBroker) AdjustedUrl(location *filer_pb.Location) string {
return location.Url return location.Url
} }

4
weed/mq/broker/broker_grpc_server_subscribe.go
View File

@ -16,7 +16,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/pb/mq_pb" "github.com/chrislusf/seaweedfs/weed/pb/mq_pb"
) )
func (broker *MessageBroker) Subscribe(stream mq_pb.SeaweedMessaging_SubscribeServer) error {
func (broker *MessageQueueBroker) Subscribe(stream mq_pb.SeaweedMessaging_SubscribeServer) error {
// process initial request // process initial request
in, err := stream.Recv() in, err := stream.Recv()
@ -138,7 +138,7 @@ func (broker *MessageBroker) Subscribe(stream mq_pb.SeaweedMessaging_SubscribeSe
} }
func (broker *MessageBroker) readPersistedLogBuffer(tp *TopicPartition, startTime time.Time, eachLogEntryFn func(logEntry *filer_pb.LogEntry) error) (err error) {
func (broker *MessageQueueBroker) readPersistedLogBuffer(tp *TopicPartition, startTime time.Time, eachLogEntryFn func(logEntry *filer_pb.LogEntry) error) (err error) {
startTime = startTime.UTC() startTime = startTime.UTC()
startDate := fmt.Sprintf("%04d-%02d-%02d", startTime.Year(), startTime.Month(), startTime.Day()) startDate := fmt.Sprintf("%04d-%02d-%02d", startTime.Year(), startTime.Month(), startTime.Day())
startHourMinute := fmt.Sprintf("%02d-%02d", startTime.Hour(), startTime.Minute()) startHourMinute := fmt.Sprintf("%02d-%02d", startTime.Hour(), startTime.Minute())

16
weed/mq/broker/broker_server.go
View File

@ -13,7 +13,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
) )
type MessageBrokerOption struct {
type MessageQueueBrokerOption struct {
Filers []pb.ServerAddress Filers []pb.ServerAddress
DefaultReplication string DefaultReplication string
MaxMB int MaxMB int
@ -22,16 +22,16 @@ type MessageBrokerOption struct {
Cipher bool Cipher bool
} }
type MessageBroker struct {
type MessageQueueBroker struct {
mq_pb.UnimplementedSeaweedMessagingServer mq_pb.UnimplementedSeaweedMessagingServer
option *MessageBrokerOption
option *MessageQueueBrokerOption
grpcDialOption grpc.DialOption grpcDialOption grpc.DialOption
topicManager *TopicManager topicManager *TopicManager
} }
func NewMessageBroker(option *MessageBrokerOption, grpcDialOption grpc.DialOption) (messageBroker *MessageBroker, err error) {
func NewMessageBroker(option *MessageQueueBrokerOption, grpcDialOption grpc.DialOption) (messageBroker *MessageQueueBroker, err error) {
messageBroker = &MessageBroker{
messageBroker = &MessageQueueBroker{
option: option, option: option,
grpcDialOption: grpcDialOption, grpcDialOption: grpcDialOption,
} }
@ -45,7 +45,7 @@ func NewMessageBroker(option *MessageBrokerOption, grpcDialOption grpc.DialOptio
return messageBroker, nil return messageBroker, nil
} }
func (broker *MessageBroker) keepConnectedToOneFiler() {
func (broker *MessageQueueBroker) keepConnectedToOneFiler() {
for { for {
for _, filer := range broker.option.Filers { for _, filer := range broker.option.Filers {
@ -101,13 +101,13 @@ func (broker *MessageBroker) keepConnectedToOneFiler() {
} }
func (broker *MessageBroker) withFilerClient(streamingMode bool, filer pb.ServerAddress, fn func(filer_pb.SeaweedFilerClient) error) error {
func (broker *MessageQueueBroker) withFilerClient(streamingMode bool, filer pb.ServerAddress, fn func(filer_pb.SeaweedFilerClient) error) error {
return pb.WithFilerClient(streamingMode, filer, broker.grpcDialOption, fn) return pb.WithFilerClient(streamingMode, filer, broker.grpcDialOption, fn)
} }
func (broker *MessageBroker) withMasterClient(streamingMode bool, master pb.ServerAddress, fn func(client master_pb.SeaweedClient) error) error {
func (broker *MessageQueueBroker) withMasterClient(streamingMode bool, master pb.ServerAddress, fn func(client master_pb.SeaweedClient) error) error {
return pb.WithMasterClient(streamingMode, master, broker.grpcDialOption, func(client master_pb.SeaweedClient) error { return pb.WithMasterClient(streamingMode, master, broker.grpcDialOption, func(client master_pb.SeaweedClient) error {
return fn(client) return fn(client)

4
weed/mq/broker/topic_manager.go
View File

@ -36,10 +36,10 @@ type TopicControl struct {
type TopicManager struct { type TopicManager struct {
sync.Mutex sync.Mutex
topicControls map[TopicPartition]*TopicControl topicControls map[TopicPartition]*TopicControl
broker *MessageBroker
broker *MessageQueueBroker
} }
func NewTopicManager(messageBroker *MessageBroker) *TopicManager {
func NewTopicManager(messageBroker *MessageQueueBroker) *TopicManager {
return &TopicManager{ return &TopicManager{
topicControls: make(map[TopicPartition]*TopicControl), topicControls: make(map[TopicPartition]*TopicControl),
broker: messageBroker, broker: messageBroker,

Write Preview
Loading…
Cancel
Save