[rocketmq] branch develop updated: [ISSUE #6203] Allow to publish delay message with arbitrary timestamp (#6204)

[kaili]

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

kaili pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 59b49dee3 [ISSUE #6203] Allow to publish delay message with arbitrary 
timestamp (#6204)
59b49dee3 is described below

commit 59b49dee31879f8159c476cb41a2741287b02812
Author: Aaron Ai <yangkun....@gmail.com>
AuthorDate: Tue Mar 28 15:11:47 2023 +0800

    [ISSUE #6203] Allow to publish delay message with arbitrary timestamp 
(#6204)
    
    * Allow to publish delay message with arbitrary timestamp
    
    * Fix SendMessageActivityTest#testBuildMessage
---
 proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java   | 2 +-
 .../apache/rocketmq/proxy/grpc/v2/producer/SendMessageActivityTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java 
b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
index dcbf1af0e..560cd89f5 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
@@ -193,7 +193,7 @@ public class ProxyConfig implements ConfigFile {
 
     private boolean enableAclRpcHookForClusterMode = false;
 
-    private boolean useDelayLevel = true;
+    private boolean useDelayLevel = false;
     private String messageDelayLevel = "1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 
9m 10m 20m 30m 1h 2h";
     private transient Map<Integer /* level */, Long/* delay timeMillis */> 
delayLevelTable = new ConcurrentHashMap<>();
 
diff --git 
a/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/producer/SendMessageActivityTest.java
 
b/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/producer/SendMessageActivityTest.java
index bb844b490..588423bb9 100644
--- 
a/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/producer/SendMessageActivityTest.java
+++ 
b/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/producer/SendMessageActivityTest.java
@@ -229,7 +229,7 @@ public class SendMessageActivityTest extends 
BaseActivityTest {
             Resource.newBuilder().setName(TOPIC).build()).get(0);
 
         assertEquals(MessageClientIDSetter.getUniqID(messageExt), msgId);
-        assertEquals(String.valueOf(2), 
messageExt.getProperty(MessageConst.PROPERTY_DELAY_TIME_LEVEL));
+        assertEquals(deliveryTime, 
Long.parseLong(messageExt.getProperty(MessageConst.PROPERTY_TIMER_DELIVER_MS)));
     }
 
     @Test