From 2130bc2f3a4ba400d24236f36395c001bef983fd Mon Sep 17 00:00:00 2001 From: Karl-Aksel Puulmann Date: Tue, 2 Apr 2024 12:30:13 +0300 Subject: [PATCH] Make default sessions join more conditional --- lib/plausible/stats/base.ex | 4 ++-- lib/plausible/stats/filters/filters.ex | 6 ++++++ lib/plausible/stats/table_decider.ex | 10 +++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex index e321a5f69..5f469fa68 100644 --- a/lib/plausible/stats/base.ex +++ b/lib/plausible/stats/base.ex @@ -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), diff --git a/lib/plausible/stats/filters/filters.ex b/lib/plausible/stats/filters/filters.ex index aeeeaeaa5..fceb387b2 100644 --- a/lib/plausible/stats/filters/filters.ex +++ b/lib/plausible/stats/filters/filters.ex @@ -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) diff --git a/lib/plausible/stats/table_decider.ex b/lib/plausible/stats/table_decider.ex index 8c1016de5..e6263577c 100644 --- a/lib/plausible/stats/table_decider.ex +++ b/lib/plausible/stats/table_decider.ex @@ -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 %{