Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #651] fix an issue where a map read operation was not protected by the lock #652

Merged
merged 1 commit into from
Jun 8, 2021
Merged

[ISSUE #651] fix an issue where a map read operation was not protected by the lock #652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions producer/selector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"hash/fnv"
"math/rand"
"sync"
"sync/atomic"
"time"

"github.com/apache/rocketmq-client-go/v2/primitive"
Expand Down Expand Up @@ -64,35 +63,32 @@ func (r *randomQueueSelector) Select(message *primitive.Message, queues []*primi
// roundRobinQueueSelector choose the queue by roundRobin.
type roundRobinQueueSelector struct {
sync.Locker
indexer map[string]*int32
indexer map[string]*uint32
}

func NewRoundRobinQueueSelector() QueueSelector {
s := &roundRobinQueueSelector{
Locker: new(sync.Mutex),
indexer: map[string]*int32{},
indexer: map[string]*uint32{},
}
return s
}

func (r *roundRobinQueueSelector) Select(message *primitive.Message, queues []*primitive.MessageQueue) *primitive.MessageQueue {
t := message.Topic
if _, exist := r.indexer[t]; !exist {
r.Lock()
if _, exist := r.indexer[t]; !exist {
var v = int32(0)
r.indexer[t] = &v
}
r.Unlock()
var idx *uint32

r.Lock()
idx, exist := r.indexer[t]
if !exist {
var v uint32 = 0
idx = &v
r.indexer[t] = idx
}
index := r.indexer[t]
*idx++
r.Unlock()

i := atomic.AddInt32(index, 1)
if i < 0 {
i = -i
atomic.StoreInt32(index, 0)
}
qIndex := int(i) % len(queues)
qIndex := *idx % uint32(len(queues))
return queues[qIndex]
}

Expand Down