Skip to content

[ISSUE #10972] Encode timer message propertiesString after internal properties are cleared #10974

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

Open
wang-jiahua wants to merge 1 commit into
base: develop
Choose a base branch
from
+28 −1
Open

[ISSUE #10972] Encode timer message propertiesString after internal properties are cleared #10974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,6 @@ public MessageExtBrokerInner convertMessage(MessageExt msgExt, boolean needRoll)
long tagsCodeValue =
MessageExtBrokerInner.tagsString2tagsCode(topicFilterType, msgInner.getTags());
msgInner.setTagsCode(tagsCodeValue);
msgInner.setPropertiesString(MessageDecoder.messageProperties2String(msgExt.getProperties()));

msgInner.setSysFlag(msgExt.getSysFlag());
msgInner.setBornTimestamp(msgExt.getBornTimestamp());
Expand All @@ -1270,6 +1269,9 @@ public MessageExtBrokerInner convertMessage(MessageExt msgExt, boolean needRoll)
MessageAccessor.clearProperty(msgInner, MessageConst.PROPERTY_REAL_TOPIC);
MessageAccessor.clearProperty(msgInner, MessageConst.PROPERTY_REAL_QUEUE_ID);
}
// Encode after the properties are finalized so that the wire data stays consistent
// with the property map, aligning with TimerMessageRocksDBStore#convertMessage.
msgInner.setPropertiesString(MessageDecoder.messageProperties2String(msgInner.getProperties()));
return msgInner;
}

Expand Down
25 changes: 25 additions & 0 deletions store/src/test/java/org/apache/rocketmq/store/timer/TimerMessageStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,31 @@ private static PutMessageResult transformTimerMessage(TimerMessageStore timerMes
return null;
}

@Test
public void testConvertMessagePropertiesStringMatchesProperties() throws Exception {
final TimerMessageStore timerMessageStore = createTimerMessageStore(null, true);

MessageExtBrokerInner msgExt = buildMessage(3000, "TimerTest_testConvertMessage", false);
MessageAccessor.putProperty(msgExt, MessageConst.PROPERTY_REAL_TOPIC, msgExt.getTopic());
MessageAccessor.putProperty(msgExt, MessageConst.PROPERTY_REAL_QUEUE_ID, "0");
msgExt.setPropertiesString(MessageDecoder.messageProperties2String(msgExt.getProperties()));
msgExt.setTopic(TimerMessageStore.TIMER_TOPIC);

// delivered message: internal properties are cleared from both the map and the wire data
MessageExtBrokerInner delivered = timerMessageStore.convertMessage(msgExt, false);
assertEquals("TimerTest_testConvertMessage", delivered.getTopic());
assertFalse(delivered.getPropertiesString().contains(MessageConst.PROPERTY_REAL_TOPIC));
assertFalse(delivered.getPropertiesString().contains(MessageConst.PROPERTY_REAL_QUEUE_ID));
assertEquals(MessageDecoder.messageProperties2String(delivered.getProperties()), delivered.getPropertiesString());

// rolled message: keeps REAL_TOPIC and stays consistent between the map and the wire data
MessageExtBrokerInner rolled = timerMessageStore.convertMessage(msgExt, true);
assertEquals(TimerMessageStore.TIMER_TOPIC, rolled.getTopic());
assertTrue(rolled.getPropertiesString().contains(MessageConst.PROPERTY_REAL_TOPIC));
assertTrue(rolled.getPropertiesString().contains(MessageConst.PROPERTY_REAL_QUEUE_ID));
assertEquals(MessageDecoder.messageProperties2String(rolled.getProperties()), rolled.getPropertiesString());
}

@Test
public void testPutTimerMessage() throws Exception {
Assume.assumeFalse(MixAll.isWindows());
Expand Down
Loading