gaoran10 commented on a change in pull request #8347:
URL: https://github.com/apache/pulsar/pull/8347#discussion_r511910517
##########
File path:
pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Markers.java
##########
@@ -309,24 +306,24 @@ private static ByteBuf newTxnMarker(MarkerType
markerType, long sequenceId, long
MessageMetadata msgMetadata = msgMetadataBuilder.build();
ByteBuf payload;
- if (messageIdData.isPresent()) {
- PulsarMarkers.TxnCommitMarker commitMarker =
PulsarMarkers.TxnCommitMarker.newBuilder()
-
.setMessageId(messageIdData.get())
-
.build();
- int size = commitMarker.getSerializedSize();
- payload = PooledByteBufAllocator.DEFAULT.buffer(size);
- ByteBufCodedOutputStream outStream =
ByteBufCodedOutputStream.get(payload);
- commitMarker.writeTo(outStream);
- } else {
- payload = PooledByteBufAllocator.DEFAULT.buffer();
- }
+ PulsarMarkers.TxnCommitMarker.Builder commitMarkerBuilder =
PulsarMarkers.TxnCommitMarker.newBuilder();
+
+ messageIdDataList.ifPresent(commitMarkerBuilder::addAllMessageId);
+ PulsarMarkers.TxnCommitMarker commitMarker =
commitMarkerBuilder.build();
Review comment:
Ok
##########
File path:
pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Markers.java
##########
@@ -309,24 +306,24 @@ private static ByteBuf newTxnMarker(MarkerType
markerType, long sequenceId, long
MessageMetadata msgMetadata = msgMetadataBuilder.build();
ByteBuf payload;
- if (messageIdData.isPresent()) {
- PulsarMarkers.TxnCommitMarker commitMarker =
PulsarMarkers.TxnCommitMarker.newBuilder()
-
.setMessageId(messageIdData.get())
-
.build();
- int size = commitMarker.getSerializedSize();
- payload = PooledByteBufAllocator.DEFAULT.buffer(size);
- ByteBufCodedOutputStream outStream =
ByteBufCodedOutputStream.get(payload);
- commitMarker.writeTo(outStream);
- } else {
- payload = PooledByteBufAllocator.DEFAULT.buffer();
- }
+ PulsarMarkers.TxnCommitMarker.Builder commitMarkerBuilder =
PulsarMarkers.TxnCommitMarker.newBuilder();
+
+ messageIdDataList.ifPresent(commitMarkerBuilder::addAllMessageId);
+ PulsarMarkers.TxnCommitMarker commitMarker =
commitMarkerBuilder.build();
+ int size = commitMarker.getSerializedSize();
+ payload = PooledByteBufAllocator.DEFAULT.buffer(size);
+ ByteBufCodedOutputStream outStream =
ByteBufCodedOutputStream.get(payload);
+ commitMarker.writeTo(outStream);
try {
return Commands.serializeMetadataAndPayload(ChecksumType.Crc32c,
msgMetadata, payload);
} finally {
payload.release();
msgMetadata.recycle();
msgMetadataBuilder.recycle();
+ if (commitMarkerBuilder != null) {
Review comment:
I'll fix this.
----------------------------------------------------------------
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]
