Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Use fragment to bind list of ids as a single param (#5730)

Adam Rutkowskiad46776f9f11
diff --git a/lib/plausible/application.ex b/lib/plausible/application.ex
index 8364c67f22..218a1d51de 100644
--- a/lib/plausible/application.ex
+++ b/lib/plausible/application.ex
@@ -42,6 +42,12 @@ defmodule Plausible.Application do
n_lock_partitions: 1,
ets_options: [read_concurrency: true, write_concurrency: true]
),
+ Plausible.Cache.Adapter.child_specs(:site_ids, :cache_site_ids,
+ ttl_check_interval: :timer.seconds(10),
+ global_ttl: :timer.minutes(30),
+ n_lock_partitions: 1,
+ ets_options: [read_concurrency: true, write_concurrency: true]
+ ),
{Plausible.Session.Transfer,
base_path: Application.get_env(:plausible, :session_transfer_dir)},
warmed_cache(Plausible.Site.Cache,
diff --git a/lib/plausible/stats/filters/query_parser.ex b/lib/plausible/stats/filters/query_parser.ex
index 7b64d45df7..c21cadba90 100644
--- a/lib/plausible/stats/filters/query_parser.ex
+++ b/lib/plausible/stats/filters/query_parser.ex
@@ -78,7 +78,9 @@ defmodule Plausible.Stats.Filters.QueryParser do
end
def get_rollup_site_ids(%Plausible.Site{rollup: true} = site) do
- Plausible.Teams.owned_sites_ids(site.team)
+ Plausible.Cache.Adapter.get(:site_ids, site.team_id, fn ->
+ Plausible.Teams.owned_sites_ids(site.team)
+ end)
end
def get_rollup_site_ids(_site), do: nil
diff --git a/lib/plausible/stats/legacy/legacy_query_builder.ex b/lib/plausible/stats/legacy/legacy_query_builder.ex
index 88e27d25c6..89c6437483 100644
--- a/lib/plausible/stats/legacy/legacy_query_builder.ex
+++ b/lib/plausible/stats/legacy/legacy_query_builder.ex
@@ -43,7 +43,11 @@ defmodule Plausible.Stats.Legacy.QueryBuilder do
end
defp put_rollup_site_ids(query, %Plausible.Site{rollup: true} = site) do
- site_ids = Plausible.Teams.owned_sites_ids(site.team)
+ site_ids =
+ Plausible.Cache.Adapter.get(:site_ids, site.team_id, fn ->
+ Plausible.Teams.owned_sites_ids(site.team)
+ end)
+
struct!(query, rollup_site_ids: site_ids)
end
diff --git a/lib/plausible/stats/sql/where_builder.ex b/lib/plausible/stats/sql/where_builder.ex
index 3842e0e25a..b7af6aaee8 100644
--- a/lib/plausible/stats/sql/where_builder.ex
+++ b/lib/plausible/stats/sql/where_builder.ex
@@ -49,7 +49,8 @@ defmodule Plausible.Stats.SQL.WhereBuilder do
dynamic(
[e],
- e.site_id in ^site_ids and e.timestamp >= ^first_datetime and
+ fragment("? in ?", e.site_id, ^site_ids) and
+ e.timestamp >= ^first_datetime and
e.timestamp <= ^last_datetime
)
end
@@ -72,7 +73,7 @@ defmodule Plausible.Stats.SQL.WhereBuilder do
dynamic(
[s],
- s.site_id in ^site_ids and
+ fragment("? in ?", s.site_id, ^site_ids) and
s.start >= ^NaiveDateTime.add(first_datetime, -7, :day) and
s.timestamp >= ^first_datetime and
s.start <= ^last_datetime