PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-17 11:04:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

flatten long chains of conjoined/disjoined terms and double negation

Browse source
This commit is contained in:
byte[] 2019-11-27 00:09:46 -05:00
parent 912efc8dcd
commit 2d762e9645
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/search/parser.ex
View file

@ -88,7 +88,7 @@ defmodule Search.Parser do
with {:ok, {left, [{:or, _} | r_tokens]}} <- search_and(parser, tokens), with {:ok, {left, [{:or, _} | r_tokens]}} <- search_and(parser, tokens),
{:ok, {right, rest}} <- search_or(parser, r_tokens) {:ok, {right, rest}} <- search_or(parser, r_tokens)
do do
{:ok, {%{bool: %{should: [left, right]}}, rest}} {:ok, {flatten_disjunction_child(left, right), rest}}
else else
value -> value ->
value value
@ -99,7 +99,7 @@ defmodule Search.Parser do
with {:ok, {left, [{:and, _} | r_tokens]}} <- search_boost(parser, tokens), with {:ok, {left, [{:and, _} | r_tokens]}} <- search_boost(parser, tokens),
{:ok, {right, rest}} <- search_and(parser, r_tokens) {:ok, {right, rest}} <- search_and(parser, r_tokens)
do do
{:ok, {%{bool: %{must: [left, right]}}, rest}} {:ok, {flatten_conjunction_child(left, right), rest}}
else else
value -> value ->
value value
@ -119,7 +119,7 @@ defmodule Search.Parser do
defp search_not(parser, [{:not, _} | rest]) do defp search_not(parser, [{:not, _} | rest]) do
case search_group(parser, rest) do case search_group(parser, rest) do
{:ok, {child, r_tokens}} -> {:ok, {child, r_tokens}} ->
{:ok, {%{bool: %{must_not: child}}, r_tokens}} {:ok, {flatten_negation_child(child), r_tokens}}
value -> value ->
value value
@ -271,4 +271,21 @@ defmodule Search.Parser do
|> String.trim() |> String.trim()
|> String.downcase() |> String.downcase()
end end
# Flattens the child of a disjunction or conjunction to improve performance.
defp flatten_disjunction_child(this_child, %{bool: %{should: next_child}}),
do: %{bool: %{should: [this_child | next_child]}}
defp flatten_disjunction_child(this_child, next_child),
do: %{bool: %{should: [this_child, next_child]}}
defp flatten_conjunction_child(this_child, %{bool: %{must: next_child}}),
do: %{bool: %{must: [this_child | next_child]}}
defp flatten_conjunction_child(this_child, next_child),
do: %{bool: %{must: [this_child, next_child]}}
# Flattens the child of a negation to eliminate double negation.
defp flatten_negation_child(%{bool: %{must_not: next_child}}),
do: next_child
defp flatten_negation_child(next_child),
do: %{bool: %{must_not: next_child}}
end end