You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ho...@apache.org on 2025/02/05 03:03:53 UTC
(pulsar) branch fix-get-properties-failed-with-msgMetadata-case created (now ffbb581362d)
This is an automated email from the ASF dual-hosted git repository.
horizonzy pushed a change to branch fix-get-properties-failed-with-msgMetadata-case
in repository https://gitbox.apache.org/repos/asf/pulsar.git
at ffbb581362d Fix get properties failed when the message metadata contains the same key, but with different values issue.
This branch includes the following new commits:
new ffbb581362d Fix get properties failed when the message metadata contains the same key, but with different values issue.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(pulsar) 01/01: Fix get properties failed when the message metadata contains the same key, but with different values issue.
Posted by ho...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
horizonzy pushed a commit to branch fix-get-properties-failed-with-msgMetadata-case
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit ffbb581362df67edd83c21917617fc5e86e44807
Author: horizonzy <ho...@apache.org>
AuthorDate: Wed Feb 5 10:37:42 2025 +0800
Fix get properties failed when the message metadata contains the same key, but with different values issue.
---
.../apache/pulsar/common/api/raw/RawMessageImpl.java | 3 ++-
.../pulsar/common/api/raw/RawMessageImplTest.java | 20 +++++++++++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java
index daf7fd6a764..8240f234aa1 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java
@@ -99,7 +99,8 @@ public class RawMessageImpl implements RawMessage {
(oldValue, newValue) -> newValue));
} else if (msgMetadata.getMetadata().getPropertiesCount() > 0) {
return msgMetadata.getMetadata().getPropertiesList().stream()
- .collect(Collectors.toMap(KeyValue::getKey, KeyValue::getValue));
+ .collect(Collectors.toMap(KeyValue::getKey, KeyValue::getValue,
+ (oldValue, newValue) -> newValue));
} else {
return Collections.emptyMap();
}
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
index b0b9d42866c..61783b36dca 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
@@ -41,7 +41,7 @@ public class RawMessageImplTest {
private static final String HARD_CODE_KEY_ID_VALUE = "__pfn_input_msg_id_value__";
@Test
- public void testGetProperties() {
+ public void testGetMessageSingleMetadataProperties() {
ReferenceCountedMessageMetadata refCntMsgMetadata =
ReferenceCountedMessageMetadata.get(mock(ByteBuf.class));
SingleMessageMetadata singleMessageMetadata = new SingleMessageMetadata();
@@ -56,6 +56,24 @@ public class RawMessageImplTest {
assertEquals(HARD_CODE_KEY_ID_VALUE, properties.get(HARD_CODE_KEY_ID));
}
+ @Test
+ public void testGetMessageMetadataProperties() {
+ ReferenceCountedMessageMetadata refCntMsgMetadata =
+ ReferenceCountedMessageMetadata.get(mock(ByteBuf.class));
+
+ MessageMetadata messageMetadata = refCntMsgMetadata.getMetadata();
+ messageMetadata.addProperty().setKey(HARD_CODE_KEY).setValue(KEY_VALUE_FIRST);
+ messageMetadata.addProperty().setKey(HARD_CODE_KEY).setValue(KEY_VALUE_SECOND);
+ messageMetadata.addProperty().setKey(HARD_CODE_KEY_ID).setValue(HARD_CODE_KEY_ID_VALUE);
+
+ RawMessage msg = RawMessageImpl.get(refCntMsgMetadata, null, null, 0, 0, 0);
+ Map<String, String> properties = msg.getProperties();
+ assertEquals(properties.get(HARD_CODE_KEY), KEY_VALUE_SECOND);
+ assertEquals(properties.get(HARD_CODE_KEY_ID), HARD_CODE_KEY_ID_VALUE);
+ assertEquals(KEY_VALUE_SECOND, properties.get(HARD_CODE_KEY));
+ assertEquals(HARD_CODE_KEY_ID_VALUE, properties.get(HARD_CODE_KEY_ID));
+ }
+
@Test
public void testNonBatchedMessage() {
MessageMetadata messageMetadata = new MessageMetadata();