ShannonDing commented on a change in pull request #187: [ISSUE #186] Fix
offsetSotre
URL: https://github.com/apache/rocketmq-client-go/pull/187#discussion_r322078980
##########
File path: consumer/offset_store.go
##########
@@ -206,85 +224,77 @@ func (r *remoteBrokerOffsetStore) persist(mqs
[]*primitive.MessageQueue) {
if len(mqs) == 0 {
return
}
- for idx := range mqs {
- mq := mqs[idx]
- offsets, exist := r.OffsetTable[mq.Topic]
- if !exist {
- continue
- }
- off, exist := offsets[mq.QueueId]
- if !exist {
+
+ used := make(map[primitive.MessageQueue]struct{}, 0)
+ for _, mq := range mqs {
+ used[*mq] = struct{}{}
+ }
+
+ for mq, off := range r.OffsetTable {
+ if _, ok := used[mq]; !ok {
+ delete(r.OffsetTable, mq)
continue
}
-
- err := r.updateConsumeOffsetToBroker(r.group, mq.Topic, off)
+ err := r.updateConsumeOffsetToBroker(r.group, mq, off)
if err != nil {
rlog.Warnf("update offset to broker error: %s, group:
%s, queue: %s, offset: %d",
- err.Error(), r.group, mq.String(), off.Offset)
+ err.Error(), r.group, mq.String(), off)
} else {
- rlog.Debugf("update offset to broker success, group:
%s, topic: %s, queue: %v", r.group, mq.Topic, off)
+ rlog.Debugf("update offset to broker success, group:
%s, topic: %s, queue: %v offset: %v", r.group, mq.Topic, mq, off)
}
}
}
func (r *remoteBrokerOffsetStore) remove(mq *primitive.MessageQueue) {
r.mutex.Lock()
defer r.mutex.Unlock()
- if mq == nil {
- return
- }
- offset, exist := r.OffsetTable[mq.Topic]
- if !exist {
- return
- }
- rlog.Infof("delete: %s", mq.String())
- delete(offset, mq.QueueId)
+
+ delete(r.OffsetTable, *mq)
+ rlog.Infof("delete queueID %v of brokerName: %v \n", mq.QueueId,
mq.BrokerName)
}
func (r *remoteBrokerOffsetStore) read(mq *primitive.MessageQueue, t readType)
int64 {
r.mutex.RLock()
- if t == _ReadFromMemory || t == _ReadMemoryThenStore {
- off := readFromMemory(r.OffsetTable, mq)
- if off >= 0 || (off == -1 && t == _ReadFromMemory) {
- r.mutex.RUnlock()
+ switch t {
+ case _ReadFromMemory, _ReadMemoryThenStore:
+ defer r.mutex.RUnlock()
+ off, exist := r.OffsetTable[*mq]
+ if exist {
return off
}
- }
- off, err := r.fetchConsumeOffsetFromBroker(r.group, mq)
- if err != nil {
- rlog.Errorf("fetch offset of %s error: %s", mq.String(),
err.Error())
+ if t == _ReadFromMemory {
+ return -1
+ }
+ case _ReadFromStore:
+ off, err := r.fetchConsumeOffsetFromBroker(r.group, mq)
+ if err != nil {
+ rlog.Errorf("fetch offset of %s error: %s",
mq.String(), err.Error())
+ r.mutex.RUnlock()
+ return -1
+ }
r.mutex.RUnlock()
- return -1
+ r.update(mq, off, true)
+ return off
+ default:
Review comment:
it is better to keep "defer r.mutex.RUnlock()" as default.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
