mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2025-07-15 23:57:23 +08:00
refactor
This commit is contained in:
parent
d558a58946
commit
4f5c4c3388
@ -97,21 +97,6 @@ func (b *MessageQueueBroker) SubscribeMessage(req *mq_pb.SubscribeMessageRequest
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *MessageQueueBroker) GetOrGenerateLocalPartition(t topic.Topic, partition topic.Partition) (localTopicPartition *topic.LocalPartition, getOrGenError error) {
|
|
||||||
// get or generate a local partition
|
|
||||||
conf, readConfErr := b.readTopicConfFromFiler(t)
|
|
||||||
if readConfErr != nil {
|
|
||||||
glog.Errorf("topic %v not found: %v", t, readConfErr)
|
|
||||||
return nil, fmt.Errorf("topic %v not found: %v", t, readConfErr)
|
|
||||||
}
|
|
||||||
localTopicPartition, _, getOrGenError = b.doGetOrGenLocalPartition(t, partition, conf)
|
|
||||||
if getOrGenError != nil {
|
|
||||||
glog.Errorf("topic %v partition %v not setup: %v", t, partition, getOrGenError)
|
|
||||||
return nil, fmt.Errorf("topic %v partition %v not setup: %v", t, partition, getOrGenError)
|
|
||||||
}
|
|
||||||
return localTopicPartition, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getRequestPosition(offset *mq_pb.PartitionOffset) (startPosition log_buffer.MessagePosition) {
|
func getRequestPosition(offset *mq_pb.PartitionOffset) (startPosition log_buffer.MessagePosition) {
|
||||||
if offset.StartTsNs != 0 {
|
if offset.StartTsNs != 0 {
|
||||||
startPosition = log_buffer.NewMessagePosition(offset.StartTsNs, -2)
|
startPosition = log_buffer.NewMessagePosition(offset.StartTsNs, -2)
|
||||||
|
@ -56,6 +56,21 @@ func (b *MessageQueueBroker) readTopicConfFromFiler(t topic.Topic) (conf *mq_pb.
|
|||||||
return conf, nil
|
return conf, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *MessageQueueBroker) GetOrGenerateLocalPartition(t topic.Topic, partition topic.Partition) (localTopicPartition *topic.LocalPartition, getOrGenError error) {
|
||||||
|
// get or generate a local partition
|
||||||
|
conf, readConfErr := b.readTopicConfFromFiler(t)
|
||||||
|
if readConfErr != nil {
|
||||||
|
glog.Errorf("topic %v not found: %v", t, readConfErr)
|
||||||
|
return nil, fmt.Errorf("topic %v not found: %v", t, readConfErr)
|
||||||
|
}
|
||||||
|
localTopicPartition, _, getOrGenError = b.doGetOrGenLocalPartition(t, partition, conf)
|
||||||
|
if getOrGenError != nil {
|
||||||
|
glog.Errorf("topic %v partition %v not setup: %v", t, partition, getOrGenError)
|
||||||
|
return nil, fmt.Errorf("topic %v partition %v not setup: %v", t, partition, getOrGenError)
|
||||||
|
}
|
||||||
|
return localTopicPartition, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (b *MessageQueueBroker) doGetOrGenLocalPartition(t topic.Topic, partition topic.Partition, conf *mq_pb.ConfigureTopicResponse) (localPartition *topic.LocalPartition, isGenerated bool, err error) {
|
func (b *MessageQueueBroker) doGetOrGenLocalPartition(t topic.Topic, partition topic.Partition, conf *mq_pb.ConfigureTopicResponse) (localPartition *topic.LocalPartition, isGenerated bool, err error) {
|
||||||
b.accessLock.Lock()
|
b.accessLock.Lock()
|
||||||
defer b.accessLock.Unlock()
|
defer b.accessLock.Unlock()
|
||||||
|
Loading…
Reference in New Issue
Block a user