From f2e5ce8eb33460cb2d1dc9ac0bd0d4ad0a20aa31 Mon Sep 17 00:00:00 2001 From: Vignesh Joglekar Date: Fri, 11 Jun 2021 01:49:10 -0500 Subject: [PATCH] Fixes time on page for globbed and negated page paths --- lib/plausible/stats/clickhouse.ex | 54 ++++++++++++------- .../controllers/api/stats_controller.ex | 8 +-- 2 files changed, 39 insertions(+), 23 deletions(-) diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index 032af4b37..d3be3852f 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -679,7 +679,10 @@ defmodule Plausible.Stats.Clickhouse do |> Enum.into(%{}) end - def page_times_by_page_url(site, query, page_list) do + def page_times_by_page_url(site, query, page_list \\ nil) do + {negated, updatedPageSelection} = query.filters["page"] |> check_negated_filter() + {_, pageRegex} = updatedPageSelection |> convert_path_regex() + q = from( e in base_query_w_sessions(site, %Query{ @@ -696,27 +699,40 @@ defmodule Plausible.Stats.Clickhouse do {base_query_raw, base_query_raw_params} = ClickhouseRepo.to_sql(:all, q) - "SELECT + page_selector = if page_list == nil, do: [pageRegex], else: [page_list && (Enum.count(page_list) > 0 && page_list) || ["/"]] + + time_query = "SELECT + p, + sum(td)/count(case when p2 != p then 1 end) as avgTime + FROM + (SELECT p, - sum(td)/count(case when p2 != p then 1 end) as avgTime + p2, + sum(t2-t) as td FROM (SELECT - p, - p2, - sum(t2-t) as td - FROM - (SELECT - *, - neighbor(t, 1) as t2, - neighbor(p, 1) as p2, - neighbor(s, 1) as s2 - FROM (#{base_query_raw})) - WHERE s=s2 AND p IN tuple(?) - GROUP BY p,p2,s) - GROUP BY p" - |> ClickhouseRepo.query( - base_query_raw_params ++ [(Enum.count(page_list) > 0 && page_list) || ["/"]] - ) + *, + neighbor(t, 1) as t2, + neighbor(p, 1) as p2, + neighbor(s, 1) as s2 + FROM (#{base_query_raw})) + WHERE s=s2 AND + #{ + if page_list == nil do + if negated, do: "not(match(p, ?))", else: "match(p, ?)" + else + "p IN tuple(?)" + end + } + GROUP BY p,p2,s) + GROUP BY p" + + time_query = if page_list == nil, do: "SELECT avg(ifNotFinite(avgTime, null)) FROM (#{time_query})", else: time_query + + time_query |> ClickhouseRepo.query( + base_query_raw_params ++ page_selector + ) + end defp add_percentages(stat_list) do diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index d93fe7116..7c9e16a58 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -111,13 +111,13 @@ defmodule PlausibleWeb.Api.StatsController do [ Task.async(fn -> {:ok, page_times} = - Stats.page_times_by_page_url(site, query, [query.filters["page"]]) + Stats.page_times_by_page_url(site, query) page_times end), Task.async(fn -> {:ok, page_times} = - Stats.page_times_by_page_url(site, prev_query, [query.filters["page"]]) + Stats.page_times_by_page_url(site, prev_query) page_times end) @@ -132,8 +132,8 @@ defmodule PlausibleWeb.Api.StatsController do {:ok, page_times} -> result = Enum.at(page_times.rows, 0) - result = if result, do: Enum.at(result, 1), else: nil - if result, do: {:ok, round(result)}, else: {:ok, 0} + result = if result, do: Enum.at(result, 0), else: nil + if result, do: {:ok, round(result)}, else: {:nil, nil} _ -> response