ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add query optimizations from um-13

pull/1294/head
Brian Cao 2022-07-12 22:39:16 -07:00
parent 9803d4b5ee
commit 0b7db02103
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
queries/analytics/event/getEventMetrics.js
View File

@ -1,4 +1,4 @@
import { getDateQuery, getFilterQuery, rawQuery } from 'lib/queries'; import { getDateQuery, getDateStringQuery, getFilterQuery, rawQuery } from 'lib/queries';
export function getEventMetrics( export function getEventMetrics(
website_id, website_id,
@ -14,7 +14,7 @@ export function getEventMetrics(
` `
select select
event_value x, event_value x,
${getDateQuery('created_at', unit, timezone)} t, ${getDateStringQuery(getDateQuery('created_at', unit, timezone), unit)} t,
count(*) y count(*) y
from event from event
where website_id=$1 where website_id=$1

10
queries/analytics/pageview/getPageviewStats.js
View File

@ -1,4 +1,4 @@
import { parseFilters, rawQuery, getDateQuery } from 'lib/queries'; import { parseFilters, rawQuery, getDateQuery, getDateStringQuery } from 'lib/queries';
export function getPageviewStats( export function getPageviewStats(
website_id, website_id,
@ -14,7 +14,11 @@ export function getPageviewStats(
return rawQuery( return rawQuery(
` `
select ${getDateQuery('pageview.created_at', unit, timezone)} t, select
${getDateStringQuery('g.t', unit)} as t,
g.y as y
from
(select ${getDateQuery('pageview.created_at', unit, timezone)} t,
count(${count}) y count(${count}) y
from pageview from pageview
${joinSession} ${joinSession}
@ -22,7 +26,7 @@ export function getPageviewStats(
and pageview.created_at between $2 and $3 and pageview.created_at between $2 and $3
${pageviewQuery} ${pageviewQuery}
${sessionQuery} ${sessionQuery}
group by 1 group by 1) g
order by 1 order by 1
`, `,
params, params,