QoS0 msg support msgid (#2145)

* QoS0 msg support msgid

* Fix testcase

src/emqx_message.erl

@@ -40,7 +40,7 @@ make(From, Topic, Payload) ->
 -spec(make(atom() | emqx_types:client_id(), emqx_mqtt_types:qos(),
            emqx_topic:topic(), emqx_types:payload()) -> emqx_types:message()).
 make(From, QoS, Topic, Payload) ->
-    #message{id         = msgid(QoS),
+    #message{id         = emqx_guid:gen(),
              qos        = QoS,
              from       = From,
              flags      = #{dup => false},
@@ -48,9 +48,6 @@ make(From, QoS, Topic, Payload) ->
              payload    = Payload,
              timestamp  = os:timestamp()}.
 
-msgid(?QOS_0) -> undefined;
-msgid(_QoS)  -> emqx_guid:gen().
-
 set_flags(Flags, Msg = #message{flags = undefined}) when is_map(Flags) ->
     Msg#message{flags = Flags};
 set_flags(New, Msg = #message{flags = Old}) when is_map(New) ->

test/emqx_packet_SUITE.erl

@@ -102,7 +102,7 @@ packet_message(_) ->
     Pkt = emqx_packet:from_message(10, Msg2),
     Msg3 = emqx_message:set_header(username, "test", Msg2),
     Msg4 = emqx_packet:to_message(#{client_id => <<"clientid">>, username => "test"}, Pkt),
-    Msg5 = Msg4#message{timestamp = Msg3#message.timestamp},
+    Msg5 = Msg4#message{timestamp = Msg3#message.timestamp, id = Msg3#message.id},
     Msg5 = Msg3.
 
 packet_format(_) ->