[kafka] branch 3.0 updated: KAFKA-13277; Fix size calculation for tagged string fields in message generator (#11308)

[rsivaram]

This is an automated email from the ASF dual-hosted git repository.

rsivaram pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new b149f91  KAFKA-13277; Fix size calculation for tagged string fields in 
message generator (#11308)
b149f91 is described below

commit b149f9141853eda53ad68730e74caed626711284
Author: Rajini Sivaram <rajinisiva...@googlemail.com>
AuthorDate: Tue Sep 7 21:02:45 2021 +0100

    KAFKA-13277; Fix size calculation for tagged string fields in message 
generator (#11308)
    
    Reviewers: Colin P. McCabe <cmcc...@apache.org>
---
 .../org/apache/kafka/common/message/MessageTest.java     | 16 ++++++++++++++++
 .../org/apache/kafka/message/MessageDataGenerator.java   |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git 
a/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java 
b/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java
index aa00c24..3fcd007 100644
--- a/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java
@@ -1161,6 +1161,22 @@ public final class MessageTest {
         verifyWriteSucceeds((short) 6, createTopics);
     }
 
+    @Test
+    public void testLongTaggedString() throws Exception {
+        char[] chars = new char[1024];
+        Arrays.fill(chars, 'a');
+        String longString = new String(chars);
+        SimpleExampleMessageData message = new SimpleExampleMessageData()
+                .setMyString(longString);
+        ObjectSerializationCache cache = new ObjectSerializationCache();
+        short version = 1;
+        int size = message.size(cache, version);
+        ByteBuffer buf = ByteBuffer.allocate(size);
+        ByteBufferAccessor byteBufferAccessor = new ByteBufferAccessor(buf);
+        message.write(byteBufferAccessor, cache, version);
+        assertEquals(size, buf.position());
+    }
+
     private void verifyWriteRaisesNpe(short version, Message message) {
         ObjectSerializationCache cache = new ObjectSerializationCache();
         assertThrows(NullPointerException.class, () -> {
diff --git 
a/generator/src/main/java/org/apache/kafka/message/MessageDataGenerator.java 
b/generator/src/main/java/org/apache/kafka/message/MessageDataGenerator.java
index b3c243e..b9923ee 100644
--- a/generator/src/main/java/org/apache/kafka/message/MessageDataGenerator.java
+++ b/generator/src/main/java/org/apache/kafka/message/MessageDataGenerator.java
@@ -1156,7 +1156,8 @@ public final class MessageDataGenerator implements 
MessageClassGenerator {
                                 buffer.printf("int _stringPrefixSize = " +
                                     
"ByteUtils.sizeOfUnsignedVarint(_stringBytes.length + 1);%n");
                                 
buffer.printf("_size.addBytes(_stringBytes.length + _stringPrefixSize + " +
-                                    
"ByteUtils.sizeOfUnsignedVarint(_stringPrefixSize));%n");
+                                    
"ByteUtils.sizeOfUnsignedVarint(_stringPrefixSize + _stringBytes.length));%n");
+
                             } else {
                                 
buffer.printf("_size.addBytes(_stringBytes.length + " +
                                     
"ByteUtils.sizeOfUnsignedVarint(_stringBytes.length + 1));%n");