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

clickhouse inserts

Browse source
This commit is contained in:
Brian Cao 2022-07-22 14:43:19 -07:00
parent 6ea2282f82
commit 65910c7348
13 changed files with 146 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
queries/analytics/stats/getActiveVisitors.js
View file

@ -29,7 +29,7 @@ async function clickhouseQuery(website_id) {
return rawQueryClickhouse(
`
select count(distinct session_id) x
select count(distinct session_uuid) x
from pageview
where website_id = $1
and created_at >= ${getDateFormatClickhouse(subMinutes(new Date(), 5))}

13
queries/analytics/stats/getWebsiteStats.js
View file

@ -53,17 +53,22 @@ async function relationalQuery(website_id, start_at, end_at, filters = {}) {
async function clickhouseQuery(website_id, start_at, end_at, filters = {}) {
const params = [website_id];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters('pageview', filters, params);
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
filters,
params,
'session_uuid',
);
return rawQueryClickhouse(
`
select
sum(t.c) as "pageviews",
count(distinct t.session_id) as "uniques",
count(distinct t.session_uuid) as "uniques",
sum(if(t.c = 1, 1, 0)) as "bounces",
sum(if(max_time < min_time + interval 1 hour, max_time-min_time, 0)) as "totaltime"
from (
select pageview.session_id,
select pageview.session_uuid,
${getDateQueryClickhouse('pageview.created_at', 'day')} time_series,
count(*) c,
min(created_at) min_time,
@ -74,7 +79,7 @@ async function clickhouseQuery(website_id, start_at, end_at, filters = {}) {
and ${getBetweenDatesClickhouse('pageview.created_at', start_at, end_at)}
${pageviewQuery}
${sessionQuery}
group by pageview.session_id, time_series
group by pageview.session_uuid, time_series
) t;
`,
params,