Reduce imported opts queries (#6106)

* Reduce database queries for imported_opts in sparkline graphs

* Conditionally preload imports in query builder

* Extract Imported.schema_supports_interval?/1

* Fix test failures

* Don't join sessions for regular site cards (#6109)

---------

Co-authored-by: Adam Rutkowski <hq@mtod.org>

Author: ukutaht

lib/plausible/stats/imported/imported.ex

@@ -25,6 +25,11 @@ defmodule Plausible.Stats.Imported do
     length(Imported.Base.decide_tables(query)) > 0
   end
 
+  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
       }) do

lib/plausible/stats/query.ex

@@ -151,7 +151,9 @@ defmodule Plausible.Stats.Query do
     requested? = query.include.imports
 
     query =
-      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 do
   end
 
   @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_query
   def get_skip_imported_reason(query) do
     cond do
+      not Imported.schema_supports_interval?(query) ->
+        :unsupported_interval
+
       not query.imports_exist ->
         :no_imported_data
 
       query.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_query
 

lib/plausible/stats/sparkline.ex

@@ -73,8 +73,42 @@ defmodule Plausible.Stats.Sparkline do
   end
 
   defp 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) do
     stats_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,

test/plausible/stats/sparkline_test.exs

@@ -36,13 +36,7 @@ defmodule Plausible.Stats.SparklineTest do
       assert %{
                ^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
                }
              } =