diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index 098c93a32..b22679a71 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -157,159 +157,6 @@ defmodule Plausible.Stats.Clickhouse do |> Enum.into(%{}) end - defp base_query_w_sessions_bare(site, query) do - {first_datetime, last_datetime} = utc_boundaries(query, site.timezone) - - sessions_q = - from(s in "sessions", - hints: ["SAMPLE 10000000"], - where: s.domain == ^site.domain, - where: s.timestamp >= ^first_datetime and s.start < ^last_datetime, - select: %{session_id: s.session_id} - ) - - sessions_q = - if query.filters["source"] do - source = query.filters["source"] - source = if source == @no_ref, do: "", else: source - from(s in sessions_q, where: s.referrer_source == ^source) - else - sessions_q - end - - sessions_q = - if query.filters["screen"] do - size = query.filters["screen"] - from(s in sessions_q, where: s.screen_size == ^size) - else - sessions_q - end - - sessions_q = - if query.filters["browser"] do - browser = query.filters["browser"] - from(s in sessions_q, where: s.browser == ^browser) - else - sessions_q - end - - sessions_q = - if query.filters["browser_version"] do - version = query.filters["browser_version"] - from(s in sessions_q, where: s.browser_version == ^version) - else - sessions_q - end - - sessions_q = - if query.filters["os"] do - os = query.filters["os"] - from(s in sessions_q, where: s.operating_system == ^os) - else - sessions_q - end - - sessions_q = - if query.filters["os_version"] do - version = query.filters["os_version"] - from(s in sessions_q, where: s.operating_system_version == ^version) - else - sessions_q - end - - sessions_q = - if query.filters["country"] do - country = Plausible.Stats.CountryName.to_alpha2(query.filters["country"]) - from(s in sessions_q, where: s.country_code == ^country) - else - sessions_q - end - - sessions_q = - if query.filters["utm_medium"] do - utm_medium = query.filters["utm_medium"] - from(s in sessions_q, where: s.utm_medium == ^utm_medium) - else - sessions_q - end - - sessions_q = - if query.filters["utm_source"] do - utm_source = query.filters["utm_source"] - from(s in sessions_q, where: s.utm_source == ^utm_source) - else - sessions_q - end - - sessions_q = - if query.filters["utm_campaign"] do - utm_campaign = query.filters["utm_campaign"] - from(s in sessions_q, where: s.utm_campaign == ^utm_campaign) - else - sessions_q - end - - sessions_q = - if query.filters["referrer"] do - ref = query.filters["referrer"] - from(s in sessions_q, where: s.referrer == ^ref) - else - sessions_q - end - - sessions_q = include_path_filter_entry(sessions_q, query.filters["entry_page"]) - - sessions_q = include_path_filter_exit(sessions_q, query.filters["exit_page"]) - - q = - from(e in "events", - hints: ["SAMPLE 10000000"], - where: e.domain == ^site.domain, - where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime - ) - - q = - if query.filters["source"] || query.filters["referrer"] || query.filters["utm_medium"] || - query.filters["utm_source"] || query.filters["utm_campaign"] || query.filters["screen"] || - query.filters["browser"] || query.filters["browser_version"] || query.filters["os"] || - query.filters["os_version"] || query.filters["country"] || query.filters["entry_page"] || - query.filters["exit_page"] do - from( - e in q, - join: sq in subquery(sessions_q), - on: e.session_id == sq.session_id - ) - else - q - end - - q = include_path_filter(q, query.filters["page"]) - - if query.filters["props"] do - [{key, val}] = query.filters["props"] |> Enum.into([]) - - if val == "(none)" do - from( - e in q, - where: fragment("not has(meta.key, ?)", ^key) - ) - else - from( - e in q, - inner_lateral_join: meta in fragment("meta as m"), - as: :meta, - where: meta.key == ^key and meta.value == ^val - ) - end - else - q - end - end - - defp base_query_w_sessions(site, query) do - base_query_w_sessions_bare(site, query) |> include_goal_conversions(query) - end - defp base_session_query(site, query) do {first_datetime, last_datetime} = utc_boundaries(query, site.timezone)