Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Optimize name filter (#6145)
Uku Tahtedae7170b90e
diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.exindex 80239f4d01..d3be127fb5 100644--- a/lib/plausible/stats/query.ex+++ b/lib/plausible/stats/query.ex@@ -32,6 +32,7 @@ defmodule Plausible.Stats.Query dotime_on_page_data: %{},sql_join_type: :left,smear_session_metrics: false,+ optimize_name_filter?: true,optimized_conversions: falserequire OpenTelemetry.Tracer, as: Tracerdiff --git a/lib/plausible/stats/query_builder.ex b/lib/plausible/stats/query_builder.exindex 71cfb63ef1..9e0679d73b 100644--- a/lib/plausible/stats/query_builder.ex+++ b/lib/plausible/stats/query_builder.ex@@ -183,6 +183,7 @@ defmodule Plausible.Stats.QueryBuilder dorevenue_warning: revenue_warning,revenue_currencies: revenue_currencies,debug_metadata: debug_metadata,+ optimize_name_filter?: FunWithFlags.enabled?(:optimize_name_filter, for: site),optimized_conversions: FunWithFlags.enabled?(:optimized_conversions, for: site))enddiff --git a/lib/plausible/stats/sql/query_builder.ex b/lib/plausible/stats/sql/query_builder.exindex 04c6d69380..4fe888e337 100644--- a/lib/plausible/stats/sql/query_builder.ex+++ b/lib/plausible/stats/sql/query_builder.ex@@ -8,7 +8,7 @@ defmodule Plausible.Stats.SQL.QueryBuilder doimport Plausible.Stats.Importedimport Plausible.Stats.Util- alias Plausible.Stats.{Query, QueryOptimizer, TableDecider, SQL}+ alias Plausible.Stats.{Query, Filters, QueryOptimizer, TableDecider, SQL}alias Plausible.Stats.SQL.Expressionalias Plausible.Stats.Legacy.TimeOnPage@@ -36,6 +36,7 @@ defmodule Plausible.Stats.SQL.QueryBuilder dofrom(e in "events_v2",where: ^SQL.WhereBuilder.build(:events, events_query),+ where: ^maybe_derived_name_filter(events_query),select: ^select_event_metrics(events_query))@@ -129,6 +130,46 @@ defmodule Plausible.Stats.SQL.QueryBuilder doendend+ defp maybe_derived_name_filter(%{optimize_name_filter?: true} = events_query) do+ derived_name_filter(events_query)+ end++ defp maybe_derived_name_filter(_events_query), do: true++ defp derived_name_filter(events_query) do+ cond do+ goal_breakdown?(events_query) ->+ names = goal_event_names(events_query.preloaded_goals.all)+ dynamic([e], e.name in ^names)++ # Goal filters already add precise name conditions via Goals.add_filter+ Filters.filtering_on_dimension?(events_query.filters, "event:goal") ->+ true++ :time_on_page not in events_query.metrics and :scroll_depth not in events_query.metrics ->+ dynamic([e], e.name != "engagement")++ true ->+ true+ end+ end++ defp goal_breakdown?(query) do+ "event:goal" in query.dimensions+ end++ defp goal_event_names(goals) do+ goals+ |> Enum.map(fn goal ->+ case Plausible.Goal.type(goal) do+ :event -> goal.event_name+ :page -> "pageview"+ :scroll -> "engagement"+ end+ end)+ |> Enum.uniq()+ end+defp select_event_metrics(query) doquery.metrics|> Enum.map(&SQL.Expression.event_metric(&1, query))