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

Jump to bottom

[Refactor] refactor duplicated code lines and fix typo errors #1039

Merged
merged 7 commits into from
Jul 3, 2023
Merged

[Refactor] refactor duplicated code lines and fix typo errors #1039

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
76dd0ef
[Refactor] refactor duplicated code lines and fix typo errors
Jun 26, 2023
a3a59ac
[typo] revert
Jun 29, 2023
46c7e57
[typo] revert
Jun 29, 2023
9052f9c
[typo] revert
Jun 29, 2023
9138dd9
[refactor] delete redunpdant code lines
Jun 29, 2023
8d34019
[typo] revert some words
Jun 29, 2023
c40581d
[fix] set useTxn when use transaction
Jun 30, 2023
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
88 changes: 42 additions & 46 deletions pulsar/producer_partition.go
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,17 +702,18 @@ func addRequestToBatch(smm *pb.SingleMessageMetadata, p *partitionProducer,
uncompressedPayload []byte,
request *sendRequest, msg *ProducerMessage, deliverAt time.Time,
schemaVersion []byte, multiSchemaEnabled bool) bool {
var ok bool
var useTxn bool
var mostSigBits uint64
var leastSigBits uint64
if request.transaction != nil {
txnID := request.transaction.GetTxnID()
ok = p.batchBuilder.Add(smm, p.sequenceIDGenerator, uncompressedPayload, request,
msg.ReplicationClusters, deliverAt, schemaVersion, multiSchemaEnabled, true, txnID.MostSigBits,
txnID.LeastSigBits)
} else {
ok = p.batchBuilder.Add(smm, p.sequenceIDGenerator, uncompressedPayload, request,
msg.ReplicationClusters, deliverAt, schemaVersion, multiSchemaEnabled, false, 0, 0)
mostSigBits = txnID.MostSigBits
leastSigBits = txnID.LeastSigBits
shibd marked this conversation as resolved.
Show resolved Hide resolved
}
return ok

return p.batchBuilder.Add(smm, p.sequenceIDGenerator, uncompressedPayload, request,
msg.ReplicationClusters, deliverAt, schemaVersion, multiSchemaEnabled, useTxn, mostSigBits,
leastSigBits)
}

func (p *partitionProducer) genMetadata(msg *ProducerMessage,
Expand Down Expand Up @@ -756,6 +757,14 @@ func (p *partitionProducer) updateMetadataSeqID(mm *pb.MessageMetadata, msg *Pro
}
}

func (p *partitionProducer) updateSingleMessageMetadataSeqID(smm *pb.SingleMessageMetadata, msg *ProducerMessage) {
shibd marked this conversation as resolved.
Show resolved Hide resolved
if msg.SequenceID != nil {
smm.SequenceId = proto.Uint64(uint64(*msg.SequenceID))
} else {
smm.SequenceId = proto.Uint64(internal.GetAndAdd(p.sequenceIDGenerator, 1))
}
}

func (p *partitionProducer) genSingleMessageMetadataInBatch(msg *ProducerMessage,
uncompressedSize int) (smm *pb.SingleMessageMetadata) {
smm = &pb.SingleMessageMetadata{
Expand All @@ -778,14 +787,7 @@ func (p *partitionProducer) genSingleMessageMetadataInBatch(msg *ProducerMessage
smm.Properties = internal.ConvertFromStringMap(msg.Properties)
}

var sequenceID uint64
if msg.SequenceID != nil {
sequenceID = uint64(*msg.SequenceID)
} else {
sequenceID = internal.GetAndAdd(p.sequenceIDGenerator, 1)
}

smm.SequenceId = proto.Uint64(sequenceID)
p.updateSingleMessageMetadataSeqID(smm, msg)

return
}
Expand All @@ -805,35 +807,29 @@ func (p *partitionProducer) internalSingleSend(mm *pb.MessageMetadata,
}

sid := *mm.SequenceId
var err error
var useTxn bool
var mostSigBits uint64
var leastSigBits uint64

if request.transaction != nil {
txnID := request.transaction.GetTxnID()
err = internal.SingleSend(
buffer,
p.producerID,
sid,
mm,
payloadBuf,
p.encryptor,
maxMessageSize,
true,
txnID.MostSigBits,
txnID.LeastSigBits,
)
} else {
err = internal.SingleSend(
buffer,
p.producerID,
sid,
mm,
payloadBuf,
p.encryptor,
maxMessageSize,
false,
0,
0,
)
}
mostSigBits = txnID.MostSigBits
shibd marked this conversation as resolved.
Show resolved Hide resolved
leastSigBits = txnID.LeastSigBits
}

err := internal.SingleSend(
buffer,
p.producerID,
sid,
mm,
payloadBuf,
p.encryptor,
maxMessageSize,
useTxn,
mostSigBits,
leastSigBits,
)

if err != nil {
request.callback(nil, request.msg, err)
p.releaseSemaphoreAndMem(int64(len(msg.Payload)))
Expand Down Expand Up @@ -993,7 +989,7 @@ func (p *partitionProducer) failTimeoutMessages() {
}
}

// flag the send has completed with error, flush make no effect
// mark the sending has completed with error, flush make no effect
pi.Complete()
pi.Unlock()

Expand Down Expand Up @@ -1106,7 +1102,7 @@ func (p *partitionProducer) SendAsync(ctx context.Context, msg *ProducerMessage,

func (p *partitionProducer) internalSendAsync(ctx context.Context, msg *ProducerMessage,
callback func(MessageID, *ProducerMessage, error), flushImmediately bool) {
//Register transaction operation to transaction and the transaction coordinator.
// Register transaction operation to transaction and the transaction coordinator.
var newCallback func(MessageID, *ProducerMessage, error)
if msg.Transaction != nil {
transactionImpl := (msg.Transaction).(*transaction)
Expand Down Expand Up @@ -1392,7 +1388,7 @@ func (p *partitionProducer) _setConn(conn internal.Connection) {
// _getConn returns internal connection field of this partition producer atomically.
// Note: should only be called by this partition producer before attempting to use the connection
func (p *partitionProducer) _getConn() internal.Connection {
// Invariant: The conn must be non-nill for the lifetime of the partitionProducer.
// Invariant: The connection must be non-nil for the lifetime of the partitionProducer.
// For this reason we leave this cast unchecked and panic() if the
// invariant is broken
return p.conn.Load().(internal.Connection)
Expand Down