Merge pull request #336 from emqtt/dev-feng

fix issue #68, trie test, broker

src/emqttd_cli.erl

@@ -111,7 +111,7 @@ broker(["pubsub"]) ->
 broker(_) ->
     ?USAGE([{"broker",         "query broker version, uptime and description"},
             {"broker pubsub",  "query process_info of pubsub"},
-            {"borker stats",   "query broker statistics of clients, topics, subscribers"},
+            {"broker stats",   "query broker statistics of clients, topics, subscribers"},
             {"broker metrics", "query broker metrics"}]).
 
 %%------------------------------------------------------------------------------

src/emqttd_pubsub.erl

@@ -223,7 +223,7 @@ dispatch(Topic, #mqtt_message{qos = Qos} = Msg ) when is_binary(Topic) ->
 
 -spec match(Topic :: binary()) -> [mqtt_topic()].
 match(Topic) when is_binary(Topic) ->
-	MatchedTopics = mnesia:async_dirty(fun emqttd_trie:find/1, [Topic]),
+	MatchedTopics = mnesia:async_dirty(fun emqttd_trie:match/1, [Topic]),
 	lists:append([mnesia:dirty_read(topic, Name) || Name <- MatchedTopics]).
 
 %%%=============================================================================

src/emqttd_trie.erl

@@ -37,7 +37,7 @@
 -copy_mnesia({mnesia, [copy]}).
 
 %% Trie API
--export([insert/1, find/1, delete/1]).
+-export([insert/1, match/1, delete/1]).
 
 -type node_id() :: binary() | atom().
 
@@ -111,9 +111,9 @@ insert(Topic) when is_binary(Topic) ->
 %% @doc Find trie nodes that match topic
 %% @end
 %%------------------------------------------------------------------------------
--spec find(Topic :: binary()) -> list(MatchedTopic :: binary()).
+-spec match(Topic :: binary()) -> list(MatchedTopic :: binary()).
-find(Topic) when is_binary(Topic) ->
+match(Topic) when is_binary(Topic) ->
-    TrieNodes = match_node(root, emqttd_topic:words(Topic), []),
+    TrieNodes = match_node(root, emqttd_topic:words(Topic)),
     [Name || #trie_node{topic=Name} <- TrieNodes, Name=/= undefined].
 
 %%------------------------------------------------------------------------------
@@ -166,6 +166,13 @@ add_path({Node, Word, Child}) ->
 %%
 %% @end
 %%------------------------------------------------------------------------------
+
+match_node(root, [<<"$SYS">>|Words]) ->
+    match_node(<<"$SYS">>, Words, []);
+
+match_node(NodeId, Words) ->
+    match_node(NodeId, Words, []).
+
 match_node(NodeId, [], ResAcc) ->
 	mnesia:read(trie_node, NodeId) ++ 'match_#'(NodeId, ResAcc);
 

test/emqttd_trie_tests.erl

@@ -0,0 +1,41 @@
+%%%-----------------------------------------------------------------------------
+%%% @Copyright (C) 2012-2015, Feng Lee <feng@emqtt.io>
+%%%
+%%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%%% of this software and associated documentation files (the "Software"), to deal
+%%% in the Software without restriction, including without limitation the rights
+%%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%%% copies of the Software, and to permit persons to whom the Software is
+%%% furnished to do so, subject to the following conditions:
+%%%
+%%% The above copyright notice and this permission notice shall be included in all
+%%% copies or substantial portions of the Software.
+%%%
+%%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+%%% SOFTWARE.
+%%%-----------------------------------------------------------------------------
+
+-module(emqttd_trie_tests).
+
+-include("emqttd.hrl").
+
+-ifdef(TEST).
+
+-include_lib("eunit/include/eunit.hrl").
+
+match_test() ->
+    mnesia:start(),
+    emqttd_trie:mnesia(boot),
+    Topics = [<<"d/#">>, <<"a/b/c">>, <<"a/b/+">>, <<"a/#">>, <<"#">>, <<"$SYS/#">>],
+    mnesia:transaction(fun() -> [emqttd_trie:insert(Topic) || Topic <- Topics] end),
+    Matched = mnesia:async_dirty(fun emqttd_trie:match/1, [<<"a/b/c">>]),
+    ?assertEqual(4, length(Matched)),
+    SysMatched = mnesia:async_dirty(fun emqttd_trie:match/1, [<<"$SYS/a/b/c">>]),
+    ?assertEqual([<<"$SYS/#">>], SysMatched).
+
+-endif.