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 #818] fix msg.Body compressed cause error in transaction message processing #679

Merged
merged 2 commits into from
Apr 25, 2022
Merged

[ISSUE #818] fix msg.Body compressed cause error in transaction message processing #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
847c11d
fix msg.Body compressed and not reset, cause error in transaction mes…
trxo Jun 16, 2021
5cef32e
Merge branch 'master' of github.com:apache/rocketmq-client-go
trxo Apr 21, 2022
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
13 changes: 7 additions & 6 deletions primitive/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,13 @@ const (
)

type Message struct {
Topic string
Body []byte
Flag int32
TransactionId string
Batch bool
Compress bool
Topic string
Body []byte
CompressedBody []byte
Flag int32
TransactionId string
Batch bool
Compress bool
// Queue is the queue that messages will be sent to. the value must be set if want to custom the queue of message,
// just ignore if not.
Queue *MessageQueue
Expand Down
14 changes: 10 additions & 4 deletions producer/producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ func (p *defaultProducer) tryCompressMsg(msg *primitive.Message) bool {
if e != nil {
return false
}
msg.Body = compressedBody
msg.CompressedBody = compressedBody
msg.Compress = true
return true
}
Expand All @@ -345,8 +345,14 @@ func (p *defaultProducer) buildSendRequest(mq *primitive.MessageQueue,
if !msg.Batch && msg.GetProperty(primitive.PropertyUniqueClientMessageIdKeyIndex) == "" {
msg.WithProperty(primitive.PropertyUniqueClientMessageIdKeyIndex, primitive.CreateUniqID())
}
sysFlag := 0

var (
sysFlag = 0
transferBody = msg.Body
)

if p.tryCompressMsg(msg) {
transferBody = msg.CompressedBody
sysFlag = primitive.SetCompressedFlag(sysFlag)
}
v := msg.GetProperty(primitive.PropertyTransactionPrepared)
Expand All @@ -373,10 +379,10 @@ func (p *defaultProducer) buildSendRequest(mq *primitive.MessageQueue,
if msg.Batch {
cmd = internal.ReqSendBatchMessage
reqv2 := &internal.SendMessageRequestV2Header{SendMessageRequestHeader: req}
return remote.NewRemotingCommand(cmd, reqv2, msg.Body)
return remote.NewRemotingCommand(cmd, reqv2, transferBody)
}

return remote.NewRemotingCommand(cmd, req, msg.Body)
return remote.NewRemotingCommand(cmd, req, transferBody)
}

func (p *defaultProducer) selectMessageQueue(msg *primitive.Message) *primitive.MessageQueue {
Expand Down