Take account of arguments in rabbit_topic_trie_binding.bug25991

3 files changed, 53 insertions, 43 deletions

diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 6d117e3d..6f6f4244 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -60,7 +60,7 @@
 
 -record(trie_node, {exchange_name, node_id}).
 -record(trie_edge, {exchange_name, node_id, word}).
--record(trie_binding, {exchange_name, node_id, destination}).
+-record(trie_binding, {exchange_name, node_id, destination, arguments}).
 
 -record(listener, {node, protocol, host, ip_address, port}).
 
diff --git a/src/rabbit_exchange_type_topic.erl b/src/rabbit_exchange_type_topic.erl
index 8ba29deb..27b8d1e6 100644
--- a/src/rabbit_exchange_type_topic.erl
+++ b/src/rabbit_exchange_type_topic.erl
@@ -79,9 +79,9 @@ remove_bindings(transaction, _X, Bs) ->
     [begin
          Path = [{FinalNode, _} | _] =
              follow_down_get_path(X, split_topic_key(K)),
-         trie_remove_binding(X, FinalNode, D),
+         trie_remove_binding(X, FinalNode, D, Args),
          remove_path_if_empty(X, Path)
-     end ||  #binding{source = X, key = K, destination = D} <- Bs],
+     end ||  #binding{source = X, key = K, destination = D, args = Args} <- Bs],
     ok;
 remove_bindings(none, _X, _Bs) ->
     ok.
@@ -91,9 +91,10 @@ assert_args_equivalence(X, Args) ->
 
 %%----------------------------------------------------------------------------
 
-internal_add_binding(#binding{source = X, key = K, destination = D}) ->
+internal_add_binding(#binding{source = X, key = K, destination = D,
+                              args = Args}) ->
     FinalNode = follow_down_create(X, split_topic_key(K)),
-    trie_add_binding(X, FinalNode, D),
+    trie_add_binding(X, FinalNode, D, Args),
     ok.
 
 trie_match(X, Words) ->
@@ -176,7 +177,8 @@ trie_bindings(X, Node) ->
     MatchHead = #topic_trie_binding{
       trie_binding = #trie_binding{exchange_name = X,
                                    node_id       = Node,
-                                   destination   = '$1'}},
+                                   destination   = '$1',
+                                   arguments     = '_'}},
     mnesia:select(rabbit_topic_trie_binding, [{MatchHead, [], ['$1']}]).
 
 trie_update_node_counts(X, Node, Field, Delta) ->
@@ -213,20 +215,21 @@ trie_edge_op(X, FromNode, ToNode, W, Op) ->
                              node_id   = ToNode},
             write).
 
-trie_add_binding(X, Node, D) ->
+trie_add_binding(X, Node, D, Args) ->
     trie_update_node_counts(X, Node, #topic_trie_node.binding_count, +1),
-    trie_binding_op(X, Node, D, fun mnesia:write/3).
+    trie_binding_op(X, Node, D, Args, fun mnesia:write/3).
 
-trie_remove_binding(X, Node, D) ->
+trie_remove_binding(X, Node, D, Args) ->
     trie_update_node_counts(X, Node, #topic_trie_node.binding_count, -1),
-    trie_binding_op(X, Node, D, fun mnesia:delete_object/3).
+    trie_binding_op(X, Node, D, Args, fun mnesia:delete_object/3).
 
-trie_binding_op(X, Node, D, Op) ->
+trie_binding_op(X, Node, D, Args, Op) ->
     ok = Op(rabbit_topic_trie_binding,
             #topic_trie_binding{
               trie_binding = #trie_binding{exchange_name = X,
                                            node_id       = Node,
-                                           destination   = D}},
+                                           destination   = D,
+                                           arguments     = Args}},
             write).
 
 trie_remove_all_nodes(X) ->
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 2d6ff73b..74ff2adb 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -578,33 +578,38 @@ test_topic_matching() ->
                          key = list_to_binary(Key),
                          destination = #resource{virtual_host = <<"/">>,
                                                  kind = queue,
-                                                 name = list_to_binary(Q)}} ||
-                   {Key, Q} <- [{"a.b.c",         "t1"},
-                                {"a.*.c",         "t2"},
-                                {"a.#.b",         "t3"},
-                                {"a.b.b.c",       "t4"},
-                                {"#",             "t5"},
-                                {"#.#",           "t6"},
-                                {"#.b",           "t7"},
-                                {"*.*",           "t8"},
-                                {"a.*",           "t9"},
-                                {"*.b.c",         "t10"},
-                                {"a.#",           "t11"},
-                                {"a.#.#",         "t12"},
-                                {"b.b.c",         "t13"},
-                                {"a.b.b",         "t14"},
-                                {"a.b",           "t15"},
-                                {"b.c",           "t16"},
-                                {"",              "t17"},
-                                {"*.*.*",         "t18"},
-                                {"vodka.martini", "t19"},
-                                {"a.b.c",         "t20"},
-                                {"*.#",           "t21"},
-                                {"#.*.#",         "t22"},
-                                {"*.#.#",         "t23"},
-                                {"#.#.#",         "t24"},
-                                {"*",             "t25"},
-                                {"#.b.#",         "t26"}]],
+                                                 name = list_to_binary(Q)},
+                         args = Args} ||
+                   {Key, Q, Args} <- [{"a.b.c",         "t1",  []},
+                                      {"a.*.c",         "t2",  []},
+                                      {"a.#.b",         "t3",  []},
+                                      {"a.b.b.c",       "t4",  []},
+                                      {"#",             "t5",  []},
+                                      {"#.#",           "t6",  []},
+                                      {"#.b",           "t7",  []},
+                                      {"*.*",           "t8",  []},
+                                      {"a.*",           "t9",  []},
+                                      {"*.b.c",         "t10", []},
+                                      {"a.#",           "t11", []},
+                                      {"a.#.#",         "t12", []},
+                                      {"b.b.c",         "t13", []},
+                                      {"a.b.b",         "t14", []},
+                                      {"a.b",           "t15", []},
+                                      {"b.c",           "t16", []},
+                                      {"",              "t17", []},
+                                      {"*.*.*",         "t18", []},
+                                      {"vodka.martini", "t19", []},
+                                      {"a.b.c",         "t20", []},
+                                      {"*.#",           "t21", []},
+                                      {"#.*.#",         "t22", []},
+                                      {"*.#.#",         "t23", []},
+                                      {"#.#.#",         "t24", []},
+                                      {"*",             "t25", []},
+                                      {"#.b.#",         "t26", []},
+                                      {"args-test",     "t27",
+                                       [{<<"foo">>, longstr, <<"bar">>}]},
+                                      {"args-test",     "t27", %% Note aliasing
+                                       [{<<"foo">>, longstr, <<"baz">>}]}]],
     lists:foreach(fun (B) -> exchange_op_callback(X, add_binding, [B]) end,
                   Bindings),
 
@@ -631,12 +636,13 @@ test_topic_matching() ->
                                    "t22", "t23", "t24", "t26"]},
           {"nothing.here.at.all", ["t5", "t6", "t21", "t22", "t23", "t24"]},
           {"oneword",             ["t5", "t6", "t21", "t22", "t23", "t24",
-                                   "t25"]}]),
-
+                                   "t25"]},
+          {"args-test",           ["t5", "t6", "t21", "t22", "t23", "t24",
+                                   "t25", "t27"]}]),
     %% remove some bindings
     RemovedBindings = [lists:nth(1, Bindings), lists:nth(5, Bindings),
                        lists:nth(11, Bindings), lists:nth(19, Bindings),
-                       lists:nth(21, Bindings)],
+                       lists:nth(21, Bindings), lists:nth(28, Bindings)],
     exchange_op_callback(X, remove_bindings, [RemovedBindings]),
     RemainingBindings = ordsets:to_list(
                           ordsets:subtract(ordsets:from_list(Bindings),
@@ -659,7 +665,8 @@ test_topic_matching() ->
        {"b.b.c",               ["t6", "t10", "t13", "t18", "t22", "t23",
                                 "t24", "t26"]},
        {"nothing.here.at.all", ["t6", "t22", "t23", "t24"]},
-       {"oneword",             ["t6", "t22", "t23", "t24", "t25"]}]),
+       {"oneword",             ["t6", "t22", "t23", "t24", "t25"]},
+       {"args-test",           ["t6", "t22", "t23", "t24", "t25", "t27"]}]),
 
     %% remove the entire exchange
     exchange_op_callback(X, delete, [RemainingBindings]),