watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-13 00:55:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'dev' into brian/um-16-clickhouse-support

Browse source
This commit is contained in:
Brian Cao 2022-07-22 17:03:42 -07:00
commit 304314fff0
114 changed files with 1474 additions and 1019 deletions
Download patch file Download diff file Expand all files Collapse all files

31
queries/analytics/pageview/getPageviewStats.js
View file

@ -1,13 +1,12 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import {
rawQueryClickhouse,
getBetweenDatesClickhouse,
getDateQuery,
getDateQueryClickhouse,
getDateStringQuery,
getDateStringQueryClickhouse,
parseFilters,
rawQuery,
rawQueryClickhouse,
runAnalyticsQuery,
} from 'lib/db';
@ -29,24 +28,24 @@ async function relationalQuery(
sessionKey = 'session_id',
) {
const params = [website_id, start_at, end_at];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters('pageview', filters, params);
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
null,
filters,
params,
);
return rawQuery(
`
select
${getDateStringQuery('g.t', unit)} as t,
g.y as y
from
(select ${getDateQuery('pageview.created_at', unit, timezone)} t,
select ${getDateQuery('pageview.created_at', unit, timezone)} t,
count(${count != '*' ? `${count}${sessionKey}` : count}) y
from pageview
${joinSession}
where pageview.website_id=$1
and pageview.created_at between $2 and $3
${pageviewQuery}
${sessionQuery}
group by 1) g
order by 1
and pageview.created_at between $2 and $3
${pageviewQuery}
${sessionQuery}
group by 1
`,
params,
);
@ -82,9 +81,9 @@ async function clickhouseQuery(
from pageview
${joinSession}
where pageview.website_id= $1
and ${getBetweenDatesClickhouse('pageview.created_at', start_at, end_at)}
${pageviewQuery}
${sessionQuery}
and ${getBetweenDatesClickhouse('pageview.created_at', start_at, end_at)}
${pageviewQuery}
${sessionQuery}
group by t) g
order by t
`,