🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor analytics SQL queries to improve performance and accuracy
Bill Yangcb696dab477b
diff --git a/server/src/api/analytics/getOverviewBucketed.ts b/server/src/api/analytics/getOverviewBucketed.tsindex 26087892e..e3a607e23 100644--- a/server/src/api/analytics/getOverviewBucketed.ts+++ b/server/src/api/analytics/getOverviewBucketed.ts@@ -101,13 +101,12 @@ FROMsession_id,MIN(timestamp) AS start_time,MAX(timestamp) AS end_time,- COUNT(*) AS pages_in_session+ countIf(type = 'pageview') AS pages_in_sessionFROM events- WHERE+ WHEREsite_id = {siteId:Int32}${filterStatement}${getTimeStatement(params)}- AND type = 'pageview'GROUP BY session_id)GROUP BY time ORDER BY time ${isAllTime ? "" : getTimeStatementFill(params, bucket)}@@ -115,15 +114,14 @@ FROMFULL JOIN(SELECT- toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(timestamp, ${SqlString.escape(timeZone)}))) AS time,- COUNT(*) AS pageviews,+ toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(timestamp, ${SqlString.escape(timeZone)}))) AS time,+ countIf(type = 'pageview') AS pageviews,COUNT(DISTINCT user_id) AS usersFROM eventsWHEREsite_id = {siteId:Int32}${filterStatement}${getTimeStatement(params)}- AND type = 'pageview'GROUP BY time ORDER BY time ${isAllTime ? "" : getTimeStatementFill(params, bucket)}) AS page_statsUSING time