Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
add query optimizations from um-13
Brian Cao0b7db0210319
diff --git a/queries/analytics/event/getEventMetrics.js b/queries/analytics/event/getEventMetrics.jsindex b0ec87b46..1bbc3cac2 100644--- a/queries/analytics/event/getEventMetrics.js+++ b/queries/analytics/event/getEventMetrics.js@@ -1,4 +1,4 @@-import { getDateQuery, getFilterQuery, rawQuery } from 'lib/queries';+import { getDateQuery, getDateStringQuery, getFilterQuery, rawQuery } from 'lib/queries';export function getEventMetrics(website_id,@@ -14,7 +14,7 @@ export function getEventMetrics(`selectevent_value x,- ${getDateQuery('created_at', unit, timezone)} t,+ ${getDateStringQuery(getDateQuery('created_at', unit, timezone), unit)} t,count(*) yfrom eventwhere website_id=$1diff --git a/queries/analytics/pageview/getPageviewStats.js b/queries/analytics/pageview/getPageviewStats.jsindex 1651417d0..e96b18241 100644--- a/queries/analytics/pageview/getPageviewStats.js+++ b/queries/analytics/pageview/getPageviewStats.js@@ -1,4 +1,4 @@-import { parseFilters, rawQuery, getDateQuery } from 'lib/queries';+import { parseFilters, rawQuery, getDateQuery, getDateStringQuery } from 'lib/queries';export function getPageviewStats(website_id,@@ -14,15 +14,19 @@ export function getPageviewStats(return rawQuery(`- select ${getDateQuery('pageview.created_at', unit, timezone)} t,- count(${count}) y- from pageview- ${joinSession}- where pageview.website_id=$1- and pageview.created_at between $2 and $3- ${pageviewQuery}- ${sessionQuery}- group by 1+ select+ ${getDateStringQuery('g.t', unit)} as t,+ g.y as y+ from+ (select ${getDateQuery('pageview.created_at', unit, timezone)} t,+ count(${count}) y+ from pageview+ ${joinSession}+ where pageview.website_id=$1+ and pageview.created_at between $2 and $3+ ${pageviewQuery}+ ${sessionQuery}+ group by 1) gorder by 1`,params,