merlimat closed pull request #1541: Forget to recycle MessageMetadata protobuf
object
URL: https://github.com/apache/incubator-pulsar/pull/1541
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
index 92a512de2..d866b2831 100644
---
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
+++
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
@@ -260,7 +260,7 @@ public void sendAsync(Message<T> message, SendCallback
callback) {
}
MessageImpl<T> msg = (MessageImpl<T>) message;
- MessageMetadata.Builder msgMetadata = msg.getMessageBuilder();
+ MessageMetadata.Builder msgMetadataBuilder = msg.getMessageBuilder();
ByteBuf payload = msg.getDataBuffer();
// If compression is enabled, we are compressing, otherwise it will
simply use the same buffer
@@ -286,35 +286,35 @@ public void sendAsync(Message<T> message, SendCallback
callback) {
return;
}
- if (!msg.isReplicated() && msgMetadata.hasProducerName()) {
+ if (!msg.isReplicated() && msgMetadataBuilder.hasProducerName()) {
callback.sendComplete(new
PulsarClientException.InvalidMessageException("Cannot re-use the same
message"));
compressedPayload.release();
return;
}
if (schemaVersion.isPresent()) {
-
msgMetadata.setSchemaVersion(ByteString.copyFrom(schemaVersion.get()));
+
msgMetadataBuilder.setSchemaVersion(ByteString.copyFrom(schemaVersion.get()));
}
try {
synchronized (this) {
long sequenceId;
- if (!msgMetadata.hasSequenceId()) {
+ if (!msgMetadataBuilder.hasSequenceId()) {
sequenceId = msgIdGeneratorUpdater.getAndIncrement(this);
- msgMetadata.setSequenceId(sequenceId);
+ msgMetadataBuilder.setSequenceId(sequenceId);
} else {
- sequenceId = msgMetadata.getSequenceId();
+ sequenceId = msgMetadataBuilder.getSequenceId();
}
- if (!msgMetadata.hasPublishTime()) {
- msgMetadata.setPublishTime(System.currentTimeMillis());
+ if (!msgMetadataBuilder.hasPublishTime()) {
+
msgMetadataBuilder.setPublishTime(System.currentTimeMillis());
- checkArgument(!msgMetadata.hasProducerName());
+ checkArgument(!msgMetadataBuilder.hasProducerName());
- msgMetadata.setProducerName(producerName);
+ msgMetadataBuilder.setProducerName(producerName);
if (conf.getCompressionType() != CompressionType.NONE) {
-
msgMetadata.setCompression(convertCompressionType(conf.getCompressionType()));
- msgMetadata.setUncompressedSize(uncompressedSize);
+
msgMetadataBuilder.setCompression(convertCompressionType(conf.getCompressionType()));
+
msgMetadataBuilder.setUncompressedSize(uncompressedSize);
}
}
@@ -332,8 +332,11 @@ public void sendAsync(Message<T> message, SendCallback
callback) {
doBatchSendAndAdd(msg, callback, payload);
}
} else {
- ByteBuf encryptedPayload = encryptMessage(msgMetadata,
compressedPayload);
- ByteBufPair cmd = sendMessage(producerId, sequenceId, 1,
msgMetadata.build(), encryptedPayload);
+ ByteBuf encryptedPayload =
encryptMessage(msgMetadataBuilder, compressedPayload);
+
+ MessageMetadata msgMetadata = msgMetadataBuilder.build();
+ ByteBufPair cmd = sendMessage(producerId, sequenceId, 1,
msgMetadata, encryptedPayload);
+ msgMetadataBuilder.recycle();
msgMetadata.recycle();
final OpSendMsg op = OpSendMsg.create(msg, cmd,
sequenceId, callback);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
