From 8eb54cc2c3d5a76c4250455bdd2a6cc0aba922f2 Mon Sep 17 00:00:00 2001 From: Feng Date: Sun, 11 Oct 2015 15:27:56 +0800 Subject: [PATCH 1/3] fix issue #68 - /# topics will not match #, +/# --- src/emqttd_pubsub.erl | 2 +- src/emqttd_trie.erl | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/emqttd_pubsub.erl b/src/emqttd_pubsub.erl index 4579be7c2..6bb32452c 100644 --- a/src/emqttd_pubsub.erl +++ b/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]). %%%============================================================================= diff --git a/src/emqttd_trie.erl b/src/emqttd_trie.erl index 30e6d69d2..a22107086 100644 --- a/src/emqttd_trie.erl +++ b/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()). -find(Topic) when is_binary(Topic) -> - TrieNodes = match_node(root, emqttd_topic:words(Topic), []), +-spec match(Topic :: binary()) -> list(MatchedTopic :: binary()). +match(Topic) when is_binary(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); From 78ecac09a4b46ff82fc8fee8309fdf49817f5b51 Mon Sep 17 00:00:00 2001 From: Feng Date: Sun, 11 Oct 2015 15:28:13 +0800 Subject: [PATCH 2/3] trie test --- test/emqttd_trie_tests.erl | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 test/emqttd_trie_tests.erl diff --git a/test/emqttd_trie_tests.erl b/test/emqttd_trie_tests.erl new file mode 100644 index 000000000..524ca79f6 --- /dev/null +++ b/test/emqttd_trie_tests.erl @@ -0,0 +1,41 @@ +%%%----------------------------------------------------------------------------- +%%% @Copyright (C) 2012-2015, Feng Lee +%%% +%%% 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. From 20cfc2754ca788f67d6dab78b1b4fd7c02626e37 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Sun, 11 Oct 2015 21:10:47 +0800 Subject: [PATCH 3/3] broker --- src/emqttd_cli.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emqttd_cli.erl b/src/emqttd_cli.erl index f3df4f62f..72f0e580b 100644 --- a/src/emqttd_cli.erl +++ b/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"}]). %%------------------------------------------------------------------------------