Skip to content

[fix][client] Fix inconsistent compression threshold behavior across batching modes #24102

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

Merged
liangyepianzhou merged 3 commits into from
Mar 25, 2025
Merged

[fix][client] Fix inconsistent compression threshold behavior across batching modes #24102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a602a3
[fix][client] Unify the data size check during compression
Mar 20, 2025
098c863
fix
Mar 24, 2025
a765f5c
[test] Covers the case where the message size is equal to the threshold
Mar 25, 2025
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
21 changes: 18 additions & 3 deletions pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerConsumerInternalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public void testRetentionPolicyByProducingMessages() throws Exception {

@Test
public void testProducerCompressionMinMsgBodySize() throws PulsarClientException {
byte[] msg1022 = new byte[1022];
byte[] msg1024 = new byte[1024];
byte[] msg1025 = new byte[1025];
final String topicName = BrokerTestUtil.newUniqueName("persistent://my-property/my-ns/tp_");
@Cleanup
Expand All @@ -256,7 +256,7 @@ public void testProducerCompressionMinMsgBodySize() throws PulsarClientException
producer.conf.setCompressionType(CompressionType.LZ4);
// disable batch
producer.conf.setBatchingEnabled(false);
producer.newMessage().value(msg1022).send();
producer.newMessage().value(msg1024).send();
MessageImpl<byte[]> message = (MessageImpl<byte[]>) consumer.receive();
CompressionType compressionType = message.getCompressionType();
assertEquals(compressionType, CompressionType.NONE);
Expand All @@ -267,13 +267,28 @@ public void testProducerCompressionMinMsgBodySize() throws PulsarClientException

// enable batch
producer.conf.setBatchingEnabled(true);
producer.newMessage().value(msg1022).send();
producer.newMessage().value(msg1024).send();
message = (MessageImpl<byte[]>) consumer.receive();
compressionType = message.getCompressionType();
assertEquals(compressionType, CompressionType.NONE);
producer.newMessage().value(msg1025).send();
message = (MessageImpl<byte[]>) consumer.receive();
compressionType = message.getCompressionType();
assertEquals(compressionType, CompressionType.LZ4);

// Verify data integrity
String data = "compression test message";
producer.conf.setBatchingEnabled(true);
producer.getConfiguration().setCompressMinMsgBodySize(1);
producer.newMessage().value(data.getBytes()).send();
message = (MessageImpl<byte[]>) consumer.receive();
assertEquals(new String(message.getData()), data);

producer.conf.setBatchingEnabled(false);
producer.getConfiguration().setCompressMinMsgBodySize(1);
producer.newMessage().value(data.getBytes()).send();
message = (MessageImpl<byte[]>) consumer.receive();
assertEquals(new String(message.getData()), data);
Comment thread
liangyepianzhou marked this conversation as resolved.

}
}
6 changes: 2 additions & 4 deletions pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,10 +542,8 @@ public void sendAsync(Message<?> message, SendCallback callback) {
boolean compressed = false;
// Batch will be compressed when closed
// If a message has a delayed delivery time, we'll always send it individually
if (((!isBatchMessagingEnabled() || msgMetadata.hasDeliverAtTime()))) {
if (payload.readableBytes() < conf.getCompressMinMsgBodySize()) {

} else {
if (!isBatchMessagingEnabled() || msgMetadata.hasDeliverAtTime()) {
if (payload.readableBytes() > conf.getCompressMinMsgBodySize()) {
compressedPayload = applyCompression(payload);
compressed = true;

Expand Down