go fmt

weed/mq/broker/broker_grpc_sub.go

@@ -186,7 +186,7 @@ func (b *MessageQueueBroker) getRequestPosition(initMessage *mq_pb.SubscribeMess
 		startPosition = log_buffer.NewMessagePosition(offset.StartTsNs, -2)
 		return
 	}
-	if storedOffset, err := b.readConsumerGroupOffset(initMessage); err == nil{
+	if storedOffset, err := b.readConsumerGroupOffset(initMessage); err == nil {
 		startPosition = log_buffer.NewMessagePosition(storedOffset, -2)
 		return
 	}

weed/mq/broker/broker_grpc_sub_follow.go

@@ -12,7 +12,6 @@ import (
 	"time"
 )
 
-
 func (b *MessageQueueBroker) SubscribeFollowMe(stream mq_pb.SeaweedMessaging_SubscribeFollowMeServer) (err error) {
 	var req *mq_pb.SubscribeFollowMeRequest
 	req, err = stream.Recv()

weed/mq/broker/broker_server.go

@@ -130,7 +130,6 @@ func (b *MessageQueueBroker) GetGrpcDialOption() grpc.DialOption {
 	return b.grpcDialOption
 }
 
-
 func (b *MessageQueueBroker) GetFiler() pb.ServerAddress {
 	return b.currentFiler
 }

weed/mq/client/cmd/weed_sub_kv/subscriber_kv.go

@@ -44,7 +44,7 @@ func main() {
 	subscriber := sub_client.NewTopicSubscriber(brokers, subscriberConfig, contentConfig, processorConfig)
 
 	counter := 0
-	subscriber.SetEachMessageFunc(func(key, value []byte) (error) {
+	subscriber.SetEachMessageFunc(func(key, value []byte) error {
 		counter++
 		println(string(key), "=>", string(value), counter)
 		return nil

weed/mq/client/cmd/weed_sub_record/subscriber_record.go

@@ -71,7 +71,7 @@ func main() {
 	subscriber := sub_client.NewTopicSubscriber(brokers, subscriberConfig, contentConfig, processorConfig)
 
 	counter := 0
-	subscriber.SetEachMessageFunc(func(key, value []byte) (error) {
+	subscriber.SetEachMessageFunc(func(key, value []byte) error {
 		counter++
 		record := &schema_pb.RecordValue{}
 		proto.Unmarshal(value, record)

weed/mq/client/sub_client/connect_to_sub_coordinator.go

@@ -110,7 +110,7 @@ func (sub *TopicSubscriber) onEachPartition(assigned *mq_pb.BrokerPartitionAssig
 					Concurrency:    sub.ProcessorConfig.PerPartitionConcurrency,
 				},
 			},
-		});err != nil {
+		}); err != nil {
 			glog.V(0).Infof("subscriber %s connected to partition %+v at %v: %v", sub.ContentConfig.Topic, assigned.Partition, assigned.LeaderBroker, err)
 		}
 
@@ -120,16 +120,16 @@ func (sub *TopicSubscriber) onEachPartition(assigned *mq_pb.BrokerPartitionAssig
 			defer sub.OnCompletionFunc()
 		}
 
-		partitionOffsetChan:= make(chan int64, 1024)
+		partitionOffsetChan := make(chan int64, 1024)
 		defer func() {
 			close(partitionOffsetChan)
 		}()
 
-		concurrentPartitionLimit := int(sub.ProcessorConfig.MaxPartitionCount)
-		if concurrentPartitionLimit <= 0 {
-			concurrentPartitionLimit = 1
+		perPartitionConcurrency := int(sub.ProcessorConfig.PerPartitionConcurrency)
+		if perPartitionConcurrency <= 0 {
+			perPartitionConcurrency = 1
 		}
-		executors := util.NewLimitedConcurrentExecutor(concurrentPartitionLimit)
+		executors := util.NewLimitedConcurrentExecutor(perPartitionConcurrency)
 
 		go func() {
 			for ack := range partitionOffsetChan {
@@ -162,7 +162,7 @@ func (sub *TopicSubscriber) onEachPartition(assigned *mq_pb.BrokerPartitionAssig
 					processErr := sub.OnEachMessageFunc(m.Data.Key, m.Data.Value)
 					if processErr == nil {
 						partitionOffsetChan <- m.Data.TsNs
-					}else{
+					} else {
 						lastErr = processErr
 					}
 				})

weed/mq/client/sub_client/subscribe.go

@@ -9,7 +9,6 @@ import (
 )
 
 type ProcessorState struct {
-
 }
 
 // Subscribe subscribes to a topic's specified partitions.

weed/mq/sub_coordinator/consumer_group.go

@@ -43,10 +43,10 @@ func NewConsumerGroupInstance(instanceId string) *ConsumerGroupInstance {
 	}
 }
 func (cg *ConsumerGroup) OnAddConsumerGroupInstance(consumerGroupInstance string, topic *mq_pb.Topic, maxPartitionCount, rebalanceSeconds int32) {
-	cg.onConsumerGroupInstanceChange(true, "add consumer instance " + consumerGroupInstance, maxPartitionCount, rebalanceSeconds)
+	cg.onConsumerGroupInstanceChange(true, "add consumer instance "+consumerGroupInstance, maxPartitionCount, rebalanceSeconds)
 }
 func (cg *ConsumerGroup) OnRemoveConsumerGroupInstance(consumerGroupInstance string, topic *mq_pb.Topic, maxPartitionCount, rebalanceSeconds int32) {
-	cg.onConsumerGroupInstanceChange(false, "remove consumer instance " + consumerGroupInstance, maxPartitionCount, rebalanceSeconds)
+	cg.onConsumerGroupInstanceChange(false, "remove consumer instance "+consumerGroupInstance, maxPartitionCount, rebalanceSeconds)
 }
 
 func (cg *ConsumerGroup) onConsumerGroupInstanceChange(isAdd bool, reason string, maxPartitionCount, rebalanceSeconds int32) {

weed/mq/sub_coordinator/filer_client_accessor.go

@@ -15,7 +15,7 @@ import (
 
 type FilerClientAccessor struct {
 	GetFiler          func() pb.ServerAddress
-	GetGrpcDialOption func()grpc.DialOption
+	GetGrpcDialOption func() grpc.DialOption
 }
 
 func (fca *FilerClientAccessor) WithFilerClient(streamingMode bool, fn func(filer_pb.SeaweedFilerClient) error) error {

weed/mq/sub_coordinator/inflight_message_tracker.go

@@ -26,6 +26,7 @@ func (imt *InflightMessageTracker) InflightMessage(key []byte, tsNs int64) {
 	imt.messages[string(key)] = tsNs
 	imt.timestamps.Add(tsNs)
 }
+
 // IsMessageAcknowledged returns true if the message has been acknowledged.
 // If the message is older than the oldest inflight messages, returns false.
 // returns false if the message is inflight.
@@ -47,6 +48,7 @@ func (imt *InflightMessageTracker) IsMessageAcknowledged(key []byte, tsNs int64)
 
 	return true
 }
+
 // AcknowledgeMessage acknowledges the message with the key and timestamp.
 func (imt *InflightMessageTracker) AcknowledgeMessage(key []byte, tsNs int64) bool {
 	imt.mu.Lock()
@@ -71,12 +73,14 @@ type RingBuffer struct {
 	head   int
 	size   int
 }
+
 // NewRingBuffer creates a new RingBuffer of the given capacity.
 func NewRingBuffer(capacity int) *RingBuffer {
 	return &RingBuffer{
 		buffer: make([]int64, capacity),
 	}
 }
+
 // Add adds a new timestamp to the ring buffer.
 func (rb *RingBuffer) Add(timestamp int64) {
 	rb.buffer[rb.head] = timestamp
@@ -85,6 +89,7 @@ func (rb *RingBuffer) Add(timestamp int64) {
 		rb.size++
 	}
 }
+
 // Remove removes the specified timestamp from the ring buffer.
 func (rb *RingBuffer) Remove(timestamp int64) {
 	// Perform binary search