Make default sessions join more conditional

pull/3966/head
Karl-Aksel Puulmann 3 years ago
parent 6e415d118a
commit 2130bc2f3a

@ -3,7 +3,7 @@ defmodule Plausible.Stats.Base do
use Plausible
use Plausible.Stats.Fragments
alias Plausible.Stats.{Query, Filters}
alias Plausible.Stats.{Query, Filters, TableDecider}
alias Plausible.Timezones
import Ecto.Query
@ -15,7 +15,7 @@ defmodule Plausible.Stats.Base do
def base_event_query(site, query) do
events_q = query_events(site, query)
if Enum.any?(Filters.visit_props(), &query.filters["visit:" <> &1]) do
if TableDecider.events_join_sessions?(query) do
sessions_q =
from(
s in query_sessions(site, query),

@ -27,6 +27,12 @@ defmodule Plausible.Stats.Filters do
]
def visit_props(), do: @visit_props |> Enum.map(&to_string/1)
@sessions_only_visit_props [
:entry_page,
:exit_page
]
def sessions_only_visit_props(), do: @sessions_only_visit_props |> Enum.map(&to_string/1)
@event_props [:name, :page, :goal]
def event_props(), do: @event_props |> Enum.map(&to_string/1)

@ -1,7 +1,15 @@
defmodule Plausible.Stats.TableDecider do
import Enum, only: [empty?: 1]
alias Plausible.Stats.Query
alias Plausible.Stats.{Query, Filters}
def events_join_sessions?(%Query{experimental_reduced_joins?: false} = query) do
Enum.any?(Filters.visit_props(), &query.filters["visit:" <> &1])
end
def events_join_sessions?(%Query{experimental_reduced_joins?: true} = query) do
Enum.any?(Filters.sessions_only_visit_props(), &query.filters["visit:" <> &1])
end
def partition_metrics(metrics, query) do
%{

Loading…
Cancel
Save