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
Reduce imported opts queries (#6106)
Uku Tahtf72b1519fc9a
diff --git a/lib/plausible/stats/imported/imported.ex b/lib/plausible/stats/imported/imported.exindex 2c077fa2b8..902d2c0e93 100644--- a/lib/plausible/stats/imported/imported.ex+++ b/lib/plausible/stats/imported/imported.ex@@ -25,6 +25,11 @@ defmodule Plausible.Stats.Imported dolength(Imported.Base.decide_tables(query)) > 0end+ def schema_supports_interval?(query) do+ "time:minute" not in query.dimensions and+ "time:hour" not in query.dimensions+ end+def merge_imported_country_suggestions(native_q, _site, %Plausible.Stats.Query{include_imported: false}) dodiff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.exindex 3d8c138b66..3a5ba04d89 100644--- a/lib/plausible/stats/query.ex+++ b/lib/plausible/stats/query.ex@@ -151,7 +151,9 @@ defmodule Plausible.Stats.Query dorequested? = query.include.importsquery =- if site do+ if site && Imported.schema_supports_interval?(query) do+ site = Plausible.Repo.preload(site, :completed_imports)+struct!(query,imports_exist: Plausible.Imported.any_completed_imports?(site),imports_in_range: get_imports_in_range(site, query)@@ -188,18 +190,18 @@ defmodule Plausible.Stats.Query doend@spec get_skip_imported_reason(t()) ::- nil | :no_imported_data | :out_of_range | :unsupported_query+ nil | :no_imported_data | :out_of_range | :unsupported_interval | :unsupported_querydef get_skip_imported_reason(query) docond do+ not Imported.schema_supports_interval?(query) ->+ :unsupported_interval+not query.imports_exist ->:no_imported_dataquery.imports_in_range == [] ->:out_of_range- "time:minute" in query.dimensions or "time:hour" in query.dimensions ->- :unsupported_interval-not Imported.schema_supports_query?(query) ->:unsupported_querydiff --git a/lib/plausible/stats/sparkline.ex b/lib/plausible/stats/sparkline.exindex 50f419ad14..3eb0752214 100644--- a/lib/plausible/stats/sparkline.ex+++ b/lib/plausible/stats/sparkline.ex@@ -73,8 +73,42 @@ defmodule Plausible.Stats.Sparkline doenddefp query_24h_stats(view_or_site, now) do+ if Plausible.Sites.regular?(view_or_site) do+ query_24h_stats_regular(view_or_site, now)+ else+ query_24h_stats_consolidated(view_or_site, now)+ end+ end++ defp query_24h_stats_regular(site, now) dostats_query =- QueryBuilder.build!(view_or_site,+ QueryBuilder.build!(site,+ now: DateTime.from_naive!(now, "Etc/UTC"),+ input_date_range: :"24h",+ metrics: [:visitors],+ include: [compare: :previous_period]+ )++ %Stats.QueryResult{+ results: [+ %{+ metrics: [visitors],+ comparison: %{+ change: [visitors_change]+ }+ }+ ]+ } = Stats.query(site, stats_query)++ %{+ visitors: visitors,+ visitors_change: visitors_change+ }+ end++ defp query_24h_stats_consolidated(view, now) do+ stats_query =+ QueryBuilder.build!(view,now: DateTime.from_naive!(now, "Etc/UTC"),input_date_range: :"24h",metrics: [:visitors, :visits, :pageviews, :views_per_visit],@@ -90,7 +124,7 @@ defmodule Plausible.Stats.Sparkline do}}]- } = Stats.query(view_or_site, stats_query)+ } = Stats.query(view, stats_query)%{visitors: visitors,diff --git a/test/plausible/stats/sparkline_test.exs b/test/plausible/stats/sparkline_test.exsindex a1902210c1..9c1959f012 100644--- a/test/plausible/stats/sparkline_test.exs+++ b/test/plausible/stats/sparkline_test.exs@@ -36,13 +36,7 @@ defmodule Plausible.Stats.SparklineTest doassert %{^domain => %{visitors: 0,- pageviews: 0,- pageviews_change: 0,- views_per_visit: +0.0,- views_per_visit_change: 0,visitors_change: 0,- visits: 0,- visits_change: 0,intervals: intervals}} =