Skip to content

Trailing slash lookup #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2021
Merged

Trailing slash lookup #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d7fe91
Use previous node iff Ack is empty in lookup
burbas Nov 21, 2021
d5a1649
Correct case for detecting non-deterministic paths
burbas Nov 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/routing_tree.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,21 @@ lookup_path([Segment|Tl], Comparator, Tree, {Bindings, _}) ->
end.


lookup_binary(<<>>, Comparator, Tree, {Bindings, _Node}, Ack) ->
case lookup_segment(Ack, Bindings, Tree) of
lookup_binary(<<>>, Comparator, Tree, {Bindings, PrevNode}, Ack) ->
Node =
case Ack of
<<>> -> PrevNode;
_ -> Ack
end,
case lookup_segment(Node, Bindings, Tree) of
{ok, Bindings0, #node{is_wildcard = Wildcard, value = Value}} ->
case find_comparator(Comparator, Value) of
{ok, #node_comp{value = Value0}} ->
case Wildcard of
false ->
{ok, Bindings0, Value0};
_ ->
{ok, Bindings0, Value0, [Ack]}
{ok, Bindings0, Value0, [Node]}
end;
Error ->
Error
Expand Down Expand Up @@ -279,10 +284,10 @@ check_conflicting_nodes_segment(#node{value = Value, segment = Segment, is_bindi
check_conflicting_nodes_segment(#node{is_binding = true} = Node, _, _) -> {true, {conflict, Node}};
check_conflicting_nodes_segment(#node{is_wildcard = true} = Node, _, _) -> {true, {conflict, Node}}.

check_conflicting_nodes_binding(#node{value = Value, segment = Segment} = Node, CompNode, Ident) ->
check_conflicting_nodes_binding(#node{value = Value, segment = Segment, is_binding = true} = Node, CompNode, Ident) ->
Segment == Ident andalso
{[ X || #node_comp{comparator = C, value = X} <- Value,
C == CompNode#node_comp.comparator ] /= [], {conflict, Node}};
{[ X || #node_comp{comparator = C, value = X} <- Value,
C == CompNode#node_comp.comparator ] /= [], {conflict, Node}};
check_conflicting_nodes_binding(#node{is_wildcard = true}, _, _) -> true;
check_conflicting_nodes_binding(#node{value = Value} = Node, CompNode, _) ->
{[ X || #node_comp{comparator = C, value = X} <- Value, C == CompNode#node_comp.comparator ] /= [], {conflict, Node}}.
Expand Down