Fix UT

apache · Jul 19, 2022 · 559d42d · 559d42d
1 parent fe9d287
commit 559d42d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/...src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java b/...src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java
@@ -769,8 +769,8 @@ private void verifyRGMetrics(int sentNumBytes, int sentNumMsgs,
         Assert.assertNotEquals(ninthPercentileValue, 0);
     }
 
-    // Empirically, there appears to be a 42-byte overhead for metadata, imposed by Pulsar runtime.
-    private static final int PER_MESSAGE_METADATA_OHEAD = 42;
+    // Empirically, there appears to be a 31-byte overhead for metadata, imposed by Pulsar runtime.
+    private static final int PER_MESSAGE_METADATA_OHEAD = 31;
 
     private static final int PUBLISH_INTERVAL_SECS = 10;
     private static final int NUM_PRODUCERS = 4;

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerEntryMetadataE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerEntryMetadataE2ETest.java
@@ -237,9 +237,8 @@ public void testBatchMessage() throws Exception {
         Assert.assertTrue(entryMetadata.getBrokerTimestamp() >= sendTime);
         Assert.assertEquals(entryMetadata.getIndex(), 0);
         System.out.println(message.getProperties());
-        Assert.assertEquals(Integer.parseInt(message.getProperty(BATCH_HEADER)), 1);
-        // make sure BATCH_SIZE_HEADER > 0
-        Assert.assertTrue(Integer.parseInt(message.getProperty(BATCH_SIZE_HEADER)) > 0);
+        Assert.assertNull(message.getProperty(BATCH_HEADER));
+        Assert.assertNull(message.getProperty(BATCH_SIZE_HEADER));
 
         // 2. test for getMessagesById
         message = (MessageImpl) admin.topics().getMessageById(topic, messageId.getLedgerId(), messageId.getEntryId());
@@ -249,9 +248,8 @@ public void testBatchMessage() throws Exception {
         Assert.assertTrue(entryMetadata.getBrokerTimestamp() >= sendTime);
         Assert.assertEquals(entryMetadata.getIndex(), 0);
         System.out.println(message.getProperties());
-        Assert.assertEquals(Integer.parseInt(message.getProperty(BATCH_HEADER)), 1);
-        // make sure BATCH_SIZE_HEADER > 0
-        Assert.assertTrue(Integer.parseInt(message.getProperty(BATCH_SIZE_HEADER)) > 0);
+        Assert.assertNull(message.getProperty(BATCH_HEADER));
+        Assert.assertNull(message.getProperty(BATCH_SIZE_HEADER));
 
         // 3. test for examineMessage
         message = (MessageImpl) admin.topics().examineMessage(topic, "earliest", 1);
@@ -261,9 +259,8 @@ public void testBatchMessage() throws Exception {
         Assert.assertTrue(entryMetadata.getBrokerTimestamp() >= sendTime);
         Assert.assertEquals(entryMetadata.getIndex(), 0);
         System.out.println(message.getProperties());
-        Assert.assertEquals(Integer.parseInt(message.getProperty(BATCH_HEADER)), 1);
-        // make sure BATCH_SIZE_HEADER > 0
-        Assert.assertTrue(Integer.parseInt(message.getProperty(BATCH_SIZE_HEADER)) > 0);
+        Assert.assertNull(message.getProperty(BATCH_HEADER));
+        Assert.assertNull(message.getProperty(BATCH_SIZE_HEADER));
     }
 
     @Test(timeOut = 20000)

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java
@@ -31,7 +31,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.pulsar.client.impl.BatchMessageIdImpl;
+import org.apache.pulsar.client.impl.MessageIdImpl;
 import org.apache.pulsar.common.util.FutureUtil;
 import org.awaitility.Awaitility;
 import org.testng.annotations.AfterClass;
@@ -361,8 +361,7 @@ public void testKeyBasedBatchingOrder() throws Exception {
         for (int i = 0; i < 5; i++) {
             // Currently sending a duplicated message won't throw an exception. Instead, an invalid result is returned.
             final MessageId messageId = producer.newMessage().value("msg").sequenceId(i).send();
-            assertTrue(messageId instanceof BatchMessageIdImpl);
-            final BatchMessageIdImpl messageIdImpl = (BatchMessageIdImpl) messageId;
+            final MessageIdImpl messageIdImpl = (MessageIdImpl) messageId;
             assertEquals(messageIdImpl.getLedgerId(), -1L);
             assertEquals(messageIdImpl.getEntryId(), -1L);
         }

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TopicReaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/TopicReaderTest.java
@@ -1096,7 +1096,6 @@ public void testHasMessageAvailableWithBatch() throws Exception {
         ReaderImpl<byte[]> reader = (ReaderImpl<byte[]>)pulsarClient.newReader().topic(topicName)
                 .startMessageId(messageId).startMessageIdInclusive().create();
         MessageIdImpl lastMsgId = (MessageIdImpl) reader.getConsumer().getLastMessageId();
-        assertTrue(messageId instanceof BatchMessageIdImpl);
         assertEquals(lastMsgId.getLedgerId(), messageId.getLedgerId());
         assertEquals(lastMsgId.getEntryId(), messageId.getEntryId());
         reader.close();

diff --git a/...ar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java b/...ar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java
@@ -261,7 +261,6 @@ public void testDisableBatching() throws Exception {
             Assert.assertNotNull(msg);
             if (i < numberOfMessages) {
                 Assert.assertEquals(new String(msg.getData()), "batched");
-                Assert.assertTrue(msg.getMessageId() instanceof BatchMessageIdImpl);
             } else {
                 Assert.assertEquals(new String(msg.getData()), "non-batched");
                 Assert.assertFalse(msg.getMessageId() instanceof BatchMessageIdImpl);